Changeset 90152a4 for src/SynTree/FunctionDecl.cc

Timestamp:

Aug 27, 2018, 4:40:34 PM (7 years ago)

Author:

Rob Schluntz <rschlunt@…>

Branches:

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

Children:

b7c89aa

Parents:

f9feab8 (diff), 305581d (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' into cleanup-dtors

File:

• src/SynTree/FunctionDecl.cc (modified) (3 diffs)

src/SynTree/FunctionDecl.cc

@@ -26 +26 @@
 #include "Statement.h"           // for CompoundStmt
 #include "Type.h"                // for Type, FunctionType, Type::FuncSpecif...
-#include "VarExprReplacer.h"
+#include "DeclReplacer.h"
 
 extern bool translation_unit_nomain;
@@ -41 +41 @@
                 : Parent( other ), type( maybeClone( other.type ) ), statements( maybeClone( other.statements ) ) {
 
-        VarExprReplacer::DeclMap declMap;
+        DeclReplacer::DeclMap declMap;
         for ( auto p : group_iterate( other.type->parameters, type->parameters ) ) {
-                declMap[ std::get<0>(p) ] = new VariableExpr( std::get<1>(p) );
+                declMap[ std::get<0>(p) ] = std::get<1>(p);
         }
         for ( auto p : group_iterate( other.type->returnVals, type->returnVals ) ) {
-                declMap[ std::get<0>(p) ] = new VariableExpr( std::get<1>(p) );
+                declMap[ std::get<0>(p) ] = std::get<1>(p);
         }
         if ( ! declMap.empty() ) {
-                VarExprReplacer replacer( declMap );
-                acceptMutator( replacer );
+                DeclReplacer::replace( this, declMap );
         }
+        cloneAll( other.withExprs, withExprs );
 }
 
@@ -57 +57 @@
         delete type;
         delete statements;
+        deleteAll( withExprs );
 }