Changeset 8a1d95af for src/Parser

Timestamp:

Aug 14, 2021, 8:48:49 AM (4 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, pthread-emulation, qualifiedEnum

Children:

f79ee0d

Parents:

c99a0d1 (diff), 6d63c14 (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/Parser

Files:

• ParseNode.h (modified) (1 diff)
• StatementNode.cc (modified) (1 diff)
• parser.yy (modified) (1 diff)

src/Parser/ParseNode.h

@@ -437 +437 @@
 WaitForStmt * build_waitfor_timeout( ExpressionNode * timeout, StatementNode * stmt, ExpressionNode * when, StatementNode * else_stmt, ExpressionNode * else_when );
 Statement * build_with( ExpressionNode * exprs, StatementNode * stmt );
+Statement * build_mutex( ExpressionNode * exprs, StatementNode * stmt );
 
 //##############################################################################

src/Parser/StatementNode.cc

@@ -374 +374 @@
 } // build_directive
 
+Statement * build_mutex( ExpressionNode * exprs, StatementNode * stmt ) {
+        std::list< Expression * > expList;
+        buildMoveList( exprs, expList );
+        Statement * body = maybeMoveBuild<Statement>( stmt );
+        return new MutexStmt( body, expList );
+} // build_mutex
+
 // Local Variables: //
 // tab-width: 4 //

src/Parser/parser.yy

@@ -1347 +1347 @@
 mutex_statement:
         MUTEX '(' argument_expression_list_opt ')' statement
-                { SemanticError( yylloc, "Mutex statement is currently unimplemented." ); $$ = nullptr; }
+                { $$ = new StatementNode( build_mutex( $3, $5 ) ); }
         ;