Changeset b7fd9daf for src/main.cc

Timestamp:

Nov 10, 2021, 7:47:45 PM (2 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

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

Children:

3249dd8b

Parents:

1622af5 (diff), f95634e (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 'new-ast-unique-expr'

File:

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

src/main.cc

@@ -381 +381 @@
                         PASS( "Fix Init", InitTweak::fix(transUnit, buildingLibrary()));
 
+                        // fix ObjectDecl - replaces ConstructorInit nodes
+                        if ( ctorinitp ) {
+                                dump( move( transUnit ) );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        // Currently not working due to unresolved issues with UniqueExpr
+                        PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( transUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent 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
                         translationUnit = convert( move( transUnit ) );
                 } else {
@@ -435 +443 @@
 
                         PASS( "Fix Init", InitTweak::fix( translationUnit, buildingLibrary() ) );
+
+                        // fix ObjectDecl - replaces ConstructorInit nodes
+                        if ( ctorinitp ) {
+                                dump ( translationUnit );
+                                return EXIT_SUCCESS;
+                        } // if
+
+                        PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( translationUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent 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
                 }
-
-                // fix ObjectDecl - replaces ConstructorInit nodes
-                if ( ctorinitp ) {
-                        dump ( translationUnit );
-                        return EXIT_SUCCESS;
-                } // if
-
-                PASS( "Expand Unique Expr", Tuples::expandUniqueExpr( translationUnit ) ); // xxx - is this the right place for this? want to expand ASAP so tha, sequent 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
 
                 PASS( "Translate Tries" , ControlStruct::translateTries( translationUnit ) );