Changeset 7a70fb2 for src/Tuples/TupleAssignment.cc

Timestamp:

Dec 17, 2020, 10:34:27 AM (3 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

852ae0ea

Parents:

72a3aff (diff), 28e88d7 (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/Tuples/TupleAssignment.cc (modified) (2 diffs)

src/Tuples/TupleAssignment.cc

@@ -504 +504 @@
 
                         std::vector< ast::ptr< ast::Expr > > match() override {
-                                // temporary workaround for new and old ast to coexist and avoid name collision
-                                static UniqueName lhsNamer( "__massassign_Ln" );
-                                static UniqueName rhsNamer( "__massassign_Rn" );
+                                static UniqueName lhsNamer( "__massassign_L" );
+                                static UniqueName rhsNamer( "__massassign_R" );
                                 // empty tuple case falls into this matcher
                                 assert( lhs.empty() ? rhs.empty() : rhs.size() <= 1 );
@@ -535 +534 @@
 
                         std::vector< ast::ptr< ast::Expr > > match() override {
-                                // temporary workaround for new and old ast to coexist and avoid name collision
-                                static UniqueName lhsNamer( "__multassign_Ln" );
-                                static UniqueName rhsNamer( "__multassign_Rn" );
+                                static UniqueName lhsNamer( "__multassign_L" );
+                                static UniqueName rhsNamer( "__multassign_R" );
 
                                 if ( lhs.size() != rhs.size() ) return {};