Changeset 23bb1b9 for src/SynTree/TupleExpr.cc

Timestamp:

Nov 9, 2016, 2:10:00 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:

141b786

Parents:

b3b2077

git-author:

Rob Schluntz <rschlunt@…> (11/09/16 14:09:29)

git-committer:

Rob Schluntz <rschlunt@…> (11/09/16 14:10:00)

Message:

refactor VarExprReplacer? and reuse it in TupleAssignExpr?

File:

• src/SynTree/TupleExpr.cc (modified) (2 diffs)

src/SynTree/TupleExpr.cc

@@ -19 +19 @@
 #include "Declaration.h"
 #include "Tuples/Tuples.h"
+#include "VarExprReplacer.h"
 
 TupleExpr::TupleExpr( const std::list< Expression * > & exprs, Expression *_aname ) : Expression( _aname ), exprs( exprs ) {
@@ -91 +92 @@
 }
 
-TupleAssignExpr::TupleAssignExpr( const TupleAssignExpr &other ) : Expression( other ), tempDecls( other.tempDecls ) /* temporary */ {
+TupleAssignExpr::TupleAssignExpr( const TupleAssignExpr &other ) : Expression( other ) {
         cloneAll( other.assigns, assigns );
-        // xxx - clone needs to go into assigns and replace tempDecls
+        cloneAll( other.tempDecls, tempDecls );
+
+        // clone needs to go into assigns and replace tempDecls
+        VarExprReplacer::DeclMap declMap;
+        std::list< ObjectDecl * >::const_iterator origit = other.tempDecls.begin();
+        for ( ObjectDecl * temp : tempDecls ) {
+                assert( origit != other.tempDecls.end() );
+                ObjectDecl * origTemp = *origit++;
+                assert( origTemp );
+                assert( temp->get_name() == origTemp->get_name() );
+                declMap[ origTemp ] = temp;
+        }
+        if ( ! declMap.empty() ) {
+                VarExprReplacer replacer( declMap );
+                for ( Expression * assn : assigns ) {
+                        assn->accept( replacer );
+                }
+        }
 }