Changeset e04b636 for src/Concurrency

Timestamp:

Mar 21, 2017, 12:36:01 PM (8 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:

168c007, cb0e6de

Parents:

31ce3d6

Message:

Implemented and tested coroutine keyword

File:

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

src/Concurrency/Keywords.cc

@@ -150 +150 @@
                         coroutine_decl = decl;
                 }
-                else if ( false ) {
+                else if ( decl->is_coroutine() ) {
                         handle( decl );
                 }
@@ -178 +178 @@
                 );
 
-                decl->get_members().push_front( cor );
+                decl->get_members().push_back( cor );
 
                 return cor;
@@ -201 +201 @@
                         )
                 );
+                type->get_returnVals().push_back(
+                        new ObjectDecl(
+                                "ret",
+                                noStorage,
+                                LinkageSpec::Cforall,
+                                nullptr,
+                                new PointerType(
+                                        noQualifiers,
+                                        new StructInstType(
+                                                noQualifiers,
+                                                coroutine_decl
+                                        )
+                                ),
+                                nullptr
+                        )
+                );
 
                 CompoundStmt * statement = new CompoundStmt( noLabels );
@@ -206 +222 @@
                         new ReturnStmt(
                                 noLabels,
-                                new UntypedMemberExpr(
-                                        new NameExpr( "__cor" ),
-                                        new NameExpr( "this" )
+                                new AddressExpr(
+                                        new UntypedMemberExpr(
+                                                new NameExpr( "__cor" ),
+                                                new UntypedExpr(
+                                                        new NameExpr( "*?" ),
+                                                        { new NameExpr( "this" ) }
+                                                )
+                                        )
                                 )
                         )
                 );
 
-                declsToAddAfter.push_back( 
-                        new FunctionDecl(
-                                "get_coroutine",
-                                Type::Static,
-                                LinkageSpec::Cforall,
-                                type,
-                                statement,
-                                noAttributes,
-                                Type::Inline
-                        )
-                );
+                FunctionDecl * get_decl = new FunctionDecl(
+                        "get_coroutine",
+                        Type::Static,
+                        LinkageSpec::Cforall,
+                        type,
+                        statement,
+                        noAttributes,
+                        Type::Inline
+                );
+
+                declsToAddAfter.push_back( get_decl );
+
+                get_decl->fixUniqueId();
         }
         
@@ -285 +308 @@
 
                 //Make sure that typed isn't mutex
-                if( ! base->get_mutex() ) throw SemanticError( "mutex keyword may only appear once per argument ", arg );
+                if( base->get_mutex() ) throw SemanticError( "mutex keyword may only appear once per argument ", arg );
         }