Changeset 81da3da4 for src/Concurrency

Timestamp:

Dec 11, 2023, 4:18:13 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master, stuck-waitfor-destruct

Children:

21ce2c7, 2554f24

Parents:

5ddb8bf (diff), 1c85ffc (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

Location:

src/Concurrency

Files:

• Actors.cpp (modified) (6 diffs)
• Corun.cpp (modified) (2 diffs)
• Keywords.cpp (moved) (moved from src/Concurrency/KeywordsNew.cpp ) (7 diffs)
• Waitfor.cpp (moved) (moved from src/Concurrency/WaitforNew.cpp ) (1 diff)
• Waituntil.cpp (modified) (2 diffs)
• module.mk (modified) (1 diff)

src/Concurrency/Actors.cpp

@@ -265 +265 @@
                 decl->location,
                 "__CFA_receive_wrap",
-                {},                     // forall
                 {
                     new ObjectDecl(
@@ -288 +287 @@
                     )
                 },                      // params
-                { 
+                {
                     new ObjectDecl(
                         decl->location,
@@ -400 +399 @@
                                 )
                         ));
-            
+
             // Generates: return receiver;
             sendBody->push_back( new ReturnStmt( decl->location, new NameExpr( decl->location, "receiver" ) ) );
@@ -408 +407 @@
                 decl->location,
                 "?|?",
-                {},                     // forall
                 {
                     new ObjectDecl(
@@ -421 +419 @@
                     )
                 },                      // params
-                { 
+                {
                     new ObjectDecl(
                         decl->location,
@@ -434 +432 @@
                 { Function::Inline }
             );
-            
+
             // forward decls to resolve use before decl problem for '|' routines
             forwardDecls.insertDecl( *actorIter, *messageIter , ast::deepCopy( sendOperatorFunction ) );

src/Concurrency/Corun.cpp

@@ -113 +113 @@
             new FunctionDecl( loc,
                 fnName,                                             // name
-                {},                                                 // forall
                 {
                     new ObjectDecl( loc,
@@ -261 +260 @@
             new FunctionDecl( loc,
                 fnName,                                             // name
-                {},                                                 // forall
                 {},                                                 // params
                 {},                                                 // return

src/Concurrency/Keywords.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// KeywordsNew.cpp -- Implement concurrency constructs from their keywords.
+// Keywords.cpp -- Implement concurrency constructs from their keywords.
 //
 // Author           : Andrew Beach
@@ -14 +14 @@
 //
 
+#include "Concurrency/Keywords.h"
+
 #include <iostream>
-
-#include "Concurrency/Keywords.h"
 
 #include "AST/Copy.hpp"
@@ -30 +30 @@
 #include "Common/utility.h"
 #include "Common/UniqueName.h"
-#include "ControlStruct/LabelGeneratorNew.hpp"
+#include "ControlStruct/LabelGenerator.hpp"
 #include "InitTweak/InitTweak.h"
 #include "Virtual/Tables.h"
@@ -482 +482 @@
                 location,
                 getter_name,
-                {}, // forall
                 { this_decl }, // params
                 { ret_decl }, // returns
@@ -499 +498 @@
                         location,
                         "main",
-                        {},
                         { ast::deepCopy( this_decl ) },
                         {},
@@ -575 +573 @@
                 location,
                 "lock",
-                { /* forall */ },
                 {
                         // Copy the declaration of this.
@@ -607 +604 @@
                 location,
                 "unlock",
-                { /* forall */ },
                 {
                         // Last use, consume the declaration of this.

src/Concurrency/Waitfor.cpp

@@ -5 +5 @@
 // file "LICENCE" distributed with Cforall.
 //
-// WaitforNew.cpp -- Expand waitfor clauses into code.
+// Waitfor.cpp -- Expand waitfor clauses into code.
 //
 // Author           : Andrew Beach

src/Concurrency/Waituntil.cpp

@@ -553 +553 @@
     return new FunctionDecl( loc,
         predName,
-        {},                     // forall
         {
             new ObjectDecl( loc,
@@ -560 +559 @@
             )
         },
-        { 
+        {
             new ObjectDecl( loc,
                 "sat_ret",

src/Concurrency/module.mk

@@ -20 +20 @@
         Concurrency/Corun.cpp \
         Concurrency/Corun.hpp \
-        Concurrency/KeywordsNew.cpp \
+        Concurrency/Keywords.cpp \
         Concurrency/Keywords.h \
-        Concurrency/WaitforNew.cpp \
+        Concurrency/Waitfor.cpp \
         Concurrency/Waitfor.h \
         Concurrency/Waituntil.cpp \