Changeset a12d5aa for src/main.cc

Timestamp:

Jun 29, 2017, 5:13:42 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

435e75f

Parents:

62423350 (diff), 1abc5ab (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' into designations

File:

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

src/main.cc

@@ -10 +10 @@
 // Author           : Richard C. Bilson
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Wed May 10 14:45:00 2017
-// Update Count     : 437
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Jun 29 12:46:50 2017
+// Update Count     : 441
 //
 
@@ -25 +25 @@
 using namespace std;
 
-#include "Parser/lex.h"
-#include "Parser/parser.h"
+#include "Parser/parser.hh"
 #include "Parser/TypedefTable.h"
 #include "GenPoly/Lvalue.h"
@@ -186 +185 @@
                 if ( ! nopreludep ) {                                                   // include gcc builtins
                         // -l is for initial build ONLY and builtins.cf is not in the lib directory so access it here.
-                        FILE * builtins = fopen( libcfap | treep ? "../prelude/builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
-                        assertf( builtins, "cannot open builtins.cf\n" );
-                        parse( builtins, LinkageSpec::Compiler );
+
+                        // Read to gcc builtins, if not generating the cfa library
+                        FILE * gcc_builtins = fopen( libcfap | treep ? "../prelude/gcc-builtins.cf" : CFA_LIBDIR "/gcc-builtins.cf", "r" );
+                        assertf( gcc_builtins, "cannot open gcc-builtins.cf\n" );
+                        parse( gcc_builtins, LinkageSpec::Compiler );
 
                         // read the extra prelude in, if not generating the cfa library
@@ -200 +201 @@
                                 assertf( prelude, "cannot open prelude.cf\n" );
                                 parse( prelude, LinkageSpec::Intrinsic );
+
+                                // Read to cfa builtins, if not generating the cfa library
+                                FILE * builtins = fopen( libcfap | treep ? "../prelude/builtins.cf" : CFA_LIBDIR "/builtins.cf", "r" );
+                                assertf( builtins, "cannot open builtins.cf\n" );
+                                parse( builtins, LinkageSpec::Builtin );
                         } // if
                 } // if
@@ -475 +481 @@
                         break;
                   case '?':
-                        assertf( false, "Unknown option: '%c'\n", (char)optopt );
+                        if ( optopt ) {                                                         // short option ?
+                                assertf( false, "Unknown option: -%c\n", (char)optopt );
+                        } else {
+                                assertf( false, "Unknown option: %s\n", argv[optind - 1] );
+                        } // if
                   default:
                         abort();