Changeset e9145a3 for src/ControlStruct/ExceptTranslate.cc

Timestamp:

Aug 17, 2017, 4:13:42 PM (7 years ago)

Author:

Andrew Beach <ajbeach@…>

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:

8f6dfe7

Parents:

21f0aa8

Message:

Updated exception tests to exception structures. Should be re-orginized still.

File:

• src/ControlStruct/ExceptTranslate.cc (modified) (8 diffs)

src/ControlStruct/ExceptTranslate.cc

@@ -10 +10 @@
 // Created On       : Wed Jun 14 16:49:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Tus Aug  8 16:54:00 2017
-// Update Count     : 7
+// Last Modified On : Thr Aug 17 15:48:00 2017
+// Update Count     : 8
 //
 
@@ -387 +387 @@
         }
 
+        // TODO: Stoping the function from generating the 'return variable'
+        // entirely would be cleaner. But this does get ride of warnings.
+        CompoundStmt * set_and_ret(DeclarationWithType * var, Expression * val) {
+                CompoundStmt * block = new CompoundStmt( noLabels );
+                block->push_back( new ExprStmt( noLabels,
+                        UntypedExpr::createAssign( new VariableExpr( var ), val )
+                        ) );
+                block->push_back( new ReturnStmt( noLabels,
+                        new VariableExpr( var )
+                        ) );
+                return block;
+        }
+
         FunctionDecl * ExceptionMutatorCore::create_terminate_match(
                         CatchList &handlers ) {
@@ -397 +410 @@
                 FunctionType * func_type = match_func_t.clone();
                 DeclarationWithType * except_obj = func_type->get_parameters().back();
+                DeclarationWithType * index_obj = func_type->get_returnVals().front();
 
                 // Index 1..{number of handlers}
@@ -409 +423 @@
 
                         // Create new body.
-                        handler->set_body( new ReturnStmt( noLabels,
+                        handler->set_body( set_and_ret( index_obj,
                                 new ConstantExpr( Constant::from_int( index ) ) ) );
 
@@ -417 +431 @@
                 }
 
-                body->push_back( new ReturnStmt( noLabels, new ConstantExpr(
-                        Constant::from_int( 0 ) ) ) );
+                body->push_back( set_and_ret( index_obj,
+                        new ConstantExpr( Constant::from_int( 0 ) ) ) );
 
                 return new FunctionDecl("match", Type::StorageClasses(),
@@ -449 +463 @@
                 CompoundStmt * body = new CompoundStmt( noLabels );
 
-                FunctionType * func_type = match_func_t.clone();
+                FunctionType * func_type = handle_func_t.clone();
                 DeclarationWithType * except_obj = func_type->get_parameters().back();
+                DeclarationWithType * bool_obj = func_type->get_returnVals().front();
 
                 CatchList::iterator it;
@@ -463 +478 @@
                                 handling_code->push_back( handler->get_body() );
                         }
-                        handling_code->push_back( new ReturnStmt( noLabels,
+                        handling_code->push_back( set_and_ret( bool_obj,
                                 new ConstantExpr( Constant::from_bool( true ) ) ) );
                         handler->set_body( handling_code );
@@ -472 +487 @@
                 }
 
-                body->push_back( new ReturnStmt( noLabels, new ConstantExpr(
-                        Constant::from_bool( false ) ) ) );
+                body->push_back( set_and_ret( bool_obj,
+                        new ConstantExpr( Constant::from_bool( false ) ) ) );
 
                 return new FunctionDecl("handle", Type::StorageClasses(),