Changeset 9bb6c5f for src/Concurrency

Timestamp:

Sep 5, 2024, 3:57:05 PM (17 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

29c8675

Parents:

ad47ec4 (diff), 508cff0 (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:

• Keywords.cpp (modified) (1 diff)
• Waitfor.cpp (modified) (1 diff)

src/Concurrency/Keywords.cpp

@@ -1510 +1510 @@
 
 ast::ptr<ast::Type> MutexKeyword::generic_func =
-        new ast::FunctionType( ast::VariableArgs );
+        new ast::FunctionType( ast::FixedArgs );
 
 // --------------------------------------------------------------------------

src/Concurrency/Waitfor.cpp

@@ -302 +302 @@
         const ast::ObjectDecl * monitors = declMonitors( out, clause );
         ast::Type * fptr_t = new ast::PointerType(
-                        new ast::FunctionType( ast::VariableArgs ) );
+                        new ast::FunctionType( ast::FixedArgs ) );
 
         const ast::VariableExpr * variableExpr =