Changeset 044ae62 for src/Concurrency

Timestamp:

May 29, 2023, 11:44:29 AM (3 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT

Children:

fa2c005

Parents:

3a513d89 (diff), 2b78949 (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 ADT

Location:

src/Concurrency

Files:

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

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

@@ -23 +23 @@
         Concurrency/WaitforNew.cpp \
         Concurrency/Waitfor.cc \
-        Concurrency/Waitfor.h 
+        Concurrency/Waitfor.h \
+        Concurrency/Waituntil.cpp \
+        Concurrency/Waituntil.hpp