Changes in src/Concurrency/Keywords.cpp [fc1a3e2:ca9d65e]

File:

• src/Concurrency/Keywords.cpp (modified) (11 diffs)

src/Concurrency/Keywords.cpp

@@ -991 +991 @@
         ast::CompoundStmt * body =
                         new ast::CompoundStmt( stmt->location, { stmt->stmt } );
-
+        
         return addStatements( body, stmt->mutexObjs );;
 }
@@ -1180 +1180 @@
 
 // generates a cast to the void ptr to the appropriate lock type and dereferences it before calling lock or unlock on it
-// used to undo the type erasure done by storing all the lock pointers as void
+// used to undo the type erasure done by storing all the lock pointers as void 
 ast::ExprStmt * MutexKeyword::genVirtLockUnlockExpr( const std::string & fnName, ast::ptr<ast::Expr> expr, const CodeLocation & location, ast::Expr * param ) {
         return new ast::ExprStmt( location,
@@ -1187 +1187 @@
                                 ast::UntypedExpr::createDeref(
                                         location,
-                                        new ast::CastExpr( location,
+                                        new ast::CastExpr( location, 
                                                 param,
                                                 new ast::PointerType( new ast::TypeofType( new ast::UntypedExpr(
@@ -1208 +1208 @@
         //adds an if/elif clause for each lock to assign type from void ptr based on ptr address
         for ( long unsigned int i = 0; i < args.size(); i++ ) {
-
+                
                 ast::UntypedExpr * ifCond = new ast::UntypedExpr( location,
                         new ast::NameExpr( location, "?==?" ), {
@@ -1216 +1216 @@
                 );
 
-                ast::IfStmt * currLockIf = new ast::IfStmt(
+                ast::IfStmt * currLockIf = new ast::IfStmt( 
                         location,
                         ifCond,
                         genVirtLockUnlockExpr( fnName, args.at(i), location, ast::deepCopy( thisParam ) )
                 );
-
+                
                 if ( i == 0 ) {
                         outerLockIf = currLockIf;
@@ -1235 +1235 @@
 
 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 ));
-        }
+    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 ));
+    }
 }
 
@@ -1255 +1255 @@
         // 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 ));
-        }
+    // 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.
@@ -1302 +1302 @@
         // adds a nested try stmt for each lock we are locking
         for ( long unsigned int i = 0; i < flattenedArgs.size(); i++ ) {
-                ast::UntypedExpr * innerAccess = new ast::UntypedExpr(
+                ast::UntypedExpr * innerAccess = new ast::UntypedExpr( 
                         location,
                         new ast::NameExpr( location,"?[?]" ), {
@@ -1426 +1426 @@
         //      );
 
-        //      ast::IfStmt * currLockIf = new ast::IfStmt(
+        //      ast::IfStmt * currLockIf = new ast::IfStmt( 
         //              location,
         //              ast::deepCopy( ifCond ),
@@ -1432 +1432 @@
         //      );
 
-        //      ast::IfStmt * currUnlockIf = new ast::IfStmt(
+        //      ast::IfStmt * currUnlockIf = new ast::IfStmt( 
         //              location,
         //              ifCond,
         //              genVirtLockUnlockExpr( "unlock", args.at(i), location, ast::deepCopy( thisParam ) )
         //      );
-
+                
         //      if ( i == 0 ) {
         //              outerLockIf = currLockIf;
@@ -1450 +1450 @@
         //      lastUnlockIf = currUnlockIf;
         // }
-
+        
         // // add pointer typing if/elifs to body of routines
         // lock_decl->stmts = new ast::CompoundStmt( location, { outerLockIf } );