Changes in src/Concurrency/Actors.cpp [2d028039:ccf1d99]

File:

• src/Concurrency/Actors.cpp (modified) (6 diffs)

src/Concurrency/Actors.cpp

@@ -180 +180 @@
 };
 
+#define __ALLOC 0 // C_TODO: complete swap to no-alloc version
+
 struct GenReceiveDecls : public ast::WithDeclsToAdd<> {
     unordered_set<const StructDecl *> & actorStructDecls;
@@ -216 +218 @@
             /*
                 static inline derived_actor & ?|?( derived_actor & receiver, derived_msg & msg ) {
-                    request new_req;
+                    request * new_req = alloc();
                     Allocation (*my_work_fn)( derived_actor &, derived_msg & ) = receive;
                     __receive_fn fn = (__receive_fn)my_work_fn;
-                    new_req{ &receiver, &msg, fn };
-                    send( receiver, new_req );
+                    (*new_req){ &receiver, &msg, fn };
+                    send( receiver, *new_req );
                     return receiver;
                 }
@@ -226 +228 @@
             CompoundStmt * sendBody = new CompoundStmt( decl->location );
 
+            #if __ALLOC
+            // Generates: request * new_req = alloc();
+            sendBody->push_back( new DeclStmt(
+                decl->location,
+                new ObjectDecl(
+                    decl->location,
+                    "new_req",
+                    new PointerType( new StructInstType( *requestDecl ) ),
+                    new SingleInit( decl->location, new UntypedExpr( decl->location, new NameExpr( decl->location, "alloc" ), {} ) )
+                )
+            ));
+            #else
             // Generates: request new_req;
             sendBody->push_back( new DeclStmt(
@@ -235 +249 @@
                 )
             ));
+            #endif
             
             // Function type is: Allocation (*)( derived_actor &, derived_msg & )
@@ -275 +290 @@
             ));
 
+            #if __ALLOC
+            // Generates: (*new_req){ &receiver, &msg, fn };
+            sendBody->push_back( new ExprStmt(
+                decl->location,
+                                new UntypedExpr (
+                    decl->location, 
+                                        new NameExpr( decl->location, "?{}" ),
+                                        {
+                                                new UntypedExpr( decl->location, new NameExpr( decl->location, "*?" ), {  new NameExpr( decl->location, "new_req" ) } ),
+                        new AddressExpr( new NameExpr( decl->location, "receiver" ) ),
+                        new AddressExpr( new NameExpr( decl->location, "msg" ) ),
+                        new NameExpr( decl->location, "fn" )
+                                        }
+                                )
+                        ));
+
+            // Generates: send( receiver, *new_req );
+            sendBody->push_back( new ExprStmt(
+                decl->location,
+                                new UntypedExpr (
+                    decl->location,
+                                        new NameExpr( decl->location, "send" ),
+                                        {
+                                                {
+                            new NameExpr( decl->location, "receiver" ),
+                            new UntypedExpr( decl->location, new NameExpr( decl->location, "*?" ), {  new NameExpr( decl->location, "new_req" ) } )
+                        }
+                                        }
+                                )
+                        ));
+            #else
             // Generates: new_req{ &receiver, &msg, fn };
             sendBody->push_back( new ExprStmt(
@@ -304 +350 @@
                                 )
                         ));
+            #endif
             
             // Generates: return receiver;