Changeset 5a40e4e for src/main.cc

Timestamp:

Sep 9, 2021, 3:56:32 PM (4 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

d0b9247

Parents:

dd1cc02 (diff), d8d512e (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) (4 diffs)

src/main.cc

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Henry Xue
-// Last Modified On : Tue Jul 20 04:27:35 2021
-// Update Count     : 658
+// Last Modified On : Mon Aug 23 15:42:08 2021
+// Update Count     : 650
 //
 
@@ -335 +335 @@
                 PASS( "Fix Names", CodeGen::fixNames( translationUnit ) );
                 PASS( "Gen Init", InitTweak::genInit( translationUnit ) );
-                PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( translationUnit ) );
+
                 if ( libcfap ) {
                         // generate the bodies of cfa library functions
@@ -365 +365 @@
                         }
                         auto transUnit = convert( move( translationUnit ) );
+
+                        PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( transUnit ) );
+                        
                         PASS( "Resolve", ResolvExpr::resolve( transUnit ) );
                         if ( exprp ) {
@@ -376 +379 @@
                         translationUnit = convert( move( transUnit ) );
                 } else {
+                        PASS( "Expand Member Tuples" , Tuples::expandMemberTuples( translationUnit ) );
+
                         PASS( "Resolve", ResolvExpr::resolve( translationUnit ) );
                         if ( exprp ) {