Changeset e67a82d for src/Tuples/TupleAssignment.cc

Timestamp:

Aug 20, 2020, 11:48:15 PM (5 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

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

Children:

d685cb0

Parents:

67ca73e (diff), 013b028 (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:

fix conflicts

File:

• src/Tuples/TupleAssignment.cc (modified) (8 diffs)

src/Tuples/TupleAssignment.cc

@@ -465 +465 @@
                                         // resolve ctor/dtor for the new object
                                         ast::ptr< ast::Init > ctorInit = ResolvExpr::resolveCtorInit(
-                                                        InitTweak::genCtorInit( location, ret ), spotter.crntFinder.symtab );
+                                                        InitTweak::genCtorInit( location, ret ), spotter.crntFinder.localSyms );
                                         // remove environments from subexpressions of stmtExpr
                                         ast::Pass< EnvRemover > rm{ env };
@@ -504 +504 @@
 
                         std::vector< ast::ptr< ast::Expr > > match() override {
-                                static UniqueName lhsNamer( "__massassign_L" );
-                                static UniqueName rhsNamer( "__massassign_R" );
+                                // temporary workaround for new and old ast to coexist and avoid name collision
+                                static UniqueName lhsNamer( "__massassign_Ln" );
+                                static UniqueName rhsNamer( "__massassign_Rn" );
                                 // empty tuple case falls into this matcher
                                 assert( lhs.empty() ? rhs.empty() : rhs.size() <= 1 );
@@ -534 +535 @@
 
                         std::vector< ast::ptr< ast::Expr > > match() override {
-                                static UniqueName lhsNamer( "__multassign_L" );
-                                static UniqueName rhsNamer( "__multassign_R" );
+                                // temporary workaround for new and old ast to coexist and avoid name collision
+                                static UniqueName lhsNamer( "__multassign_Ln" );
+                                static UniqueName rhsNamer( "__multassign_Rn" );
 
                                 if ( lhs.size() != rhs.size() ) return {};
@@ -560 +562 @@
                                         // resolve the cast expression so that rhsCand return type is bound by the cast
                                         // type as needed, and transfer the resulting environment
-                                        ResolvExpr::CandidateFinder finder{ spotter.crntFinder.symtab, env };
+                                        ResolvExpr::CandidateFinder finder{ spotter.crntFinder.localSyms, env };
                                         finder.find( rhsCand->expr, ResolvExpr::ResolvMode::withAdjustment() );
                                         assert( finder.candidates.size() == 1 );
@@ -609 +611 @@
                                         // explode the LHS so that each field of a tuple-valued expr is assigned
                                         ResolvExpr::CandidateList lhs;
-                                        explode( *lhsCand, crntFinder.symtab, back_inserter(lhs), true );
+                                        explode( *lhsCand, crntFinder.localSyms, back_inserter(lhs), true );
                                         for ( ResolvExpr::CandidateRef & cand : lhs ) {
                                                 // each LHS value must be a reference - some come in with a cast, if not
@@ -629 +631 @@
                                                         if ( isTuple( rhsCand->expr ) ) {
                                                                 // multiple assignment
-                                                                explode( *rhsCand, crntFinder.symtab, back_inserter(rhs), true );
+                                                                explode( *rhsCand, crntFinder.localSyms, back_inserter(rhs), true );
                                                                 matcher.reset(
                                                                         new MultipleAssignMatcher{ *this, expr->location, lhs, rhs } );
@@ -648 +650 @@
                                                         // multiple assignment
                                                         ResolvExpr::CandidateList rhs;
-                                                        explode( rhsCand, crntFinder.symtab, back_inserter(rhs), true );
+                                                        explode( rhsCand, crntFinder.localSyms, back_inserter(rhs), true );
                                                         matcher.reset(
                                                                 new MultipleAssignMatcher{ *this, expr->location, lhs, rhs } );
@@ -678 +680 @@
                                 )
 
-                                ResolvExpr::CandidateFinder finder{ crntFinder.symtab, matcher->env };
+                                ResolvExpr::CandidateFinder finder{ crntFinder.localSyms, matcher->env };
 
                                 try {