Changeset d464b79

Timestamp:

Jun 30, 2023, 3:59:28 PM (17 months ago)

Author:

caparsons <caparson@…>

Branches:

master

Children:

bdf4cd9e

Parents:

4bae7b4

Message:

added flattening so that the mutex statement now can accept tuples

File:

• src/Concurrency/KeywordsNew.cpp (modified) (7 diffs)

src/Concurrency/KeywordsNew.cpp

@@ -1236 +1236 @@
 }
 
+void flattenTuple( const ast::UntypedTupleExpr * tuple, std::vector<ast::ptr<ast::Expr>> & output ) {
+    for ( auto & expr : tuple->exprs ) {
+        const ast::UntypedTupleExpr * innerTuple = dynamic_cast<const ast::UntypedTupleExpr *>(expr.get());
+        if ( innerTuple ) flattenTuple( innerTuple, output );
+        else output.emplace_back( ast::deepCopy( expr ));
+    }
+}
+
 ast::CompoundStmt * MutexKeyword::addStatements(
                 const ast::CompoundStmt * body,
@@ -1248 +1256 @@
         // std::string lockFnName = mutex_func_namer.newName();
         // std::string unlockFnName = mutex_func_namer.newName();
+
+    // If any arguments to the mutex stmt are tuples, flatten them
+    std::vector<ast::ptr<ast::Expr>> flattenedArgs;
+    for ( auto & arg : args ) {
+        const ast::UntypedTupleExpr * tuple = dynamic_cast<const ast::UntypedTupleExpr *>(args.at(0).get());
+        if ( tuple ) flattenTuple( tuple, flattenedArgs );
+        else flattenedArgs.emplace_back( ast::deepCopy( arg ));
+    }
 
         // Make pointer to the monitors.
@@ -1257 +1273 @@
                                 new ast::VoidType()
                         ),
-                        ast::ConstantExpr::from_ulong( location, args.size() ),
+                        ast::ConstantExpr::from_ulong( location, flattenedArgs.size() ),
                         ast::FixedLen,
                         ast::DynamicDim
@@ -1264 +1280 @@
                         location,
                         map_range<std::vector<ast::ptr<ast::Init>>>(
-                                args, [](const ast::Expr * expr) {
+                                flattenedArgs, [](const ast::Expr * expr) {
                                         return new ast::SingleInit(
                                                 expr->location,
@@ -1287 +1303 @@
 
         // adds a nested try stmt for each lock we are locking
-        for ( long unsigned int i = 0; i < args.size(); i++ ) {
+        for ( long unsigned int i = 0; i < flattenedArgs.size(); i++ ) {
                 ast::UntypedExpr * innerAccess = new ast::UntypedExpr( 
                         location,
@@ -1298 +1314 @@
                 // make the try body
                 ast::CompoundStmt * currTryBody = new ast::CompoundStmt( location );
-                ast::IfStmt * lockCall = genTypeDiscrimLockUnlock( "lock", args, location, innerAccess );
+                ast::IfStmt * lockCall = genTypeDiscrimLockUnlock( "lock", flattenedArgs, location, innerAccess );
                 currTryBody->push_back( lockCall );
 
                 // make the finally stmt
                 ast::CompoundStmt * currFinallyBody = new ast::CompoundStmt( location );
-                ast::IfStmt * unlockCall = genTypeDiscrimLockUnlock( "unlock", args, location, innerAccess );
+                ast::IfStmt * unlockCall = genTypeDiscrimLockUnlock( "unlock", flattenedArgs, location, innerAccess );
                 currFinallyBody->push_back( unlockCall );
 
@@ -1343 +1359 @@
                                                 new ast::SingleInit(
                                                         location,
-                                                        ast::ConstantExpr::from_ulong( location, args.size() ) ),
+                                                        ast::ConstantExpr::from_ulong( location, flattenedArgs.size() ) ),
                                         },
                                         {},