Changeset ba3706f for src/GenPoly/Box.cc

Timestamp:

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

c50d54d

Parents:

4429b04

Message:

Remove label lists from various Statement constructors

File:

• src/GenPoly/Box.cc (modified) (14 diffs)

src/GenPoly/Box.cc

@@ -49 +49 @@
 #include "SynTree/Expression.h"          // for ApplicationExpr, UntypedExpr
 #include "SynTree/Initializer.h"         // for SingleInit, Initializer, Lis...
-#include "SynTree/Label.h"               // for Label, noLabels
+#include "SynTree/Label.h"               // for Label
 #include "SynTree/Mutator.h"             // for maybeMutate, Mutator, mutateAll
 #include "SynTree/Statement.h"           // for ExprStmt, DeclStmt, ReturnStmt
@@ -293 +293 @@
                 FunctionDecl *layoutDecl = new FunctionDecl( layoutofName( typeDecl ),
                                                                                                          functionNesting > 0 ? Type::StorageClasses() : Type::StorageClasses( Type::Static ),
-                                                                                                         LinkageSpec::AutoGen, layoutFnType, new CompoundStmt( noLabels ),
+                                                                                                         LinkageSpec::AutoGen, layoutFnType, new CompoundStmt(),
                                                                                                          std::list< Attribute * >(), Type::FuncSpecifiers( Type::Inline ) );
                 layoutDecl->fixUniqueId();
@@ -321 +321 @@
         /// makes an if-statement with a single-expression if-block and no then block
         Statement *makeCond( Expression *cond, Expression *ifPart ) {
-                return new IfStmt( noLabels, cond, new ExprStmt( noLabels, ifPart ), 0 );
+                return new IfStmt( cond, new ExprStmt( ifPart ), 0 );
         }
 
@@ -340 +340 @@
         /// adds an expression to a compound statement
         void addExpr( CompoundStmt *stmts, Expression *expr ) {
-                stmts->get_kids().push_back( new ExprStmt( noLabels, expr ) );
+                stmts->get_kids().push_back( new ExprStmt( expr ) );
         }
 
@@ -629 +629 @@
                 ObjectDecl *Pass1::makeTemporary( Type *type ) {
                         ObjectDecl *newObj = new ObjectDecl( tempNamer.newName(), Type::StorageClasses(), LinkageSpec::C, 0, type, 0 );
-                        stmtsToAddBefore.push_back( new DeclStmt( noLabels, newObj ) );
+                        stmtsToAddBefore.push_back( new DeclStmt( newObj ) );
                         return newObj;
                 }
@@ -740 +740 @@
                                 ObjectDecl *newObj = ObjectDecl::newObject( tempNamer.newName(), newType, nullptr );
                                 newObj->get_type()->get_qualifiers() = Type::Qualifiers(); // TODO: is this right???
-                                stmtsToAddBefore.push_back( new DeclStmt( noLabels, newObj ) );
+                                stmtsToAddBefore.push_back( new DeclStmt( newObj ) );
                                 UntypedExpr *assign = new UntypedExpr( new NameExpr( "?=?" ) ); // TODO: why doesn't this just use initialization syntax?
                                 assign->get_args().push_back( new VariableExpr( newObj ) );
                                 assign->get_args().push_back( arg );
-                                stmtsToAddBefore.push_back( new ExprStmt( noLabels, assign ) );
+                                stmtsToAddBefore.push_back( new ExprStmt( assign ) );
                                 arg = new AddressExpr( new VariableExpr( newObj ) );
                         } // if
@@ -888 +888 @@
                                 // void return
                                 addAdapterParams( adapteeApp, arg, param, adapterType->get_parameters().end(), realParam, tyVars );
-                                bodyStmt = new ExprStmt( noLabels, adapteeApp );
+                                bodyStmt = new ExprStmt( adapteeApp );
                         } else if ( isDynType( adaptee->get_returnVals().front()->get_type(), tyVars ) ) {
                                 // return type T
@@ -900 +900 @@
                                 addAdapterParams( adapteeApp, arg, param, adapterType->get_parameters().end(), realParam, tyVars );
                                 assign->get_args().push_back( adapteeApp );
-                                bodyStmt = new ExprStmt( noLabels, assign );
+                                bodyStmt = new ExprStmt( assign );
                         } else {
                                 // adapter for a function that returns a monomorphic value
                                 addAdapterParams( adapteeApp, arg, param, adapterType->get_parameters().end(), realParam, tyVars );
-                                bodyStmt = new ReturnStmt( noLabels, adapteeApp );
+                                bodyStmt = new ReturnStmt( adapteeApp );
                         } // if
-                        CompoundStmt *adapterBody = new CompoundStmt( noLabels );
+                        CompoundStmt *adapterBody = new CompoundStmt();
                         adapterBody->get_kids().push_back( bodyStmt );
                         std::string adapterName = makeAdapterName( mangleName );
@@ -952 +952 @@
                                                 std::pair< AdapterIter, bool > answer = adapters.insert( std::pair< std::string, DeclarationWithType *>( mangleName, newAdapter ) );
                                                 adapter = answer.first;
-                                                stmtsToAddBefore.push_back( new DeclStmt( noLabels, newAdapter ) );
+                                                stmtsToAddBefore.push_back( new DeclStmt( newAdapter ) );
                                         } // if
                                         assert( adapter != adapters.end() );
@@ -1279 +1279 @@
                                                 retval->set_name( "_retval" );
                                         }
-                                        functionDecl->get_statements()->get_kids().push_front( new DeclStmt( noLabels, retval ) );
+                                        functionDecl->get_statements()->get_kids().push_front( new DeclStmt( retval ) );
                                         DeclarationWithType * newRet = retval->clone(); // for ownership purposes
                                         ftype->get_returnVals().front() = newRet;
@@ -1519 +1519 @@
                                         // (alloca was previously used, but can't be safely used in loops)
                                         ObjectDecl *newBuf = ObjectDecl::newObject( bufNamer.newName(), polyToMonoType( objectDecl->type ), nullptr );
-                                        stmtsToAddBefore.push_back( new DeclStmt( noLabels, newBuf ) );
+                                        stmtsToAddBefore.push_back( new DeclStmt( newBuf ) );
 
                                         delete objectDecl->get_init();
@@ -1598 +1598 @@
                 ObjectDecl *PolyGenericCalculator::makeVar( const std::string &name, Type *type, Initializer *init ) {
                         ObjectDecl *newObj = new ObjectDecl( name, Type::StorageClasses(), LinkageSpec::C, 0, type, init );
-                        stmtsToAddBefore.push_back( new DeclStmt( noLabels, newObj ) );
+                        stmtsToAddBefore.push_back( new DeclStmt( newObj ) );
                         return newObj;
                 }
@@ -1677 +1677 @@
                                         addOtypeParamsToLayoutCall( layoutCall, otypeParams );
 
-                                        stmtsToAddBefore.push_back( new ExprStmt( noLabels, layoutCall ) );
+                                        stmtsToAddBefore.push_back( new ExprStmt( layoutCall ) );
                                 }
 
@@ -1703 +1703 @@
                                 addOtypeParamsToLayoutCall( layoutCall, otypeParams );
 
-                                stmtsToAddBefore.push_back( new ExprStmt( noLabels, layoutCall ) );
+                                stmtsToAddBefore.push_back( new ExprStmt( layoutCall ) );
 
                                 return true;