Changeset e50e9ff

Timestamp:

Aug 22, 2017, 11:42:06 AM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

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:

90c4df0

Parents:

6ac5223 (diff), b3d413b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src

Files:

• CodeGen/CodeGenerator.cc (modified) (10 diffs)
• CodeGen/CodeGenerator.h (modified) (4 diffs)
• CodeGen/Generate.cc (modified) (2 diffs)
• ControlStruct/ExceptTranslate.cc (modified) (6 diffs)
• ControlStruct/ForExprMutator.cc (modified) (2 diffs)
• ControlStruct/ForExprMutator.h (modified) (2 diffs)
• Parser/StatementNode.cc (modified) (3 diffs)
• Parser/parser.yy (modified) (11 diffs)
• SymTab/Indexer.cc (modified) (2 diffs)
• SymTab/Indexer.h (modified) (2 diffs)
• SynTree/Initializer.cc (modified) (2 diffs)
• SynTree/Mutator.cc (modified) (2 diffs)
• SynTree/Statement.cc (modified) (15 diffs)
• SynTree/Statement.h (modified) (3 diffs)
• SynTree/Visitor.cc (modified) (2 diffs)
• driver/cfa.cc (modified) (2 diffs)
• libcfa/Makefile.am (modified) (1 diff)
• libcfa/Makefile.in (modified) (1 diff)
• libcfa/exception.c (modified) (14 diffs)
• libcfa/exception.h (modified) (3 diffs)
• libcfa/libhdr.h (modified) (1 diff)
• tests/.expect/32/KRfunctions.txt (modified) (2 diffs)
• tests/.expect/64/KRfunctions.txt (modified) (1 diff)
• tests/KRfunctions.c (modified) (2 diffs)
• tests/except-0.c (modified) (18 diffs)
• tests/except-1.c (modified) (5 diffs)
• tests/except-2.c (modified) (6 diffs)
• tests/except-3.c (added)
• tests/except-mac.h (added)

src/CodeGen/CodeGenerator.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tus Jul 25 15:29:00 2017
-// Update Count     : 486
+// Last Modified On : Fri Aug 18 15:34:00 2017
+// Update Count     : 488
 //
 #include "CodeGenerator.h"
@@ -79 +79 @@
         }
 
