Changeset 413f7f8 for src/main.cc

Timestamp:

Jul 7, 2015, 1:49:58 PM (10 years ago)

Author:

Aaron Moss <a3moss@…>

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:

82dd287

Parents:

e0ff3e6 (diff), 8686f31 (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' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

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

src/main.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon Jun 22 17:02:11 2015
-// Update Count     : 73
+// Last Modified By : Rob Schluntz
+// Last Modified On : Mon Jul 06 15:01:26 2015
+// Update Count     : 79
 //
 
@@ -277 +277 @@
                 GenPoly::box( translationUnit );
 
-    // print the tree right before code generation
+                // print tree right before code generation
                 if ( codegenp ) {
                         printAll( translationUnit, std::cout );
@@ -283 +283 @@
                 } // if
 
-                CodeGen::generate( translationUnit, *output, protop );
+                CodeGen::generate( translationUnit, *output, true ); //protop );
 
                 if ( output != &std::cout ) {