Changes in src/ControlStruct/ExceptTranslate.cc [8f6dfe7:cbce272]

File:

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

src/ControlStruct/ExceptTranslate.cc

@@ -10 +10 @@
 // Created On       : Wed Jun 14 16:49:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug 17 17:19:00 2017
-// Update Count     : 9
+// Last Modified On : Tus Aug  8 16:54:00 2017
+// Update Count     : 7
 //
 
 #include "ExceptTranslate.h"
-
-#include <stddef.h>                   // for NULL
-#include <cassert>                    // for assert, assertf
-#include <iterator>                   // for back_inserter, inserter
-#include <string>                     // for string, operator==
-
-#include "Common/PassVisitor.h"       // for PassVisitor, WithGuards
-#include "Common/SemanticError.h"     // for SemanticError
-#include "Common/utility.h"           // for CodeLocation
-#include "Parser/LinkageSpec.h"       // for Cforall
-#include "SynTree/Attribute.h"        // for Attribute
-#include "SynTree/Constant.h"         // for Constant
-#include "SynTree/Declaration.h"      // for ObjectDecl, FunctionDecl, Struc...
-#include "SynTree/Expression.h"       // for UntypedExpr, ConstantExpr, Name...
-#include "SynTree/Initializer.h"      // for SingleInit, ListInit
-#include "SynTree/Label.h"            // for Label, noLabels
-#include "SynTree/Mutator.h"          // for mutateAll
-#include "SynTree/Statement.h"        // for CompoundStmt, CatchStmt, ThrowStmt
-#include "SynTree/Type.h"             // for FunctionType, Type, noQualifiers
-#include "SynTree/VarExprReplacer.h"  // for VarExprReplacer, VarExprReplace...
-#include "SynTree/Visitor.h"          // for acceptAll
+#include "Common/PassVisitor.h"
+#include "SynTree/Statement.h"
+#include "SynTree/Declaration.h"
+#include "SynTree/Expression.h"
+#include "SynTree/Type.h"
+#include "SynTree/Attribute.h"
+#include "SynTree/VarExprReplacer.h"
 
 namespace ControlStruct {
@@ -166 +152 @@
                         /*bitfieldWidth*/ NULL,
                         new BasicType( noQualifiers, BasicType::Bool ),
-                        /*init*/ NULL,
-                        std::list<Attribute *>{ new Attribute( "unused" ) }
+                        /*init*/ NULL
                         );
                 ObjectDecl voidptr_obj(
@@ -184 +169 @@
                         );
 
-                ObjectDecl * unused_index_obj = index_obj.clone();
-                unused_index_obj->attributes.push_back( new Attribute( "unused" ) );
-
                 catch_func_t.get_parameters().push_back( index_obj.clone() );
                 catch_func_t.get_parameters().push_back( exception_obj.clone() );
-                match_func_t.get_returnVals().push_back( unused_index_obj );
+                match_func_t.get_returnVals().push_back( index_obj.clone() );
                 match_func_t.get_parameters().push_back( exception_obj.clone() );
                 handle_func_t.get_returnVals().push_back( bool_obj.clone() );
@@ -421 +403 @@
                 }
 
-                body->push_back( new ReturnStmt( noLabels,
-                        new ConstantExpr( Constant::from_int( 0 ) ) ) );
+                body->push_back( new ReturnStmt( noLabels, new ConstantExpr(
+                        Constant::from_int( 0 ) ) ) );
 
                 return new FunctionDecl("match", Type::StorageClasses(),
@@ -453 +435 @@
                 CompoundStmt * body = new CompoundStmt( noLabels );
 
-                FunctionType * func_type = handle_func_t.clone();
+                FunctionType * func_type = match_func_t.clone();
                 DeclarationWithType * except_obj = func_type->get_parameters().back();
 
@@ -476 +458 @@
                 }
 
-                body->push_back( new ReturnStmt( noLabels,
-                        new ConstantExpr( Constant::from_bool( false ) ) ) );
+                body->push_back( new ReturnStmt( noLabels, new ConstantExpr(
+                        Constant::from_bool( false ) ) ) );
 
                 return new FunctionDecl("handle", Type::StorageClasses(),