-        CodeGenerator::LineMarker::LineMarker(
-                        CodeLocation const & loc, bool toPrint) :
-                loc(loc), toPrint(toPrint)
-        {}
-
-        CodeGenerator::LineMarker CodeGenerator::lineDirective(
-                        BaseSyntaxNode const * node) {
-                return LineMarker(node->location, lineMarks);
-        }
-
-        std::ostream & operator<<(std::ostream & out,
-                        CodeGenerator::LineMarker const & marker) {
-                if (marker.toPrint && marker.loc.isSet()) {
-                        return out << "\n# " << marker.loc.linenumber << " \""
-                                << marker.loc.filename << "\"\n";
-                } else if (marker.toPrint) {
-                        return out << "\n/* Missing CodeLocation */\n";
-                } else {
-                return out;
+        /* Using updateLocation at the beginning of a node and nextLine
+         * within a node should become the method of formating.
+         */
+        void CodeGenerator::updateLocation( CodeLocation const & to ) {
+                if ( !lineMarks ) {
+                        return;
+                } else if ( currentLocation.followedBy( to, 0 ) ) {
+                        return;
+                } else if ( currentLocation.followedBy( to, 1 ) ) {
+                        output << "\n" << indent;
+                        currentLocation.linenumber += 1;
+                } else if ( currentLocation.followedBy( to, 2 ) ) {
+                        output << "\n\n" << indent;
+                        currentLocation.linenumber += 2;
+                } else {
+                        output << "\n# " << to.linenumber << " \"" << to.filename
+                               << "\"\n" << indent;
+                        currentLocation = to;
+                }
+                output << std::flush;
+        }
+
+        void CodeGenerator::updateLocation( BaseSyntaxNode const * to ) {
+                updateLocation( to->location );
+        }
+
+        void CodeGenerator::nextLine() {
+                if ( !lineMarks ) {
+                        output << "\n" << indent << std::flush;
                 }
         }
@@ -194 +204 @@
                         ++indent;
                         for ( std::list< Declaration* >::iterator i = memb.begin(); i != memb.end(); i++ ) {
-                                output << lineDirective( *i ) << indent;
+                                updateLocation( *i );
                                 (*i)->accept( *this );
                                 output << ";" << endl;
@@ -217 +227 @@
         void CodeGenerator::visit( EnumDecl * enumDecl ) {
                 extension( enumDecl );
-                output << lineDirective ( enumDecl );
+                updateLocation( enumDecl );
                 output << "enum ";
                 genAttributes( enumDecl->get_attributes() );
@@ -233 +243 @@
                                 ObjectDecl * obj = dynamic_cast< ObjectDecl* >( *i );
                                 assert( obj );
-                                output << lineDirective( obj ) << indent << mangleName( obj );
+                                updateLocation( obj );
+                                output << mangleName( obj );
                                 if ( obj->get_init() ) {
                                         output << " = ";
@@ -251 +262 @@
         void CodeGenerator::visit( TypedefDecl * typeDecl ) {
                 assertf( ! genC, "Typedefs are removed and substituted in earlier passes." );
-                output << lineDirective( typeDecl );
+                updateLocation( typeDecl );
                 output << "typedef ";
                 output << genType( typeDecl->get_base(), typeDecl->get_name(), pretty, genC ) << endl;
@@ -752 +763 @@
         void CodeGenerator::visit( StmtExpr * stmtExpr ) {
                 std::list< Statement * > & stmts = stmtExpr->get_statements()->get_kids();
-                output << lineDirective( stmtExpr) << "({" << std::endl;
+                updateLocation( stmtExpr );
+                output << "({" << std::endl;
                 ++indent;
                 unsigned int numStmts = stmts.size();
                 unsigned int i = 0;
                 for ( Statement * stmt : stmts ) {
-                        output << lineDirective( stmt ) << indent;
+                        updateLocation( stmt );
             output << printLabels( stmt->get_labels() );
                         if ( i+1 == numStmts ) {
@@ -844 +856 @@
 
         void CodeGenerator::visit( IfStmt * ifStmt ) {
-                output << lineDirective( ifStmt );
+                updateLocation( ifStmt );
                 output << "if ( ";
                 ifStmt->get_condition()->accept( *this );
@@ -858 +870 @@
 
         void CodeGenerator::visit( SwitchStmt * switchStmt ) {
-                output << lineDirective( switchStmt );
+                updateLocation( switchStmt );
                 output << "switch ( " ;
                 switchStmt->get_condition()->accept( *this );
@@ -871 +883 @@
 
         void CodeGenerator::visit( CaseStmt * caseStmt ) {
-                output << lineDirective( caseStmt );
-                output << indent;
+                updateLocation( caseStmt );
                 if ( caseStmt->isDefault()) {
                         output << "default";

src/CodeGen/CodeGenerator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Tus Jul 25 25:30:00 2017
-// Update Count     : 54
+// Last Modified On : Fri Aug 18 15:40:00 2017
+// Update Count     : 56
 //
 
@@ -108 +108 @@
                 };
 
-                struct LineMarker {
-                        CodeLocation const & loc;
-                        bool toPrint;
-
-                        LineMarker(CodeLocation const & loc, bool toPrint);
-                };
-
-                LineMarker lineDirective(BaseSyntaxNode const * node);
-
                 void asmName( DeclarationWithType *decl );
 
                 void extension( Expression *expr );
                 void extension( Declaration *decl );
+
+                void updateLocation( BaseSyntaxNode const * to );
           private:
                 Indenter indent;
@@ -129 +122 @@
                 bool genC = false;    // true if output has to be C code
                 bool lineMarks = false;
+
+                CodeLocation currentLocation;
+                void updateLocation( CodeLocation const & to );
+                void nextLine();
 
                 void handleStorageClass( DeclarationWithType *decl );
@@ -155 +152 @@
         /// returns C-compatible name of declaration
         std::string genName( DeclarationWithType * decl );
-
-        std::ostream & operator<<(std::ostream &,
-                CodeGenerator::LineMarker const &);
 } // namespace CodeGen
 

src/CodeGen/Generate.cc

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Wed May 19 13:05:00 2017
-// Update Count     : 6
+// Last Modified On : Fri Aug 18 15:39:00 2017
+// Update Count     : 7
 //
 #include "Generate.h"
@@ -33 +33 @@
                 for ( auto & dcl : translationUnit ) {
                         if ( LinkageSpec::isGeneratable( dcl->get_linkage() ) && (doIntrinsics || ! LinkageSpec::isBuiltin( dcl->get_linkage() ) ) ) {
-                                os << cgv.lineDirective(dcl);
+                                cgv.updateLocation( dcl );
                                 dcl->accept(cgv);
                                 if ( doSemicolon( dcl ) ) {

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 17:19:00 2017
+// Update Count     : 9
 //
 
@@ -166 +166 @@
                         /*bitfieldWidth*/ NULL,
                         new BasicType( noQualifiers, BasicType::Bool ),
-                        /*init*/ NULL
+                        /*init*/ NULL,
+                        std::list<Attribute *>{ new Attribute( "unused" ) }
                         );
                 ObjectDecl voidptr_obj(
@@ -183 +184 @@
                         );
 
+                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( index_obj.clone() );
+                match_func_t.get_returnVals().push_back( unused_index_obj );
                 match_func_t.get_parameters().push_back( exception_obj.clone() );
                 handle_func_t.get_returnVals().push_back( bool_obj.clone() );
@@ -417 +421 @@
                 }
 
-                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(),
@@ -449 +453 @@
                 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();
 
@@ -472 +476 @@
                 }
 
-                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(),

src/ControlStruct/ForExprMutator.cc

@@ -9 +9 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Rob Schluntz
-// Last Modified On : Tue Jul 14 12:14:44 2015
-// Update Count     : 10
+// Last Modified By : Andrew Beach
+// Last Modified On : Fri Aug 18 10:22:00 2017
+// Update Count     : 12
 //
 
@@ -21 +21 @@
 
 namespace ControlStruct {
+        Statement *hoist( Statement *originalStmt, std::list<Statement *> &init ) {
+                // If no hoisting is needed, skip:
+                if ( 0 == init.size() ) {
+                        return originalStmt;
+                }
+
+                // Create compound statement, move initializers outside,
+                // the resut of the original stays as is.
+                CompoundStmt *block = new CompoundStmt( std::list< Label >() );
+                std::list<Statement *> &stmts = block->get_kids();
+                stmts.splice( stmts.end(), init );
+
+                // Add for to the new block.
+                stmts.push_back( originalStmt );
+                return block;
+        }
+
+        Statement *ForExprMutator::postmutate( IfStmt *ifStmt ) {
+                return hoist( ifStmt, ifStmt->initialization );
+        }
         Statement *ForExprMutator::postmutate( ForStmt *forStmt ) {
                 // hoist any initializer declarations to make them C89 (rather than C99)
-                std::list<Statement *> &init = forStmt->get_initialization();
-                if ( init.size() == 0 ) {
-                        return forStmt;
-                } // if
-
-                // create compound statement, move initializers outside, leave _for_ as-is
-                CompoundStmt *block = new CompoundStmt( std::list< Label >() );
-                std::list<Statement *> &stmts = block->get_kids();
-                for ( std::list<Statement *>::iterator it = init.begin(); it != init.end(); ++it ) {
-                        stmts.push_back( *it );
-                }       // for
-
-                // add for to the new block
-                stmts.push_back( forStmt );
-                forStmt->set_initialization( std::list<Statement *>() );
-                return block;
+                return hoist( forStmt, forStmt->initialization );
         }
 } // namespace ControlStruct

src/ControlStruct/ForExprMutator.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:17:08 2017
-// Update Count     : 4
+// Last Modified On : Thu Aug 17 15:32:48 2017
+// Update Count     : 5
 //
 
 #pragma once
 
+class IfStmt;
 class ForStmt;
 class Statement;
@@ -22 +23 @@
         class ForExprMutator {
           public:
+                Statement *postmutate( IfStmt * );
                 Statement *postmutate( ForStmt * );
         };

src/Parser/StatementNode.cc

@@ -10 +10 @@
 // Created On       : Sat May 16 14:59:41 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 16 16:39:43 2017
-// Update Count     : 340
+// Last Modified On : Thu Aug 17 16:01:31 2017
+// Update Count     : 345
 //
 
@@ -24 +24 @@
 #include "SynTree/Expression.h"    // for Expression, ConstantExpr
 #include "SynTree/Label.h"         // for Label, noLabels
+#include "SynTree/Declaration.h"
 #include "SynTree/Statement.h"     // for Statement, BranchStmt, CaseStmt
 #include "parserutility.h"         // for notZeroExpr
@@ -98 +99 @@
         } // if
 
-        return new IfStmt( noLabels, notZeroExpr(
-                                                           /*ctl->condition
-                                                                 ?*/ maybeMoveBuild< Expression >(ctl->condition)
-                                                                 /*: new VariableExpr( init.end() )*/ )
-                                                   , thenb, elseb );
-        // ret->initialization = init;
-        // delete ctl;
-        // assert( ret );
-        // return ret;
+        Expression * cond = ctl->condition ? maybeMoveBuild< Expression >(ctl->condition) : new VariableExpr( dynamic_cast<DeclarationWithType *>( dynamic_cast<DeclStmt *>( init.back() )->decl ) );
+        delete ctl;
+        return new IfStmt( noLabels, notZeroExpr( cond ), thenb, elseb, init );
 }
 

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 16 18:09:14 2017
-// Update Count     : 2485
+// Last Modified On : Sun Aug 20 09:21:54 2017
+// Update Count     : 2573
 //
 
@@ -131 +131 @@
 %token ATTRIBUTE EXTENSION                                                              // GCC
 %token IF ELSE SWITCH CASE DEFAULT DO WHILE FOR BREAK CONTINUE GOTO RETURN
-%token CHOOSE DISABLE ENABLE FALLTHRU TRY CATCH CATCHRESUME FINALLY THROW THROWRESUME AT WITH   // CFA
+%token CHOOSE DISABLE ENABLE FALLTHRU TRY CATCH CATCHRESUME FINALLY THROW THROWRESUME AT WITH // CFA
 %token ASM                                                                                              // C99, extension ISO/IEC 9899:1999 Section J.5.10(1)
 %token ALIGNAS ALIGNOF GENERIC STATICASSERT                             // C11
@@ -796 +796 @@
 
 selection_statement:
-        IF '(' if_control_expression ')' statement                              %prec THEN
+        IF '(' push if_control_expression ')' statement                         %prec THEN
                 // explicitly deal with the shift/reduce conflict on if/else
-                { $$ = new StatementNode( build_if( $3, $5, nullptr ) ); }
-        | IF '(' if_control_expression ')' statement ELSE statement
-                { $$ = new StatementNode( build_if( $3, $5, $7 ) ); }
-        | SWITCH '(' comma_expression ')' case_clause           // CFA
+                { $$ = new StatementNode( build_if( $4, $6, nullptr ) ); }
+        | IF '(' push if_control_expression ')' statement ELSE statement
+                { $$ = new StatementNode( build_if( $4, $6, $8 ) ); }
+        | SWITCH '(' comma_expression ')' case_clause
                 { $$ = new StatementNode( build_switch( $3, $5 ) ); }
         | SWITCH '(' comma_expression ')' '{' push declaration_list_opt switch_clause_list_opt '}' // CFA
@@ -823 +823 @@
 
 if_control_expression:
-        comma_expression
+        comma_expression pop
                 { $$ = new IfCtl( nullptr, $1 ); }
-        | c_declaration                                                                         // no semi-coln
+        | c_declaration pop                                                                     // no semi-colon
                 { $$ = new IfCtl( $1, nullptr ); }
-        | cfa_declaration                                                                       // no semi-colon
+        | cfa_declaration pop                                                           // no semi-colon
                 { $$ = new IfCtl( $1, nullptr ); }
-        | declaration comma_expression
+        | declaration comma_expression                                          // semi-colon separated
                 { $$ = new IfCtl( $1, $2 ); }
         ;
@@ -1104 +1104 @@
 
 KR_declaration_list_opt:                                                                // used to declare parameter types in K&R style functions
-        pop
+        // empty
                 { $$ = nullptr; }
         | KR_declaration_list
@@ -1110 +1110 @@
 
 KR_declaration_list:
-        c_declaration ';'
-        | KR_declaration_list push c_declaration ';'
+        push c_declaration pop ';'
+                { $$ = $2; }
+        | KR_declaration_list push c_declaration pop ';'
                 { $$ = $1->appendList( $3 ); }
         ;
@@ -1131 +1132 @@
 
 declaration:                                                                                    // old & new style declarations
-        c_declaration ';'
-        | cfa_declaration ';'                                                           // CFA
+        c_declaration pop ';'
+        | cfa_declaration pop ';'                                                       // CFA
         ;
 
@@ -1147 +1148 @@
 
 cfa_declaration:                                                                                // CFA
-        cfa_variable_declaration pop
-        | cfa_typedef_declaration pop
-        | cfa_function_declaration pop
-        | type_declaring_list pop
-        | trait_specifier pop
+        cfa_variable_declaration
+        | cfa_typedef_declaration
+        | cfa_function_declaration
+        | type_declaring_list
+        | trait_specifier
         ;
 
@@ -1351 +1352 @@
 
 c_declaration:
-        declaration_specifier declaring_list pop
+        declaration_specifier declaring_list
                 {
                         $$ = distAttr( $1, $2 );
                 }
-        | typedef_declaration pop
-        | typedef_expression pop                                                        // GCC, naming expression type
-        | sue_declaration_specifier pop
+        | typedef_declaration
+        | typedef_expression                                                            // GCC, naming expression type
+        | sue_declaration_specifier
         ;
 
@@ -2230 +2231 @@
                         $$ = $1->addFunctionBody( $2 );
                 }
-        | KR_function_declarator push KR_declaration_list_opt compound_statement
+        | KR_function_declarator KR_declaration_list_opt compound_statement
                 {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        $$ = $1->addOldDeclList( $3 )->addFunctionBody( $4 );
+                        $$ = $1->addOldDeclList( $2 )->addFunctionBody( $3 );
                 }
         ;
@@ -2278 +2279 @@
 
                 // Old-style K&R function definition, OBSOLESCENT (see 4)
-        | declaration_specifier KR_function_declarator push KR_declaration_list_opt with_clause_opt compound_statement
+        | declaration_specifier KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement
                 {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        $$ = $2->addOldDeclList( $4 )->addFunctionBody( $6 )->addType( $1 );
-                }
-        | type_qualifier_list KR_function_declarator push KR_declaration_list_opt with_clause_opt compound_statement
+                        $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5 )->addType( $1 );
+                }
+        | type_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement
                 {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        $$ = $2->addOldDeclList( $4 )->addFunctionBody( $6 )->addQualifiers( $1 );
+                        $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5 )->addQualifiers( $1 );
                 }
 
                 // Old-style K&R function definition with "implicit int" type_specifier, OBSOLESCENT (see 4)
-        | declaration_qualifier_list KR_function_declarator push KR_declaration_list_opt with_clause_opt compound_statement
+        | declaration_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement
                 {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        $$ = $2->addOldDeclList( $4 )->addFunctionBody( $6 )->addQualifiers( $1 );
-                }
-        | declaration_qualifier_list type_qualifier_list KR_function_declarator push KR_declaration_list_opt with_clause_opt compound_statement
+                        $$ = $2->addOldDeclList( $3 )->addFunctionBody( $5 )->addQualifiers( $1 );
+                }
+        | declaration_qualifier_list type_qualifier_list KR_function_declarator KR_declaration_list_opt with_clause_opt compound_statement
                 {
                         typedefTable.addToEnclosingScope( TypedefTable::ID );
                         typedefTable.leaveScope();
-                        $$ = $3->addOldDeclList( $5 )->addFunctionBody( $7 )->addQualifiers( $2 )->addQualifiers( $1 );
+                        $$ = $3->addOldDeclList( $4 )->addFunctionBody( $6 )->addQualifiers( $2 )->addQualifiers( $1 );
                 }
         ;

src/SymTab/Indexer.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:37:33 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Thu Mar 30 16:38:47 2017
-// Update Count     : 19
+// Last Modified On : Thu Aug 17 16:08:40 2017
+// Update Count     : 20
 //
 
@@ -351 +351 @@
                 acceptAll( compoundStmt->get_kids(), *this );
                 leaveScope();
+        }
+
+        void Indexer::visit( IfStmt *ifStmt ) {
+            // for statements introduce a level of scope
+            enterScope();
+            Visitor::visit( ifStmt );
+            leaveScope();
         }
 

src/SymTab/Indexer.h

@@ -10 +10 @@
 // Created On       : Sun May 17 21:38:55 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sat Jul 22 09:46:34 2017
-// Update Count     : 7
+// Last Modified On : Thu Aug 17 16:09:12 2017
+// Update Count     : 8
 //
 
@@ -45 +45 @@
 
                 virtual void visit( CompoundStmt *compoundStmt );
+                virtual void visit( IfStmt *ifStmt );
                 virtual void visit( ForStmt *forStmt );
                 virtual void visit( CatchStmt *catchStmt );

src/SynTree/Initializer.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Thr Aug  3 11:33:00 2016
-// Update Count     : 29
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Mon Aug 21 09:53:15 2017
+// Update Count     : 30
 //
 
@@ -80 +80 @@
                         }
                 }
-                assertf( initializers.size() == designations.size(), "Created ListInit with mismatching initializers (%lu) and designations (%lu)", initializers.size(), designations.size() );
+                assertf( initializers.size() == designations.size(), "Created ListInit with mismatching initializers (%zd) and designations (%zd)", initializers.size(), designations.size() );
 }
 

