Changeset e39241b for src/main.cc

Timestamp:

Apr 17, 2017, 5:43:01 PM (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:

7069652

Parents:

4ae83a4b

Message:

allow codegen as an alternative to AST dump after any pass with the -z option

File:

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

src/main.cc

@@ -304 +304 @@
                 GenPoly::box( translationUnit );
 
-                // print tree right before code generation
-                if ( codegenp ) {
-                        dump( translationUnit );
-                        return 0;
-                } // if
-
                 if ( optind < argc ) {                                                  // any commands after the flags and input file ? => output file name
                         output = new ofstream( argv[ optind ] );
                 } // if
 
-                CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp );
+                CodeGen::generate( translationUnit, *output, ! noprotop, prettycodegenp, true );
 
                 CodeGen::FixMain::fix( *output, treep ? "../prelude/bootloader.c" : CFA_LIBDIR "/bootloader.c" );
@@ -393 +387 @@
                         break;
                   case CtorInitFix:
-                  case 'c':
+                  case 'c':                                                                             // print after constructors and destructors are replaced
                         ctorinitp = true;
                         break;
@@ -450 +444 @@
                         validp = true;
                         break;
-                  case 'y':
+                  case 'y':                                                                             // dump AST on error
                         errorp = true;
                         break;
-                  case 'z':
+                  case 'z':                                                                             // dump as codegen rather than AST
                         codegenp = true;
-                        case 'Z':
+                        break;
+                        case 'Z':                                                                       // prettyprint during codegen (i.e. print unmangled names, etc.)
                         prettycodegenp = true;
                         break;
@@ -501 +496 @@
         } // if
 
-        printAll( decls, out );
+        // depending on commandline options, either generate code or dump the AST
+        if ( codegenp ) {
+                CodeGen::generate( decls, out, ! noprotop, prettycodegenp );
+        } else {
+                printAll( decls, out );
+        }
         deleteAll( translationUnit );
 } // dump