Changeset 0ddb713 for src/main.cc

Timestamp:

Dec 2, 2015, 11:58:59 AM (8 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:

9cb8e88d

Parents:

9ed3237 (diff), f2b2029 (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 ctor

File:

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

src/main.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Fri May 15 23:12:02 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Thu Jul 30 16:08:18 2015
-// Update Count     : 167
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Nov 19 22:31:40 2015
+// Update Count     : 168
 //
 
@@ -24 +24 @@
 #include "SynTree/Declaration.h"
 #include "SynTree/Visitor.h"
+#include "GenPoly/InstantiateGeneric.h"
 #include "GenPoly/Lvalue.h"
 #include "GenPoly/Specialize.h"
@@ -226 +227 @@
                 } // if
 
-                // add the assignment statement after the 
-                // initialization of a type parameter
+                // add the assignment statement after the initialization of a type parameter
                 OPTPRINT( "validate" )
                 SymTab::validate( translationUnit, symtabp );
@@ -268 +268 @@
                 }
 
+                OPTPRINT( "instantiateGeneric" )
+                GenPoly::instantiateGeneric( translationUnit );
                 OPTPRINT( "copyParams" );
                 GenPoly::copyParams( translationUnit );