Changes in src/Concurrency/Keywords.cc [69c5c00:77a2994]

File:

• src/Concurrency/Keywords.cc (modified) (6 diffs)

src/Concurrency/Keywords.cc

@@ -66 +66 @@
                         bool needs_main, AggregateDecl::Aggregate cast_target ) :
                   type_name( type_name ), field_name( field_name ), getter_name( getter_name ),
-                  context_error( context_error ), exception_name( exception_name ),
-                  vtable_name( getVTableName( exception_name ) ),
+                  context_error( context_error ), vtable_name( getVTableName( exception_name ) ),
                   needs_main( needs_main ), cast_target( cast_target ) {}
 
@@ -90 +89 @@
                 const std::string getter_name;
                 const std::string context_error;
-                const std::string exception_name;
                 const std::string vtable_name;
                 bool needs_main;
@@ -97 +95 @@
                 StructDecl   * type_decl = nullptr;
                 FunctionDecl * dtor_decl = nullptr;
-                StructDecl * except_decl = nullptr;
                 StructDecl * vtable_decl = nullptr;
         };
@@ -379 +376 @@
                 else if ( is_target(decl) ) {
                         handle( decl );
-                }
-                else if ( !except_decl && exception_name == decl->name && decl->body ) {
-                        except_decl = decl;
                 }
                 else if ( !vtable_decl && vtable_name == decl->name && decl->body ) {
@@ -404 +398 @@
                         assert( struct_type );
 
-                        std::list< Expression * > poly_args = { new TypeExpr( struct_type->clone() ) };
-                        ObjectDecl * vtable_object = Virtual::makeVtableInstance(
-                                vtable_decl->makeInst( poly_args ), struct_type, nullptr );
-                        declsToAddAfter.push_back( vtable_object );
-                        declsToAddAfter.push_back( Virtual::makeGetExceptionFunction(
-                                vtable_object, except_decl->makeInst( std::move( poly_args ) )
-                        ) );
+                        declsToAddAfter.push_back( Virtual::makeVtableInstance( vtable_decl, {
+                                new TypeExpr( struct_type->clone() ),
+                        }, struct_type, nullptr ) );
                 }
 
@@ -444 +434 @@
         void ConcurrentSueKeyword::addVtableForward( StructDecl * decl ) {
                 if ( vtable_decl ) {
-                        std::list< Expression * > poly_args = {
+                        declsToAddBefore.push_back( Virtual::makeVtableForward( vtable_decl, {
                                 new TypeExpr( new StructInstType( noQualifiers, decl ) ),
-                        };
-                        declsToAddBefore.push_back( Virtual::makeGetExceptionForward(
-                                vtable_decl->makeInst( poly_args ),
-                                except_decl->makeInst( poly_args )
-                        ) );
-                        declsToAddBefore.push_back( Virtual::makeVtableForward(
-                                vtable_decl->makeInst( move( poly_args ) ) ) );
+                        } ) );
                 // Its only an error if we want a vtable and don't have one.
                 } else if ( ! vtable_name.empty() ) {