Changeset 1cdfa82 for src/SynTree/CompoundStmt.cc

Timestamp:

Apr 25, 2018, 4:55:53 PM (6 years ago)

Author:

Aaron Moss <a3moss@…>

Branches:

new-env, with_gc

Children:

42107b4

Parents:

2efe4b8 (diff), 9d5fb67 (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 remote-tracking branch 'origin/master' into with_gc

File:

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

src/SynTree/CompoundStmt.cc

@@ -23 +23 @@
 #include "Statement.h"                // for CompoundStmt, Statement, DeclStmt
 #include "SynTree/Label.h"            // for Label
-#include "SynTree/VarExprReplacer.h"  // for VarExprReplacer, VarExprReplace...
+#include "SynTree/DeclReplacer.h"     // for DeclReplacer
 
 using std::string;
@@ -49 +49 @@
         // recursively execute this routine. There may be more efficient ways of doing
         // this.
-        VarExprReplacer::DeclMap declMap;
+        DeclReplacer::DeclMap declMap;
         std::list< Statement * >::const_iterator origit = other.kids.begin();
         for ( Statement * s : kids ) {
@@ -64 +64 @@
         }
         if ( ! declMap.empty() ) {
-                VarExprReplacer::replace( this, declMap );
+                DeclReplacer::replace( this, declMap );
         }
 }