src/SynTree/Mutator.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 24 16:32:00 2017
-// Update Count     : 25
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 17 15:39:37 2017
+// Update Count     : 27
 //
 
@@ -114 +114 @@
 
 Statement *Mutator::mutate( IfStmt *ifStmt ) {
+        mutateAll( ifStmt->get_initialization(), *this );
         ifStmt->set_condition( maybeMutate( ifStmt->get_condition(), *this ) );
         ifStmt->set_thenPart( maybeMutate( ifStmt->get_thenPart(), *this ) );

src/SynTree/Statement.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Aug 14 12:26:00 2017
-// Update Count     : 65
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 17 16:17:20 2017
+// Update Count     : 67
 //
 
@@ -32 +32 @@
 using std::endl;
 
-Statement::Statement( std::list<Label> _labels ) : labels( _labels ) {}
+Statement::Statement( std::list<Label> labels ) : labels( labels ) {}
 
 void Statement::print( __attribute__((unused)) std::ostream &, __attribute__((unused)) int indent ) const {}
@@ -38 +38 @@
 Statement::~Statement() {}
 
-ExprStmt::ExprStmt( std::list<Label> _labels, Expression *_expr ) : Statement( _labels ), expr( _expr ) {}
+ExprStmt::ExprStmt( std::list<Label> labels, Expression *expr ) : Statement( labels ), expr( expr ) {}
 
 ExprStmt::ExprStmt( const ExprStmt &other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
@@ -88 +88 @@
 const char *BranchStmt::brType[] = { "Goto", "Break", "Continue" };
 
-BranchStmt::BranchStmt( std::list<Label> labels, Label _target, Type _type ) throw ( SemanticError ) :
-        Statement( labels ), originalTarget( _target ), target( _target ), computedTarget( NULL ), type( _type ) {
+BranchStmt::BranchStmt( std::list<Label> labels, Label target, Type type ) throw ( SemanticError ) :
+        Statement( labels ), originalTarget( target ), target( target ), computedTarget( NULL ), type( type ) {
         //actually this is a syntactic error signaled by the parser
         if ( type == BranchStmt::Goto && target.empty() )
@@ -95 +95 @@
 }
 
-BranchStmt::BranchStmt( std::list<Label> labels, Expression *_computedTarget, Type _type ) throw ( SemanticError ) :
-        Statement( labels ), computedTarget( _computedTarget ), type( _type ) {
+BranchStmt::BranchStmt( std::list<Label> labels, Expression *computedTarget, Type type ) throw ( SemanticError ) :
+        Statement( labels ), computedTarget( computedTarget ), type( type ) {
         if ( type != BranchStmt::Goto || computedTarget == 0 )
                 throw SemanticError("Computed target not valid in branch statement");
@@ -105 +105 @@
 }
 
-ReturnStmt::ReturnStmt( std::list<Label> labels, Expression *_expr ) : Statement( labels ), expr( _expr ) {}
+ReturnStmt::ReturnStmt( std::list<Label> labels, Expression *expr ) : Statement( labels ), expr( expr ) {}
 
 ReturnStmt::ReturnStmt( const ReturnStmt & other ) : Statement( other ), expr( maybeClone( other.expr ) ) {}
@@ -122 +122 @@
 }
 
-IfStmt::IfStmt( std::list<Label> _labels, Expression *_condition, Statement *_thenPart, Statement *_elsePart ):
-        Statement( _labels ), condition( _condition ), thenPart( _thenPart ), elsePart( _elsePart ) {}
+IfStmt::IfStmt( std::list<Label> labels, Expression *condition, Statement *thenPart, Statement *elsePart, std::list<Statement *> initialization ):
+        Statement( labels ), condition( condition ), thenPart( thenPart ), elsePart( elsePart ), initialization( initialization ) {}
 
 IfStmt::IfStmt( const IfStmt & other ) :
-        Statement( other ), condition( maybeClone( other.condition ) ), thenPart( maybeClone( other.thenPart ) ), elsePart( maybeClone( other.elsePart ) ) {}
+        Statement( other ), condition( maybeClone( other.condition ) ), thenPart( maybeClone( other.thenPart ) ), elsePart( maybeClone( other.elsePart ) ) {
+        cloneAll( other.initialization, initialization );
+}
 
 IfStmt::~IfStmt() {
+        deleteAll( initialization );
         delete condition;
         delete thenPart;
@@ -139 +142 @@
         condition->print( os, indent + 4 );
 
+        if ( !initialization.empty() ) {
+                os << string( indent + 2, ' ' ) << "initialization: \n";
+                for ( std::list<Statement *>::const_iterator it = initialization.begin(); it != initialization.end(); ++it ) {
+                        os << string( indent + 4, ' ' );
+                        (*it)->print( os, indent + 4 );
+                }
+                os << endl;
+        }
+
         os << string( indent+2, ' ' ) << "... then: " << endl;
 
@@ -151 +163 @@
 }
 
-SwitchStmt::SwitchStmt( std::list<Label> _labels, Expression * _condition, std::list<Statement *> &_statements ):
-        Statement( _labels ), condition( _condition ), statements( _statements ) {
+SwitchStmt::SwitchStmt( std::list<Label> labels, Expression * condition, std::list<Statement *> &statements ):
+        Statement( labels ), condition( condition ), statements( statements ) {
 }
 
@@ -179 +191 @@
 }
 
-CaseStmt::CaseStmt( std::list<Label> _labels, Expression *_condition, std::list<Statement *> &_statements, bool deflt ) throw ( SemanticError ) :
-        Statement( _labels ), condition( _condition ), stmts( _statements ), _isDefault( deflt ) {
+CaseStmt::CaseStmt( std::list<Label> labels, Expression *condition, std::list<Statement *> &statements, bool deflt ) throw ( SemanticError ) :
+        Statement( labels ), condition( condition ), stmts( statements ), _isDefault( deflt ) {
         if ( isDefault() && condition != 0 )
                 throw SemanticError("default with conditions");
@@ -216 +228 @@
 }
 
-WhileStmt::WhileStmt( std::list<Label> labels, Expression *condition_, Statement *body_, bool isDoWhile_ ):
-        Statement( labels ), condition( condition_), body( body_), isDoWhile( isDoWhile_) {
+WhileStmt::WhileStmt( std::list<Label> labels, Expression *condition, Statement *body, bool isDoWhile ):
+        Statement( labels ), condition( condition), body( body), isDoWhile( isDoWhile) {
 }
 
@@ -238 +250 @@
 }
 
-ForStmt::ForStmt( std::list<Label> labels, std::list<Statement *> initialization_, Expression *condition_, Expression *increment_, Statement *body_ ):
-        Statement( labels ), initialization( initialization_ ), condition( condition_ ), increment( increment_ ), body( body_ ) {
+ForStmt::ForStmt( std::list<Label> labels, std::list<Statement *> initialization, Expression *condition, Expression *increment, Statement *body ):
+        Statement( labels ), initialization( initialization ), condition( condition ), increment( increment ), body( body ) {
 }
 
@@ -317 +329 @@
 }
 
-TryStmt::TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<CatchStmt *> &_handlers, FinallyStmt *_finallyBlock ) :
-        Statement( labels ), block( tryBlock ),  handlers( _handlers ), finallyBlock( _finallyBlock ) {
+TryStmt::TryStmt( std::list<Label> labels, CompoundStmt *tryBlock, std::list<CatchStmt *> &handlers, FinallyStmt *finallyBlock ) :
+        Statement( labels ), block( tryBlock ),  handlers( handlers ), finallyBlock( finallyBlock ) {
 }
 
@@ -351 +363 @@
 }
 
-CatchStmt::CatchStmt( std::list<Label> labels, Kind _kind, Declaration *_decl, Expression *_cond, Statement *_body ) :
-        Statement( labels ), kind ( _kind ), decl ( _decl ), cond ( _cond ), body( _body ) {
+CatchStmt::CatchStmt( std::list<Label> labels, Kind kind, Declaration *decl, Expression *cond, Statement *body ) :
+        Statement( labels ), kind ( kind ), decl ( decl ), cond ( cond ), body( body ) {
 }
 
@@ -389 +401 @@
 
 
-FinallyStmt::FinallyStmt( std::list<Label> labels, CompoundStmt *_block ) : Statement( labels ), block( _block ) {
+FinallyStmt::FinallyStmt( std::list<Label> labels, CompoundStmt *block ) : Statement( labels ), block( block ) {
         assert( labels.empty() ); // finally statement cannot be labeled
 }

src/SynTree/Statement.h

@@ -10 +10 @@
 // Created On       : Mon May 18 07:44:20 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed Aug 16 16:28:55 2017
-// Update Count     : 70
+// Last Modified On : Thu Aug 17 15:37:53 2017
+// Update Count     : 72
 //
 
@@ -127 +127 @@
 class IfStmt : public Statement {
   public:
-        std::list<Statement *> initialization;
         Expression *condition;
         Statement *thenPart;
         Statement *elsePart;
-
-        IfStmt( std::list<Label> labels, Expression *condition, Statement *thenPart, Statement *elsePart );
+        std::list<Statement *> initialization;
+
+        IfStmt( std::list<Label> labels, Expression *condition, Statement *thenPart, Statement *elsePart,
+                        std::list<Statement *> initialization = std::list<Statement *>() );
         IfStmt( const IfStmt &other );
         virtual ~IfStmt();
 
         std::list<Statement *> &get_initialization() { return initialization; }
-        void set_initialization( std::list<Statement *> newValue ) { initialization = newValue; }
         Expression *get_condition() { return condition; }
         void set_condition( Expression *newValue ) { condition = newValue; }
@@ -239 +239 @@
 
         std::list<Statement *> &get_initialization() { return initialization; }
-        void set_initialization( std::list<Statement *> newValue ) { initialization = newValue; }
         Expression *get_condition() { return condition; }
         void set_condition( Expression *newValue ) { condition = newValue; }

src/SynTree/Visitor.cc

@@ -9 +9 @@
 // Author           : Richard C. Bilson
 // Created On       : Mon May 18 07:44:20 2015
-// Last Modified By : Andrew Beach
-// Last Modified On : Mon Jul 24 16:30:00 2017
-// Update Count     : 27
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Thu Aug 17 15:39:38 2017
+// Update Count     : 29
 //
 
@@ -99 +99 @@
 
 void Visitor::visit( IfStmt *ifStmt ) {
+        acceptAll( ifStmt->get_initialization(), *this );
         maybeAccept( ifStmt->get_condition(), *this );
         maybeAccept( ifStmt->get_thenPart(), *this );

src/driver/cfa.cc

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Tue Aug 20 13:44:49 2002
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Jan 20 14:38:45 2017
-// Update Count     : 155
+// Last Modified By : Andrew Beach
+// Last Modified On : Thr Aug 17 15:24:00 2017
+// Update Count     : 156
 //
 
@@ -281 +281 @@
 #endif //HAVE_LIBCFA
 
+        // Add exception flags (unconditionally)
+        args[nargs] = "-fexceptions";
+        nargs += 1;
+
         // add the correct set of flags based on the type of compile this is
 

src/libcfa/Makefile.am

@@ -36 +36 @@
          ${AM_V_GEN}@BACKEND_CC@ @CFA_FLAGS@ -D__CFA_DEBUG__ -O0 -c -o $@ $<
 
-EXTRA_FLAGS = -g -Wall -Werror -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
+EXTRA_FLAGS = -g -Wall -Werror -Wno-unused-function -imacros libcfa-prelude.c @CFA_FLAGS@
 
 AM_CCASFLAGS = @CFA_FLAGS@

src/libcfa/Makefile.in

@@ -416 +416 @@
 ARFLAGS = cr
 lib_LIBRARIES = $(am__append_1) $(am__append_2)
-EXTRA_FLAGS = -g -Wall -Werror -Wno-unused-function -I${abs_top_srcdir}/src/libcfa/libhdr -imacros libcfa-prelude.c @CFA_FLAGS@
+EXTRA_FLAGS = -g -Wall -Werror -Wno-unused-function -imacros libcfa-prelude.c @CFA_FLAGS@
 AM_CCASFLAGS = @CFA_FLAGS@
 headers = fstream iostream iterator limits rational stdlib \

src/libcfa/exception.c

@@ -10 +10 @@
 // Created On       : Mon Jun 26 15:13:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug  4 15:20:00 2017
-// Update Count     : 6
+// Last Modified On : Thr Aug 17 15:45:00 2017
+// Update Count     : 7
 //
 
@@ -23 +23 @@
 #include <stdio.h>
 #include <unwind.h>
+#include <libhdr/libdebug.h>
 
 // FIX ME: temporary hack to keep ARM build working
@@ -79 +80 @@
 void __cfaehm__throw_resume(exception * except) {
 
-        // DEBUG
-        printf("Throwing resumption exception\n");
+        LIB_DEBUG_PRINT_SAFE("Throwing resumption exception\n");
 
         struct __cfaehm__try_resume_node * original_head = shared_stack.current_resume;
@@ -94 +94 @@
         }
 
-        printf("Unhandled exception\n");
+        LIB_DEBUG_PRINT_SAFE("Unhandled exception\n");
         shared_stack.current_resume = original_head;
 
@@ -106 +106 @@
 
 void __cfaehm__try_resume_setup(struct __cfaehm__try_resume_node * node,
-                        int (*handler)(exception * except)) {
+                        _Bool (*handler)(exception * except)) {
         node->next = shared_stack.top_resume;
         node->handler = handler;
@@ -154 +154 @@
         struct exception_context_t * context = this_exception_context();
 
-        // DEBUG
-        printf( "Deleting Exception\n");
+        LIB_DEBUG_PRINT_SAFE("Deleting Exception\n");
 
         // Remove the exception from the list.
@@ -235 +234 @@
 
 void __cfaehm__throw_terminate( exception * val ) {
-        // DEBUG
-        printf("Throwing termination exception\n");
+        LIB_DEBUG_PRINT_SAFE("Throwing termination exception\n");
 
         __cfaehm__allocate_exception( val );
@@ -243 +241 @@
 
 void __cfaehm__rethrow_terminate(void) {
-        // DEBUG
-        printf("Rethrowing termination exception\n");
+        LIB_DEBUG_PRINT_SAFE("Rethrowing termination exception\n");
 
         __cfaehm__begin_unwind();
@@ -257 +254 @@
 {
 
-        // DEBUG
-        //printf("CFA: 0x%lx\n", _Unwind_GetCFA(context));
-        printf("Personality function (%d, %x, %llu, %p, %p):", version, actions, exceptionClass, unwind_exception, context);
+        //LIB_DEBUG_PRINT_SAFE("CFA: 0x%lx\n", _Unwind_GetCFA(context));
+        LIB_DEBUG_PRINT_SAFE("Personality function (%d, %x, %llu, %p, %p):", version, actions, exceptionClass, unwind_exception, context);
 
         // If we've reached the end of the stack then there is nothing much we can do...
         if( actions & _UA_END_OF_STACK ) return _URC_END_OF_STACK;
 
-        // DEBUG
         if (actions & _UA_SEARCH_PHASE) {
-                printf(" lookup phase");
-        }
-        // DEBUG
+                LIB_DEBUG_PRINT_SAFE(" lookup phase");
+        }
         else if (actions & _UA_CLEANUP_PHASE) {
-                printf(" cleanup phase");
+                LIB_DEBUG_PRINT_SAFE(" cleanup phase");
         }
         // Just in case, probably can't actually happen
@@ -306 +300 @@
                 // Have we reach the correct frame info yet?
                 if( lsd_info.Start + callsite_start + callsite_len < instruction_ptr ) {
-                        //DEBUG BEGIN
+#ifdef __CFA_DEBUG_PRINT__
                         void * ls = (void*)lsd_info.Start;
                         void * cs = (void*)callsite_start;
@@ -313 +307 @@
                         void * ep = (void*)lsd_info.Start + callsite_start + callsite_len;
                         void * ip = (void*)instruction_ptr;
-                        printf("\nfound %p - %p (%p, %p, %p), looking for %p\n", bp, ep, ls, cs, cl, ip);
-                        //DEBUG END
+                        LIB_DEBUG_PRINT_SAFE("\nfound %p - %p (%p, %p, %p), looking for %p\n", bp, ep, ls, cs, cl, ip);
+#endif // __CFA_DEBUG_PRINT__
                         continue;
                 }
@@ -362 +356 @@
 
                                         // Based on the return value, check if we matched the exception
-                                        if( ret == _URC_HANDLER_FOUND) printf(" handler found\n");
-                                        else printf(" no handler\n");
+                                        if( ret == _URC_HANDLER_FOUND) {
+                                                LIB_DEBUG_PRINT_SAFE(" handler found\n");
+                                        } else {
+                                                LIB_DEBUG_PRINT_SAFE(" no handler\n");
+                                        }
                                         return ret;
                                 }
 
                                 // This is only a cleanup handler, ignore it
-                                printf(" no action");
+                                LIB_DEBUG_PRINT_SAFE(" no action");
                         }
                         else if (actions & _UA_CLEANUP_PHASE) {
@@ -388 +385 @@
                                 _Unwind_SetIP( context, ((lsd_info.LPStart) + (callsite_landing_pad)) );
 
-                                // DEBUG
-                                printf(" action\n");
+                                LIB_DEBUG_PRINT_SAFE(" action\n");
 
                                 // Return have some action to run
@@ -397 +393 @@
 
                 // Nothing to do, move along
-                printf(" no landing pad");
+                LIB_DEBUG_PRINT_SAFE(" no landing pad");
         }
         // No handling found
-        printf(" table end reached\n");
-
-        // DEBUG
+        LIB_DEBUG_PRINT_SAFE(" table end reached\n");
+
         UNWIND:
-        printf(" unwind\n");
+        LIB_DEBUG_PRINT_SAFE(" unwind\n");
 
         // Keep unwinding the stack

src/libcfa/exception.h

@@ -10 +10 @@
 // Created On       : Mon Jun 26 15:11:00 2017
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Aug  4 15:20:00 2017
-// Update Count     : 5
+// Last Modified On : Thr Aug 17 15:44:00 2017
+// Update Count     : 6
 //
 
@@ -55 +55 @@
 struct __cfaehm__try_resume_node {
     struct __cfaehm__try_resume_node * next;
-    int (*handler)(exception * except);
+    _Bool (*handler)(exception * except);
 };
 
@@ -61 +61 @@
 void __cfaehm__try_resume_setup(
     struct __cfaehm__try_resume_node * node,
-    int (*handler)(exception * except));
+    _Bool (*handler)(exception * except));
 void __cfaehm__try_resume_cleanup(
     struct __cfaehm__try_resume_node * node);

src/libcfa/libhdr.h

@@ -16 +16 @@
 #pragma once
 
-#include "libalign.h"
-#include "libdebug.h"
-#include "libtools.h"
+#include "libhdr/libalign.h"
+#include "libhdr/libdebug.h"
+#include "libhdr/libtools.h"
 
 // Local Variables: //

src/tests/.expect/32/KRfunctions.txt

@@ -15 +15 @@
 }
 struct S {
-    int __i__i_1;
+int __i__i_1;
 };
 static inline void ___constructor__F_P2sS_autogen___1(struct S *___dst__P2sS_1);
@@ -79 +79 @@
     __attribute__ ((unused)) int (*___retval_f14__PA0A0i_1)[][((unsigned int )10)];
 }
+int __f15__Fi_iii__1(int __a__i_1, int __b__i_1, int __c__i_1){
+    __attribute__ ((unused)) int ___retval_f15__i_1;
+}
 const int __fred__FCi___1(){
     __attribute__ ((unused)) const int ___retval_fred__Ci_1;

src/tests/.expect/64/KRfunctions.txt

@@ -79 +79 @@
     __attribute__ ((unused)) int (*___retval_f14__PA0A0i_1)[][((long unsigned int )10)];
 }
+int __f15__Fi_iii__1(int __a__i_1, int __b__i_1, int __c__i_1){
+    __attribute__ ((unused)) int ___retval_f15__i_1;
+}
 const int __fred__FCi___1(){
     __attribute__ ((unused)) const int ___retval_fred__Ci_1;

src/tests/KRfunctions.c

@@ -10 +10 @@
 // Created On       : Thu Feb 16 15:23:17 2017
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Wed May 24 22:05:00 2017
-// Update Count     : 3
+// Last Modified On : Sun Aug 20 07:34:17 2017
+// Update Count     : 7
 // 
 
@@ -37 +37 @@
 int ((* f13( a, b, c ))[])[10] int a, * b, c[]; {}
 int (((* f14( a, b, c ))[])[10]) int a, * b, c[]; {}
+f15( a, b, c ) {}
 
 const fred() {

src/tests/except-0.c

@@ -7 +7 @@
 #include <stdio.h>
 #include <stdbool.h>
+
+#include "except-mac.h"
+TRIVIAL_EXCEPTION(yin)
+TRIVIAL_EXCEPTION(yang)
+TRIVIAL_EXCEPTION(zen)
+
 
 // Local type to mark exits from scopes. (see ERROR)
@@ -23 +29 @@
 
 
-// Local Exception Types and manual vtable types.
-//#define TRIVIAL_EXCEPTION(name) //TRIVAL_EXCEPTION(yin)
-struct yin;
-struct yin_vtable {
-        struct exception_t_vtable const * parent;
-        size_t size;
-    void (*copy)(yin *this, yin * other);
-    void (*free)(yin *this);
-    const char (*msg)(yin *this);
-};
-struct yin {
-        struct yin_vtable const * parent;
-};
-void yin_msg(yin) {
-        return "in";
-}
-yin_vtable _yin_vtable_instance = {
-        &_exception_t_vtable_instance, sizeof(yin), ?{}, ^?{}, yin_msg
-}
-
-
-void terminate(exception * except_value) {
+// Mark throws: make sure to only pass in exception types.
+forall(dtype T)
+void terminate(T * except_value) {
         signal_exit a = {"terminate function"};
-        throw except_value;
+        THROW(except_value);
         printf("terminate returned\n");
 }
 
-void resume(exception * except_value) {
+forall(dtype T)
+void resume(T * except_value) {
         signal_exit a = {"resume function"};
-        throwResume except_value;
+        THROW_RESUME(except_value);
         printf("resume returned\n");
 }
@@ -60 +48 @@
         signal_exit a = {"bar function"};
         try {
-                terminate(4);
-        } catch (3) {
-                printf("bar caught exception 3.\n");
+                terminate(&(zen){});
+        } catch (yin * error) {
+                printf("bar caught exception yin.\n");
         }
 }
@@ -70 +58 @@
         try {
                 bar();
-        } catch (4) {
-                printf("foo caught exception 4.\n");
-        } catch (2) {
-                printf("foo caught exception 2.\n");
+        } catch (yang * error) {
+                printf("foo caught exception yang.\n");
+        } catch (zen * error) {
+                printf("foo caught exception zen.\n");
         }
 }
@@ -81 +69 @@
         signal_exit a = {"beta function"};
         try {
-                resume(4);
-        } catchResume (3) {
-                printf("beta caught exception 3\n");
+                zen x;
+                resume(&x);
+        } catchResume (yin * error) {
+                printf("beta caught exception yin\n");
         }
 }
@@ -91 +80 @@
         try {
                 beta();
-        } catchResume (2) {
-                printf("alpha caught exception 2\n");
-        } catchResume (4) {
-                printf("alpha caught exception 4\n");
+        } catchResume (yang * error) {
+                printf("alpha caught exception yang\n");
+        } catchResume (zen * error) {
+                printf("alpha caught exception zen\n");
         }
 }
@@ -117 +106 @@
 void fallback() {
         try {
-                resume(2);
-        } catch (2) {
-                printf("fallback caught termination 2\n");
+                zen x;
+                resume(&x);
+        } catch (zen * error) {
+                printf("fallback caught termination zen\n");
         }
 }
@@ -127 +117 @@
         signal_exit a = {"terminate_swap"};
         try {
-                terminate(2);
-        } catch (2) {
-                terminate(3);
+                yin x;
+                terminate(&x);
+        } catch (yin * error) {
+                yang y;
+                terminate(&y);
         }
 }
@@ -137 +129 @@
         try {
                 terminate_swap();
-        } catch (3) {
-                printf("terminate_swapped caught exception 3\n");
+        } catch (yang * error) {
+                printf("terminate_swapped caught exception yang\n");
         }
 }
@@ -146 +138 @@
         signal_exit a = {"resume_swap"};
         try {
-                resume(2);
-        } catchResume (2) {
-                resume(3);
+                yin x;
+                resume(&x);
+        } catchResume (yin * error) {
+                yang y;
+                resume(&y);
         }
 }
@@ -155 +149 @@
         try {
                 resume_swap();
-        } catchResume (3) {
-                printf("resume_swapped caught exception 3\n");
+        } catchResume (yang * error) {
+                printf("resume_swapped caught exception yang\n");
         }
 }
@@ -164 +158 @@
         try {
                 try {
-                        terminate(2);
-                } catch (2) {
-                        printf("reterminate 2 caught and "
-                               "will rethrow exception 2\n");
+                        zen x;
+                        terminate(&x);
+                } catch (zen * error) {
+                        printf("reterminate zen caught and "
+                               "will rethrow exception zen\n");
                         throw;
                 }
-        } catch (2) {
-                printf("reterminate 1 caught exception 2\n");
+        } catch (zen * error) {
+                printf("reterminate 1 caught exception zen\n");
         }
 }
