Changeset b3b2077 for src/Tuples/TupleAssignment.cc

Timestamp:

Nov 9, 2016, 2:05:09 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

23bb1b9

Parents:

8780e30

Message:

refactor some code that generates dereference and assignment calls

File:

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

src/Tuples/TupleAssignment.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Mon May 18 15:02:53 2015
+// Last Modified By : Rob Schluntz
+// Last Modified On : Wed Nov 9 13:48:42 2016
 // Update Count     : 2
 //
@@ -180 +180 @@
                 // explode the lhs so that each field of the tuple-valued-expr is assigned.
                 explode( lhsAlt, spotter.currentFinder.get_indexer(), back_inserter(lhs) );
+
                 // and finally, re-add the cast to each lhs expr, so that qualified tuple fields can be constructed
                 if ( isCast ) {
@@ -192 +193 @@
                         }
                 }
-                // }
-        }
-
-        TupleAssignSpotter::MassAssignMatcher::MassAssignMatcher( TupleAssignSpotter &spotter,const ResolvExpr::AltList & alts ) : Matcher( spotter, alts ) {
+        }
+
+        TupleAssignSpotter::MassAssignMatcher::MassAssignMatcher( TupleAssignSpotter &spotter, const ResolvExpr::AltList & alts ) : Matcher( spotter, alts ) {
                 assert( alts.size() == 1 || alts.size() == 2 );
                 if ( alts.size() == 2 ) {
@@ -210 +210 @@
                 assert( left );
                 std::list< Expression * > args;
-                args.push_back( new AddressExpr( new UntypedExpr( new NameExpr("*?"), std::list< Expression * >{ new VariableExpr( left ) } ) ) );
+                args.push_back( new AddressExpr( UntypedExpr::createDeref( new VariableExpr( left ) ) ) );
                 // args.push_back( new AddressExpr( new VariableExpr( left ) ) );
                 if ( right ) args.push_back( new VariableExpr( right ) );
@@ -238 +238 @@
                 static UniqueName lhsNamer( "__multassign_L" );
                 static UniqueName rhsNamer( "__multassign_R" );
+
                 // xxx - need more complicated matching?
                 if ( lhs.size() == rhs.size() ) {