Changeset b1a6d6b for translator/main.cc

Timestamp:

May 14, 2015, 12:19:46 PM (9 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:

4bf5298

Parents:

d4778a6

Message:

removed duplicate adapters, switch to c99 for initializer declarations

File:

• translator/main.cc (modified) (6 diffs)

translator/main.cc

@@ -49 +49 @@
     bool debugp = false, treep = false, astp = false, manglep = false, symtabp = false, validp = false;
     bool preludep = true, protop = false, libp = false;
-    bool exprp = false, codegenp = false;
+    bool exprp = false, codegenp = false, errorp = false;
     int c;
     FILE *input, *prelude, *builtins;
@@ -56 +56 @@
     opterr = 0;
 
-    while ( (c = getopt( argc, argv, "dtsgmvxcenprlDz:" )) != -1 ) {
+    std::list< Declaration* > translationUnit;
+    
+    while ( (c = getopt( argc, argv, "dtsgmvxcenprlDyz:" )) != -1 ) {
         switch (c) {
           case 'd':
-            /* bison debugging info */
+            // bison debugging info
             debugp = true;
             break;
           case 't':
-            /* dump parse tree */
+            // dump parse tree
             treep = true;
             break;
           case 's':
-            /* dump AST */
+            // dump AST
             astp = true;
             break;
           case 'g':
-            /* print alternatives for expressions */
+            // print alternatives for expressions
             manglep = true;
             break;
           case 'm':
-            /* print symbol table events */
+            // print symbol table events
             symtabp = true;
             break;
           case 'r':
-            /* print resolver steps */
+            // print resolver steps
             resolveVerbose = true;
             break;
           case 'x':
-            /* dump AST after decl validation pass */
+            // dump AST after decl validation pass
             validp = true;
             break;
           case 'e':
-            /* dump AST after expression analysis */
+            // dump AST after expression analysis
             exprp = true;
             break;
@@ -93 +95 @@
             codegenp = true;
             break;
+          case 'y':
+            errorp = true;
+            break;
           case 'n':
-            /* don't read preamble */
+            // don't read preamble
             preludep = false;
             break;
           case 'p':
-            /* generate prototypes for preamble functions */
+            // generate prototypes for preamble functions
             protop = true;
             break;
           case 'l':
-            /* generate libcfa.c */
+            // generate libcfa.c
             libp = true;
             break;
           case 'v':
-            /* verbose */
+            // verbose
             beVerbose = true;
             break;
           case 'D':
-            /* ignore -Dxxx */
+            // ignore -Dxxx
             break;
           case '?':
@@ -205 +210 @@
         } // if
 
-        std::list< Declaration* > translationUnit;
         buildList( Parser::get_parser().get_parseTree(), translationUnit );
 
@@ -233 +237 @@
 
         if ( exprp ) {
+            InitTweak::tweak( translationUnit );
             SymTab::validate( translationUnit, false );
-            ResolvExpr::resolve( translationUnit );
-            printAll( translationUnit, std::cout );
-            return 0;
-        } // if
-
-        if ( codegenp ) {
-            // print the tree right before code generation...
-                        // InitTweak::mutate( translationUnit );
-            //            InitTweak::tweak( translationUnit );
-            //printAll( translationUnit, std::cout );
-
-            // std::cerr << "finished tweaking" << std::endl;
-            SymTab::validate( translationUnit, false );
             ControlStruct::mutate( translationUnit );
             CodeGen::fixNames( translationUnit );
+            ResolvExpr::resolve( translationUnit );
+            printAll( translationUnit, std::cout );
+            return 0;
+        } // if
+
+        if ( codegenp ) {
+            // print the tree right before code generation
+            cerr << "tweak" << endl;
+            InitTweak::tweak( translationUnit );
+            cerr << "validate" << endl;
+            SymTab::validate( translationUnit, false );
+            cerr << "mutate" << endl;
+            ControlStruct::mutate( translationUnit );
+            cerr << "fixNames" << endl;
+            CodeGen::fixNames( translationUnit );
+            cerr << "resolve" << endl;
             ResolvExpr::resolve( translationUnit );
+            cerr << "copyParams" << endl;
             GenPoly::copyParams( translationUnit );
+            cerr << "convertSpecializations" << endl;
             GenPoly::convertSpecializations( translationUnit );
+            cerr << "convertLvalue" << endl;
             GenPoly::convertLvalue( translationUnit );
+            cerr << "box" << endl;
             GenPoly::box( translationUnit );
-            printAll( translationUnit, std::cout );
+            if ( errorp ) {
+                printAll( translationUnit, std::cout );
+            }
             return 0;
         } // if
@@ -293 +307 @@
 
     } catch ( SemanticError &e ) {
+        if ( errorp ) {
+           printAll( translationUnit, std::cout );
+        }
         e.print( cout );
         if ( output != &std::cout ) {