Changes in src/Concurrency/Keywords.cc [2db79e5:ba3706f]

File:

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

src/Concurrency/Keywords.cc

@@ -257 +257 @@
         // Generic keyword implementation
         //=============================================================================================
-        void fixupGenerics(FunctionType * func, StructDecl * decl) {
-                cloneAll(decl->parameters, func->forall);
-                for ( TypeDecl * td : func->forall ) {
-                        strict_dynamic_cast<StructInstType*>(
-                                func->parameters.front()->get_type()->stripReferences()
-                        )->parameters.push_back(
-                                new TypeExpr( new TypeInstType( noQualifiers, td->name, td ) )
-                        );
-                }
-        }
-
         void ConcurrentSueKeyword::postvisit(StructDecl * decl) {
                 if( decl->name == type_name && decl->body ) {
@@ -312 +301 @@
                 );
 
-                get_type->get_parameters().push_back( this_decl->clone() );
+                get_type->get_parameters().push_back( this_decl );
                 get_type->get_returnVals().push_back(
                         new ObjectDecl(
@@ -329 +318 @@
                         )
                 );
-                fixupGenerics(get_type, decl);
 
                 FunctionDecl * get_decl = new FunctionDecl(
@@ -355 +343 @@
                                 nullptr
                         );
-                        fixupGenerics(main_type, decl);
-                }
-
-                delete this_decl;
+                }
 
                 declsToAddBefore.push_back( forward );
@@ -392 +377 @@
                                         new MemberExpr(
                                                 field,
-                                                new CastExpr(
-                                                        new VariableExpr( func->get_functionType()->get_parameters().front() ),
-                                                        func->get_functionType()->get_parameters().front()->get_type()->stripReferences()->clone()
-                                                )
+                                                UntypedExpr::createDeref( new VariableExpr( func->get_functionType()->get_parameters().front() ) )
                                         )
                                 )