Changeset 1f44196 for src/main.cc

Timestamp:

Nov 29, 2016, 3:30:59 PM (9 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

8e5724e

Parents:

3a2128f (diff), 9129a84 (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 plg2:software/cfa/cfa-cc

Conflicts:

src/Parser/parser.cc

File:

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

src/main.cc

@@ -43 +43 @@
 #include "Common/UnimplementedError.h"
 #include "../config.h"
+#include "Tuples/Tuples.h"
 
 using namespace std;
@@ -236 +237 @@
                 OPTPRINT( "tweakInit" )
                 InitTweak::genInit( translationUnit );
-
+                OPTPRINT( "expandMemberTuples" );
+                Tuples::expandMemberTuples( translationUnit );
                 if ( libcfap ) {
                         // generate the bodies of cfa library functions
@@ -261 +263 @@
                         return 0;
                 } // if
+
+                OPTPRINT( "expandUniqueExpr" ); // xxx - is this the right place for this? want to expand ASAP so that subsequent passes don't need to worry about double-visiting a unique expr - needs to go after InitTweak::fix so that copy constructed return declarations are reused
+                Tuples::expandUniqueExpr( translationUnit );
 
                 OPTPRINT("instantiateGenerics")
@@ -277 +282 @@
                 OPTPRINT( "box" )
                 GenPoly::box( translationUnit );
+                OPTPRINT( "expandTuples" ); // xxx - is this the right place for this?
+                Tuples::expandTuples( translationUnit );
 
                 // print tree right before code generation