Changeset 17c6edeb for src/main.cc

Timestamp:

Aug 16, 2022, 2:52:24 PM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

71cf630

Parents:

32d1383 (diff), e116db3 (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

@@ -10 +10 @@
 // Created On       : Fri May 15 23:12:02 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 18 11:08:00 2022
-// Update Count     : 676
+// Last Modified On : Thu 11 12:18:00 2022
+// Update Count     : 677
 //
 
@@ -443 +443 @@
                         PASS( "Convert Specializations",  GenPoly::convertSpecializations( transUnit ) );
 
+                        PASS( "Expand Tuples", Tuples::expandTuples( transUnit ) );
+
+                        if ( tuplep ) {
+                                dump( move( transUnit ) );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        // Must come after Translate Tries.
+                        PASS( "Virtual Expand Casts", Virtual::expandCasts( transUnit ) );
+
                         translationUnit = convert( move( transUnit ) );
                 } else {
@@ -517 +527 @@
                         PASS( "Gen Waitfor", Concurrency::generateWaitFor( translationUnit ) );
                         PASS( "Convert Specializations",  GenPoly::convertSpecializations( translationUnit ) ); // needs to happen before tuple types are expanded
+                        PASS( "Expand Tuples", Tuples::expandTuples( translationUnit ) ); // xxx - is this the right place for this?
+
+                        if ( tuplep ) {
+                                dump( translationUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        PASS( "Virtual Expand Casts", Virtual::expandCasts( translationUnit ) ); // Must come after translateEHM
                 }
-
-                PASS( "Expand Tuples", Tuples::expandTuples( translationUnit ) ); // xxx - is this the right place for this?
-
-                if ( tuplep ) {
-                        dump( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
-
-                PASS( "Virtual Expand Casts", Virtual::expandCasts( translationUnit ) ); // Must come after translateEHM
 
                 PASS( "Instantiate Generics", GenPoly::instantiateGeneric( translationUnit ) );