Changes in src/SynTree/CompoundStmt.cc [ba3706f:7543dec]

File:

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

src/SynTree/CompoundStmt.cc

@@ -28 +28 @@
 using std::endl;
 
-CompoundStmt::CompoundStmt() : Statement() {
+CompoundStmt::CompoundStmt( std::list<Label> labels ) : Statement( labels ) {
 }
 
-CompoundStmt::CompoundStmt( std::list<Statement *> stmts ) : Statement(), kids( stmts ) {
+CompoundStmt::CompoundStmt( std::list<Statement *> stmts ) : Statement( noLabels ), kids( stmts ) {
 }
 
@@ -59 +59 @@
                                 DeclarationWithType * origdwt = strict_dynamic_cast< DeclarationWithType * > ( origDeclStmt->get_decl() );
                                 assert( dwt->get_name() == origdwt->get_name() );
-                                declMap[ origdwt ] = dwt;
+                                declMap[ origdwt ] = new VariableExpr( dwt );
                         } else assert( ! dynamic_cast< DeclarationWithType * > ( origDeclStmt->get_decl() ) );
                 } else assert( ! dynamic_cast< DeclStmt * > ( s ) );
@@ -65 +65 @@
         if ( ! declMap.empty() ) {
                 VarExprReplacer replacer( declMap );
-                accept( replacer );
+                acceptMutator( replacer );
         }
 }