Changeset ba3706f for src/ControlStruct/ExceptTranslate.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/ControlStruct/ExceptTranslate.cc (modified) (23 diffs)

src/ControlStruct/ExceptTranslate.cc

@@ -30 +30 @@
 #include "SynTree/Expression.h"       // for UntypedExpr, ConstantExpr, Name...
 #include "SynTree/Initializer.h"      // for SingleInit, ListInit
-#include "SynTree/Label.h"            // for Label, noLabels
+#include "SynTree/Label.h"            // for Label
 #include "SynTree/Mutator.h"          // for mutateAll
 #include "SynTree/Statement.h"        // for CompoundStmt, CatchStmt, ThrowStmt
@@ -57 +57 @@
 
         void appendDeclStmt( CompoundStmt * block, Declaration * item ) {
-                block->push_back(new DeclStmt(noLabels, item));
+                block->push_back(new DeclStmt(item));
         }
 
@@ -205 +205 @@
                 throwStmt->set_expr( nullptr );
                 delete throwStmt;
-                return new ExprStmt( noLabels, call );
+                return new ExprStmt( call );
         }
 
@@ -220 +220 @@
                 assert( handler_except_decl );
 
-                CompoundStmt * result = new CompoundStmt( throwStmt->get_labels() );
-                result->push_back( new ExprStmt( noLabels, UntypedExpr::createAssign(
+                CompoundStmt * result = new CompoundStmt();
+                result->labels =  throwStmt->labels;
+                result->push_back( new ExprStmt( UntypedExpr::createAssign(
                         nameOf( handler_except_decl ),
                         new ConstantExpr( Constant::null(
@@ -231 +232 @@
                         ) ) );
                 result->push_back( new ExprStmt(
-                        noLabels,
                         new UntypedExpr( new NameExpr( "__cfaehm__rethrow_terminate" ) )
                         ) );
@@ -248 +248 @@
                 // return false;
                 Statement * result = new ReturnStmt(
-                        throwStmt->get_labels(),
                         new ConstantExpr( Constant::from_bool( false ) )
                         );
+                result->labels = throwStmt->labels;
                 delete throwStmt;
                 return result;
@@ -291 +291 @@
                         // }
                         // return;
-                        CompoundStmt * block = new CompoundStmt( noLabels );
+                        CompoundStmt * block = new CompoundStmt();
 
                         // Just copy the exception value. (Post Validation)
@@ -304 +304 @@
                                         ) })
                                 );
-                        block->push_back( new DeclStmt( noLabels, local_except ) );
+                        block->push_back( new DeclStmt( local_except ) );
 
                         // Add the cleanup attribute.
@@ -324 +324 @@
 
                         std::list<Statement *> caseBody
-                                        { block, new ReturnStmt( noLabels, nullptr ) };
+                                        { block, new ReturnStmt( nullptr ) };
                         handler_wrappers.push_back( new CaseStmt(
-                                noLabels,
                                 new ConstantExpr( Constant::from_int( index ) ),
                                 caseBody
@@ -340 +339 @@
 
                 SwitchStmt * handler_lookup = new SwitchStmt(
-                        noLabels,
                         nameOf( index_obj ),
                         stmt_handlers
                         );
-                CompoundStmt * body = new CompoundStmt( noLabels );
+                CompoundStmt * body = new CompoundStmt();
                 body->push_back( handler_lookup );
 
@@ -363 +361 @@
                 // }
 
-                CompoundStmt * block = new CompoundStmt( noLabels );
+                CompoundStmt * block = new CompoundStmt();
 
                 // Local Declaration
@@ -369 +367 @@
                         dynamic_cast<ObjectDecl *>( modded_handler->get_decl() );
                 assert( local_except );
-                block->push_back( new DeclStmt( noLabels, local_except ) );
+                block->push_back( new DeclStmt( local_except ) );
 
                 // Check for type match.
@@ -381 +379 @@
                 }
                 // Construct the match condition.
-                block->push_back( new IfStmt( noLabels,
+                block->push_back( new IfStmt(
                         cond, modded_handler->get_body(), nullptr ) );
 
@@ -397 +395 @@
                 // }
 
-                CompoundStmt * body = new CompoundStmt( noLabels );
+                CompoundStmt * body = new CompoundStmt();
 
                 FunctionType * func_type = match_func_t.clone();
@@ -413 +411 @@
 
                         // Create new body.
-                        handler->set_body( new ReturnStmt( noLabels,
+                        handler->set_body( new ReturnStmt(
                                 new ConstantExpr( Constant::from_int( index ) ) ) );
 
@@ -421 +419 @@
                 }
 
-                body->push_back( new ReturnStmt( noLabels,
+                body->push_back( new ReturnStmt(
                         new ConstantExpr( Constant::from_int( 0 ) ) ) );
 
@@ -441 +439 @@
                 args.push_back( nameOf( terminate_match ) );
 
-                CompoundStmt * callStmt = new CompoundStmt( noLabels );
-                callStmt->push_back( new ExprStmt( noLabels, caller ) );
+                CompoundStmt * callStmt = new CompoundStmt();
+                callStmt->push_back( new ExprStmt( caller ) );
                 return callStmt;
         }
@@ -451 +449 @@
                 //     HANDLER WRAPPERS { `hander->body`; return true; }
                 // }
-                CompoundStmt * body = new CompoundStmt( noLabels );
+                CompoundStmt * body = new CompoundStmt();
 
                 FunctionType * func_type = handle_func_t.clone();
@@ -464 +462 @@
                                 dynamic_cast<CompoundStmt*>( handler->get_body() );
                         if ( ! handling_code ) {
-                                handling_code = new CompoundStmt( noLabels );
+                                handling_code = new CompoundStmt();
                                 handling_code->push_back( handler->get_body() );
                         }
-                        handling_code->push_back( new ReturnStmt( noLabels,
+                        handling_code->push_back( new ReturnStmt(
                                 new ConstantExpr( Constant::from_bool( true ) ) ) );
                         handler->set_body( handling_code );
@@ -476 +474 @@
                 }
 
-                body->push_back( new ReturnStmt( noLabels,
+                body->push_back( new ReturnStmt(
                         new ConstantExpr( Constant::from_bool( false ) ) ) );
 
@@ -486 +484 @@
                         Statement * wraps,
                         FunctionDecl * resume_handler ) {
-                CompoundStmt * body = new CompoundStmt( noLabels );
+                CompoundStmt * body = new CompoundStmt();
 
                 // struct __try_resume_node __resume_node
@@ -521 +519 @@
                 setup->get_args().push_back( nameOf( resume_handler ) );
 
-                body->push_back( new ExprStmt( noLabels, setup ) );
+                body->push_back( new ExprStmt( setup ) );
 
                 body->push_back( wraps );
@@ -646 +644 @@
                 // Generate a prefix for the function names?
 
-                CompoundStmt * block = new CompoundStmt( noLabels );
+                CompoundStmt * block = new CompoundStmt();
                 CompoundStmt * inner = take_try_block( tryStmt );