Changeset ba3706f for src/InitTweak/InitTweak.cc

Timestamp:

Nov 30, 2017, 4:43:59 PM (6 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:

c50d54d

Parents:

4429b04

Message:

Remove label lists from various Statement constructors

File:

• src/InitTweak/InitTweak.cc (modified) (4 diffs)

src/InitTweak/InitTweak.cc

@@ -19 +19 @@
 #include "SynTree/Expression.h"    // for Expression, UntypedExpr, Applicati...
 #include "SynTree/Initializer.h"   // for Initializer, ListInit, Designation
-#include "SynTree/Label.h"         // for Label, noLabels
+#include "SynTree/Label.h"         // for Label
 #include "SynTree/Statement.h"     // for CompoundStmt, ExprStmt, BranchStmt
 #include "SynTree/Type.h"          // for FunctionType, ArrayType, PointerType
@@ -195 +195 @@
                         callExpr->get_args().splice( callExpr->get_args().end(), args );
 
-                        *out++ = new IfStmt( noLabels, cond, new ExprStmt( noLabels, callExpr ), nullptr );
+                        *out++ = new IfStmt( cond, new ExprStmt( callExpr ), nullptr );
 
                         UntypedExpr * increment = new UntypedExpr( new NameExpr( "++?" ) );
                         increment->get_args().push_back( index->clone() );
-                        *out++ = new ExprStmt( noLabels, increment );
+                        *out++ = new ExprStmt( increment );
                 }
 
@@ -244 +244 @@
                                         std::list< Statement * > stmts;
                                         build( callExpr, idx, idxEnd, init, back_inserter( stmts ) );
-                                        stmts.push_back( new BranchStmt( noLabels, switchLabel, BranchStmt::Break ) );
-                                        CaseStmt * caseStmt = new CaseStmt( noLabels, condition, stmts );
+                                        stmts.push_back( new BranchStmt( switchLabel, BranchStmt::Break ) );
+                                        CaseStmt * caseStmt = new CaseStmt( condition, stmts );
                                         branches.push_back( caseStmt );
                                 }
-                                *out++ = new SwitchStmt( noLabels, index->clone(), branches );
-                                *out++ = new NullStmt( std::list<Label>{ switchLabel } );
+                                *out++ = new SwitchStmt( index->clone(), branches );
+                                *out++ = new NullStmt( { switchLabel } );
                         }
                 }
@@ -262 +262 @@
         Statement * InitImpl::buildListInit( UntypedExpr * dst, std::list< Expression * > & indices ) {
                 if ( ! init ) return nullptr;
-                CompoundStmt * block = new CompoundStmt( noLabels );
+                CompoundStmt * block = new CompoundStmt();
                 build( dst, indices.begin(), indices.end(), init, back_inserter( block->get_kids() ) );
                 if ( block->get_kids().empty() ) {