Changeset 353d168 for src/main.cc

Timestamp:

Aug 19, 2015, 3:59:45 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, with_gc

Children:

830c21a

Parents:

18997b9 (diff), 4aa0858 (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 'override-autogen' into ctor

Conflicts:

src/Parser/ParseNode.h

File:

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

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Rob Schluntz
-// Last Modified On : Wed Jul 15 16:45:24 2015
-// Update Count     : 145
+// Last Modified On : Thu Jul 30 16:08:18 2015
+// Update Count     : 167
 //
 
@@ -228 +228 @@
                 // add the assignment statement after the 
                 // initialization of a type parameter
-                OPTPRINT( "tweak" )
-                InitTweak::tweak( translationUnit );
                 OPTPRINT( "validate" )
                 SymTab::validate( translationUnit, symtabp );
@@ -251 +249 @@
                 OPTPRINT( "fixNames" ) 
                 CodeGen::fixNames( translationUnit );
+                OPTPRINT( "tweak" )
+                InitTweak::tweak( translationUnit );
 
                 if ( libcfap ) {
@@ -339 +339 @@
 
         printAll( decls, std::cout );
+        deleteAll( translationUnit );
 }