Changeset c083c3d for src/Concurrency

Timestamp:

May 1, 2023, 6:15:26 PM (14 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

6740811

Parents:

4daf79f (diff), 6e1e2d0 (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.

git-author:

Peter A. Buhr <pabuhr@…> (05/01/23 16:59:14)

git-committer:

Peter A. Buhr <pabuhr@…> (05/01/23 18:15:26)

Message:

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

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