Changeset d60ccbf for src/main.cc

Timestamp:

Aug 12, 2015, 2:27:31 PM (10 years ago)

Author:

Rob Schluntz <rschlunt@…>

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:

f32c7f4

Parents:

e45215c (diff), e869d663 (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 designate

Conflicts:

src/CodeGen/CodeGenerator.h

File:

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

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Mon Jul 06 15:01:26 2015
-// Update Count     : 79
+// Last Modified On : Thu Jul 30 16:08:18 2015
+// Update Count     : 167
 //
 
@@ -54 +54 @@
         if ( errorp ) std::cerr << x << std::endl;
 
-void parse( FILE * input, LinkageSpec::Type t, bool shouldExit = false );
+static void parse( FILE * input, LinkageSpec::Type t, bool shouldExit = false );
+static void dump( std::list< Declaration * > & translationUnit );
 
 bool
@@ -64 +65 @@
         libcfap = false,
         nopreludep = false,
-        protop = false,
+        noprotop = false,
         parsep = false,
         resolvep = false,                                                                       // used in AlternativeFinder
@@ -81 +82 @@
         { "grammar", no_argument, 0, Grammar },
         { "libcfa", no_argument, 0, LibCFA },
-        { "nopreamble", no_argument, 0, Nopreamble },
+        { "no-preamble", no_argument, 0, Nopreamble },
         { "parse", no_argument, 0, Parse },
-        { "prototypes", no_argument, 0, Prototypes },
+        { "no-prototypes", no_argument, 0, Prototypes },
         { "resolver", no_argument, 0, Resolver },
         { "symbol", no_argument, 0, Symbol },
@@ -131 +132 @@
                   case Prototypes:
                   case 'p':                                                                             // generate prototypes for preamble functions
-                        protop = true;
+                        noprotop = true;
                         break;
                   case Parse:
@@ -221 +222 @@
                 Parser::get_parser().freeTree();
                 if ( astp ) {
-                        printAll( translationUnit, std::cout );
+                        dump( translationUnit );
                         return 0;
                 } // if
@@ -227 +228 @@
                 // add the assignment statement after the 
                 // initialization of a type parameter
-                OPTPRINT( "tweak" )
-                InitTweak::tweak( translationUnit );
                 OPTPRINT( "validate" )
                 SymTab::validate( translationUnit, symtabp );
@@ -242 +241 @@
 
                 if ( validp ) {
-                        printAll( translationUnit, std::cout );
+                        dump( translationUnit );
                         return 0;
                 } // if
@@ -250 +249 @@
                 OPTPRINT( "fixNames" ) 
                 CodeGen::fixNames( translationUnit );
+                OPTPRINT( "tweak" )
+                InitTweak::tweak( translationUnit );
 
                 if ( libcfap ) {
-                        protop = true;
                         // generate the bodies of cfa library functions
                         LibCfa::makeLibCfa( translationUnit );
@@ -258 +258 @@
 
                 if ( bresolvep ) {
-                        printAll( translationUnit, std::cout );
+                        dump( translationUnit );
                         return 0;
                 } // if
@@ -265 +265 @@
                 ResolvExpr::resolve( translationUnit );
                 if ( exprp ) {
-                        printAll( translationUnit, std::cout );
+                        dump( translationUnit );
                 }
 
@@ -279 +279 @@
                 // print tree right before code generation
                 if ( codegenp ) {
-                        printAll( translationUnit, std::cout );
-                        return 0;
-                } // if
-
-                CodeGen::generate( translationUnit, *output, true ); //protop );
+                        dump( translationUnit );
+                        return 0;
+                } // if
+
+                CodeGen::generate( translationUnit, *output, ! noprotop );
 
                 if ( output != &std::cout ) {
@@ -290 +290 @@
         } catch ( SemanticError &e ) {
                 if ( errorp ) {
-                        printAll( translationUnit, std::cerr );
+                        dump( translationUnit );
                 }
                 e.print( std::cerr );
@@ -315 +315 @@
 } // main
 
-void parse( FILE * input, LinkageSpec::Type linkage, bool shouldExit ) {
+static void parse( FILE * input, LinkageSpec::Type linkage, bool shouldExit ) {
         Parser::get_parser().set_linkage( linkage );
         Parser::get_parser().parse( input );
@@ -325 +325 @@
 }
 
+static bool notPrelude( Declaration * decl ) {
+        return ! LinkageSpec::isBuiltin( decl->get_linkage() );
+}
+
+static void dump( std::list< Declaration * > & translationUnit ) {
+        std::list< Declaration * > decls;
+        if ( noprotop ) {
+                filter( translationUnit.begin(), translationUnit.end(), 
+                                std::back_inserter( decls ), notPrelude );
+        } else {
+                decls = translationUnit;
+        }
+
+        printAll( decls, std::cout );
+        deleteAll( translationUnit );
+}
+
+
 // Local Variables: //
 // tab-width: 4 //