Changeset 24d6572 for src/Concurrency

Timestamp:

Jun 12, 2023, 2:45:32 PM (3 years ago)

Author:

Fangren Yu <f37yu@…>

Branches:

ast-experimental, master

Children:

62d62db

Parents:

34b4268 (diff), 251ce80 (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' into ast-experimental

Location:

src/Concurrency

Files:

• Actors.cpp (added)
• Actors.hpp (added)
• KeywordsNew.cpp (modified) (1 diff)
• WaitforNew.cpp (modified) (2 diffs)
• Waituntil.cpp (added)
• Waituntil.hpp (added)
• module.mk (modified) (2 diffs)

src/Concurrency/KeywordsNew.cpp

@@ -779 +779 @@
 
 const ast::Stmt * SuspendKeyword::postvisit( const ast::SuspendStmt * stmt ) {
-        switch ( stmt->type ) {
+        switch ( stmt->kind ) {
         case ast::SuspendStmt::None:
                 // Use the context to determain the implicit target.

src/Concurrency/WaitforNew.cpp

@@ -305 +305 @@
 
         const ast::VariableExpr * variableExpr =
-                clause->target_func.as<ast::VariableExpr>();
+                clause->target.as<ast::VariableExpr>();
         ast::Expr * castExpr = new ast::CastExpr(
                 location,
                 new ast::CastExpr(
                         location,
-                        clause->target_func,
+                        clause->target,
                         ast::deepCopy( variableExpr->result.get() ),
                         ast::GeneratedCast ),
@@ -325 +325 @@
 
         ResolveContext context{ symtab, transUnit().global };
-        out->push_back( maybeCond( location, clause->cond.get(), {
+        out->push_back( maybeCond( location, clause->when_cond.get(), {
                 makeAccStmt( location, acceptables, index, "is_dtor",
-                        detectIsDtor( location, clause->target_func ), context ),
+                        detectIsDtor( location, clause->target ), context ),
                 makeAccStmt( location, acceptables, index, "func",
                         funcExpr, context ),

src/Concurrency/module.mk

@@ -16 +16 @@
 
 SRC += \
+        Concurrency/Actors.cpp \
+        Concurrency/Actors.hpp \
         Concurrency/KeywordsNew.cpp \
         Concurrency/Keywords.cc \
@@ -21 +23 @@
         Concurrency/WaitforNew.cpp \
         Concurrency/Waitfor.cc \
-        Concurrency/Waitfor.h
+        Concurrency/Waitfor.h \
+        Concurrency/Waituntil.cpp \
+        Concurrency/Waituntil.hpp