Changeset b1e63ac5 for src/main.cc

Timestamp:

Jul 4, 2017, 9:40:16 AM (8 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:

208e5be

Parents:

9c951e3 (diff), f7cb0bc (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 references

File:

• src/main.cc (modified) (10 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"
@@ -64 +63 @@
         bresolvep = false,
         bboxp = false,
+        bcodegenp = false,
         ctorinitp = false,
         declstatsp = false,
@@ -145 +145 @@
 } // sigSegvBusHandler
 
-void sigAbortHandler( int sig_num ) {
+void sigAbortHandler( __attribute__((unused)) int sig_num ) {
         backtrace( 6 );                                                                         // skip first 6 stack frames
         signal( SIGABRT, SIG_DFL);                                                      // reset default signal handler
@@ -185 +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
@@ -199 +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
@@ -306 +313 @@
                 OPTPRINT( "box" )
                 GenPoly::box( translationUnit );
+
+                if ( bcodegenp ) {
+                        dump( translationUnit );
+                        return 0;
+                }
 
                 if ( optind < argc ) {                                                  // any commands after the flags and input file ? => output file name
@@ -377 +389 @@
 
         int c;
-        while ( (c = getopt_long( argc, argv, "abBcdefglLmnpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
+        while ( (c = getopt_long( argc, argv, "abBcCdefglLmnpqrstTvyzZD:F:", long_opts, &long_index )) != -1 ) {
                 switch ( c ) {
                   case Ast:
@@ -394 +406 @@
                         ctorinitp = true;
                         break;
+                  case 'C':                                                                             // print before code generation
+                        bcodegenp = true;
+                        break;
                   case DeclStats:
                   case 'd':
@@ -466 +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();