@@ -179 +174 @@
         try {
                 try {
-                        resume(2);
-                } catchResume (2) {
-                        printf("reresume 2 caught and rethrows exception 2\n");
+                        zen x;
+                        resume(&x);
+                } catchResume (zen * error) {
+                        printf("reresume zen caught and rethrows exception zen\n");
                         throwResume;
                 }
-        } catchResume (2) {
-                printf("reresume 1 caught exception 2\n");
+        } catchResume (zen * error) {
+                printf("reresume 1 caught exception zen\n");
         }
 }
@@ -193 +189 @@
         // terminate block, call resume
         try {
-                resume(3);
-        } catch (3) {
-                printf("fum caught exception 3\n");
+                zen x;
+                resume(&x);
+        } catch (zen * error) {
+                printf("fum caught exception zen\n");
         }
 }
@@ -202 +199 @@
         // resume block, call terminate
         try {
-                terminate(3);
-        } catchResume (3) {
-                printf("foe caught exception 3\n");
+                zen y;
+                terminate(&y);
+        } catchResume (zen * error) {
+                printf("foe caught exception zen\n");
         }
 }
@@ -212 +210 @@
         try {
                 foe();
-        } catch (3) {
-                printf("fy caught exception 3\n");
+        } catch (zen * error) {
+                printf("fy caught exception zen\n");
                 fum();
         }
