Changes in src/Concurrency/Actors.cpp [086d6b8:3830c84]

File:

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

src/Concurrency/Actors.cpp

@@ -38 +38 @@
     bool namedDecl = false;
 
-    // finds and sets a ptr to the allocation enum, which is needed in the next pass
+    // finds and sets a ptr to the Allocation enum, which is needed in the next pass
     void previsit( const EnumDecl * decl ) {
-        if( decl->name == "allocation" ) *allocationDecl = decl;
+        if( decl->name == "Allocation" ) *allocationDecl = decl;
     }
 
@@ -227 +227 @@
                 static inline derived_actor & ?|?( derived_actor & receiver, derived_msg & msg ) {
                     request new_req;
-                    allocation (*my_work_fn)( derived_actor &, derived_msg & ) = receive;
+                    Allocation (*my_work_fn)( derived_actor &, derived_msg & ) = receive;
                     __receive_fn fn = (__receive_fn)my_work_fn;
                     new_req{ &receiver, &msg, fn };
@@ -246 +246 @@
             ));
             
-            // Function type is: allocation (*)( derived_actor &, derived_msg & )
+            // Function type is: Allocation (*)( derived_actor &, derived_msg & )
             FunctionType * derivedReceive = new FunctionType();
             derivedReceive->params.push_back( ast::deepCopy( derivedActorRef ) );
@@ -252 +252 @@
             derivedReceive->returns.push_back( new EnumInstType( *allocationDecl ) );
 
-            // Generates: allocation (*my_work_fn)( derived_actor &, derived_msg & ) = receive;
+            // Generates: Allocation (*my_work_fn)( derived_actor &, derived_msg & ) = receive;
             sendBody->push_back( new DeclStmt(
                 decl->location,
@@ -263 +263 @@
             ));
 
-            // Function type is: allocation (*)( actor &, message & )
+            // Function type is: Allocation (*)( actor &, message & )
             FunctionType * genericReceive = new FunctionType();
             genericReceive->params.push_back( new ReferenceType( new StructInstType( *actorDecl ) ) );
@@ -269 +269 @@
             genericReceive->returns.push_back( new EnumInstType( *allocationDecl ) );
 
-            // Generates: allocation (*fn)( actor &, message & ) = (allocation (*)( actor &, message & ))my_work_fn;
+            // Generates: Allocation (*fn)( actor &, message & ) = (Allocation (*)( actor &, message & ))my_work_fn;
             // More readable synonymous code: 
-            //     typedef allocation (*__receive_fn)(actor &, message &);
+            //     typedef Allocation (*__receive_fn)(actor &, message &);
             //     __receive_fn fn = (__receive_fn)my_work_fn;
             sendBody->push_back( new DeclStmt(
@@ -285 +285 @@
             ));
 
-            // Generates: new_req{ &receiver, (actor *)&receiver, &msg, (message *)&msg, fn };
+            // Generates: new_req{ &receiver, &msg, fn };
             sendBody->push_back( new ExprStmt(
                 decl->location,
@@ -294 +294 @@
                                                 new NameExpr( decl->location, "new_req" ),
                         new AddressExpr( new NameExpr( decl->location, "receiver" ) ),
-                        new CastExpr( decl->location, new AddressExpr( new NameExpr( decl->location, "receiver" ) ), new PointerType( new StructInstType( *actorDecl ) ), ExplicitCast ),
                         new AddressExpr( new NameExpr( decl->location, "msg" ) ),
-                        new CastExpr( decl->location, new AddressExpr( new NameExpr( decl->location, "msg" ) ), new PointerType( new StructInstType( *msgDecl ) ), ExplicitCast ),
                         new NameExpr( decl->location, "fn" )
                                         }
@@ -323 +321 @@
             FunctionDecl * sendOperatorFunction = new FunctionDecl(
                 decl->location,
-                "?|?",
+                "?<<?",
                 {},                     // forall
                 {
@@ -424 +422 @@
     const StructDecl ** msgDecl = &msgDeclPtr;
 
-    // first pass collects ptrs to allocation enum, request type, and generic receive fn typedef
+    // first pass collects ptrs to Allocation enum, request type, and generic receive fn typedef
     // also populates maps of all derived actors and messages
     Pass<CollectactorStructDecls>::run( translationUnit, actorStructDecls, messageStructDecls, requestDecl,