Changes in src/ControlStruct/ExceptTranslate.cc [ba3706f:7543dec]

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