@@ -222 +220 @@
         try {
                 fy();
-        } catchResume (3) {
-                printf("fee caught exception 3\n");
+        } catchResume (zen * error) {
+                printf("fee caught exception zen\n");
         }
 }
@@ -242 +240 @@
         reresume(); printf("\n");
         fee(); printf("\n");
+
         // Uncaught termination test.
-        terminate(7);
-}
+        printf("Throw uncaught.\n");
+        yang z;
+        terminate(&z);
+}

src/tests/except-1.c

@@ -5 +5 @@
 #include <stdio.h>
 
+#include "except-mac.h"
+TRIVIAL_EXCEPTION(yin)
+TRIVIAL_EXCEPTION(yang)
+
 int main()
 {
         try {
-                throw 3;
+                yin a;
+                THROW(&a);
         }
-        catch( 3 ) {
+        catch( yin * err ) {
                 printf("First Caught\n");
                 try {
-                        throw 4;
+                        yang b;
+                        THROW(&b);
                 }
-                catch( 4 ) {
+                catch( yang * err ) {
                         printf("Both Caught\n");
                 }
@@ -23 +29 @@
         try {
                 try {
-                        throw 2;
+                        yang c;
+                        THROW(&c);
                 }
-                catch( 2 ) {
+                catch( yang * err ) {
                         printf("First Catch and rethrow\n");
                         throw;
                 }
         }
-        catch( 2 ) {
+        catch( yang * err ) {
                 printf("Second Catch\n");
         }
@@ -37 +44 @@
         try {
                 try {
-                        throw 5;
+                        yin d;
+                        THROW(&d);
                 }
-                catch( 5 ) {
+                catch( yin * err ) {
                         printf("Throw before cleanup\n");
-                        throw 6;
+                        yang e;
+                        THROW(&e);
                 }
         }
-        catch( 6 ) {
+        catch( yang * err ) {
                 printf("Catch after cleanup\n");
         }
@@ -51 +60 @@
         try {
                 try {
-                        throw 7;
+                        yin f;
+                        THROW(&f);
                 }
-                catch( 7 ) {
+                catch( yin * err ) {
                         printf("Caught initial throw.\n");
                         try {
-                                throw 8;
+                                yang g;
+                                THROW(&g);
                         }
-                        catch( 8 ) {
+                        catch( yang * err ) {
                                 printf("Caught intermediate throw.\n");
                         }
@@ -64 +75 @@
                 }
         }
-        catch( 7 ) {
+        catch( yin * err ) {
                 printf("Caught final throw.\n");
         }

src/tests/except-2.c

@@ -2 +2 @@
 
 
-#include <string.h>
+#include <stdlib>
+#include "except-mac.h"
 
-// Local Exception Types and manual vtable types.
-#define GLUE2(left, right) left##right
-#define GLUE3(left, middle, right) left##middle##right
-#define BASE_EXCEPT __cfaehm__base_exception_t
-#define TABLE(name) GLUE2(name,_vtable)
-#define INSTANCE(name) GLUE3(_,name,_vtable_instance)
-#define TRIVIAL_EXCEPTION(name) \
-struct name; \
-struct TABLE(name) { \
-        struct TABLE(BASE_EXCEPT) const * parent; \
-        size_t size; \
-        void (*copy)(name *this, name * other); \
-        void (*free)(name *this); \
-        const char * (*msg)(name *this); \
-}; \
-extern TABLE(name) INSTANCE(name); \
-struct name { \
-        struct TABLE(name) const * virtual_table; \
-}; \
-const char * name##_msg(name * this) { \
-        return #name; \
-} \
-void name##_copy(name * this, name * other) { \
-        this->virtual_table = other->virtual_table; \
-} \
-TABLE(name) INSTANCE(name) @= { \
-        .parent : &INSTANCE(BASE_EXCEPT), \
-        .size : sizeof(name), .copy : name##_copy, \
-        .free : ^?{}, .msg : name##_msg \
-}; \
-void ?{}(name * this) { \
-        this->virtual_table = &INSTANCE(name); \
-}
 TRIVIAL_EXCEPTION(yin)
 TRIVIAL_EXCEPTION(yang)
@@ -50 +18 @@
 };
 extern num_error_vtable INSTANCE(num_error);
+
 struct num_error {
         struct num_error_vtable const * virtual_table;
@@ -55 +24 @@
         int num;
 };
+
 void num_error_msg(num_error * this) {
         if ( ! this->msg ) {
-                const char * base = "Num Error with code: X";
-                this->msg = strdup( base );
+                static const char * base = "Num Error with code: X";
+                this->msg = malloc(22);
+                for (int i = 0 ; (this->msg[i] = base[i]) ; ++i);
         }
         this->msg[21] = '0' + this->num;
@@ -90 +61 @@
         try {
                 yin black;
-                throw (BASE_EXCEPT *)&black;
+                THROW(&black);
         } catch ( yin * error ) {
                 printf("throw yin caught.\n");
@@ -97 +68 @@
         try {
                 yang white;
-                throwResume (BASE_EXCEPT *)&white;
+                THROW_RESUME(&white);
                 printf("> throwResume returned.\n");
         } catchResume ( yang * error ) {
@@ -105 +76 @@
         try {
                 num_error x = { 2 };
-                throw (BASE_EXCEPT *)&x;
+                THROW(&x);
         }
         catch (num_error * error ; 3 == error->virtual_table->code( error ) ) {