Changeset c23f807 for src/main.cc

Timestamp:

Dec 18, 2015, 2:41:08 PM (8 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, ctor, deferred_resn, demangler, enum, forall-pointer-decay, gc_noraii, jacob/cs343-translation, jenkins-sandbox, master, memory, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, string, with_gc

Children:

261fd34, ae63a18

Parents:

69911c11 (diff), faf8857 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/main.cc (modified) (4 diffs)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Nov 19 22:31:40 2015
-// Update Count     : 168
+// Last Modified On : Thu Dec 17 12:59:06 2015
+// Update Count     : 179
 //
 
@@ -187 +187 @@
                 // read in the builtins and the prelude
                 if ( ! nopreludep ) {                                                   // include gcc builtins
-                        FILE * builtins = fopen( CFA_LIBDIR "/builtins.cf", "r" );
+                        // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
+                        FILE * builtins = fopen( libcfap ? "./builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
                         if ( builtins == NULL ) {
                                 std::cerr << "Error: can't open builtins" << std::endl;
@@ -196 +197 @@
 
                         if ( ! libcfap ) {
-                                // read the prelude in, if we're not generating the cfa library
+                                // read the prelude in, if not generating the cfa library
                                 FILE * prelude = fopen( CFA_LIBDIR "/prelude.cf", "r" );
                                 if ( prelude == NULL ) {
@@ -203 +204 @@
                                 } // if
                     
-                    parse( prelude, LinkageSpec::Intrinsic );
+                                parse( prelude, LinkageSpec::Intrinsic );
                         } // if
                 } // if
 
-                if ( libcfap ) {
-                        parse( input, LinkageSpec::Intrinsic ); 
-                } else {
-                        parse( input, LinkageSpec::Cforall, grammarp ); 
-                }
+                parse( input, libcfap ? LinkageSpec::Intrinsic : LinkageSpec::Cforall, grammarp );      
   
                 if ( parsep ) {