Changes in / [43109ce:25d32e7]

Location:

src/Parser

Files:

• StatementNode.cc (modified) (2 diffs)
• StatementNode.h (modified) (2 diffs)
• parser.yy (modified) (2 diffs)

src/Parser/StatementNode.cc

@@ -10 +10 @@
 // Author           : Rodolfo G. Esteves
 // Created On       : Sat May 16 14:59:41 2015
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 11 11:44:15 2023
-// Update Count     : 429
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Apr 11 10:16:00 2023
+// Update Count     : 428
 //
 
@@ -374 +374 @@
 }
 
+ast::WaitUntilStmt::ClauseNode * build_waituntil_timeout( const CodeLocation & loc, ExpressionNode * when, ExpressionNode * timeout, StatementNode * stmt ) {
+        ast::WhenClause * clause = new ast::WhenClause( loc );
+        clause->when_cond = notZeroExpr( maybeMoveBuild( when ) );
+        clause->stmt = maybeMoveBuild( stmt );
+        clause->target = maybeMoveBuild( timeout );
+        return new ast::WaitUntilStmt::ClauseNode( ast::WaitUntilStmt::ClauseNode::Op::TIMEOUT, clause );
+}
+
 ast::WaitUntilStmt * build_waituntil_stmt( const CodeLocation & loc, ast::WaitUntilStmt::ClauseNode * root ) {
         ast::WaitUntilStmt * retStmt = new ast::WaitUntilStmt( loc );

src/Parser/StatementNode.h

@@ -9 +9 @@
 // Author           : Andrew Beach
 // Created On       : Wed Apr  5 11:42:00 2023
-// Last Modified By : Peter A. Buhr
-// Last Modified On : Fri Aug 11 11:44:07 2023
-// Update Count     : 2
+// Last Modified By : Andrew Beach
+// Last Modified On : Tue Apr 11  9:43:00 2023
+// Update Count     : 1
 //
 
@@ -102 +102 @@
 ast::WaitUntilStmt::ClauseNode * build_waituntil_clause( const CodeLocation &, ExpressionNode * when, ExpressionNode * targetExpr, StatementNode * stmt );
 ast::WaitUntilStmt::ClauseNode * build_waituntil_else( const CodeLocation &, ExpressionNode * when, StatementNode * stmt );
+ast::WaitUntilStmt::ClauseNode * build_waituntil_timeout( const CodeLocation &, ExpressionNode * when, ExpressionNode * timeout, StatementNode * stmt );
 ast::WaitUntilStmt * build_waituntil_stmt( const CodeLocation &, ast::WaitUntilStmt::ClauseNode * root );
 ast::Stmt * build_with( const CodeLocation &, ExpressionNode * exprs, StatementNode * stmt );

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Jul 18 22:51:30 2023
-// Update Count     : 6391
+// Last Modified On : Wed Jul 12 23:06:44 2023
+// Update Count     : 6389
 //
 
@@ -1708 +1708 @@
         | wor_waituntil_clause wor when_clause_opt ELSE statement
                 { $$ = new ast::WaitUntilStmt::ClauseNode( ast::WaitUntilStmt::ClauseNode::Op::LEFT_OR, $1, build_waituntil_else( yylloc, $3, maybe_build_compound( yylloc, $5 ) ) ); }
+        | wor_waituntil_clause wor when_clause_opt timeout statement    %prec THEN
+                { $$ = new ast::WaitUntilStmt::ClauseNode( ast::WaitUntilStmt::ClauseNode::Op::LEFT_OR, $1, build_waituntil_timeout( yylloc, $3, $4, maybe_build_compound( yylloc, $5 ) ) ); }
+        // "else" must be conditional after timeout or timeout is never triggered (i.e., it is meaningless)
+        | wor_waituntil_clause wor when_clause_opt timeout statement wor ELSE statement // invalid syntax rule
+                { SemanticError( yylloc, "syntax error, else clause must be conditional after timeout or timeout never triggered." ); $$ = nullptr; }
+        | wor_waituntil_clause wor when_clause_opt timeout statement wor when_clause ELSE statement
+                { $$ = new ast::WaitUntilStmt::ClauseNode( ast::WaitUntilStmt::ClauseNode::Op::LEFT_OR, $1,
+                                new ast::WaitUntilStmt::ClauseNode( ast::WaitUntilStmt::ClauseNode::Op::OR, 
+                                        build_waituntil_timeout( yylloc, $3, $4, maybe_build_compound( yylloc, $5 ) ), 
+                                        build_waituntil_else( yylloc, $7, maybe_build_compound( yylloc, $9 ) ) ) ); }
         ;
 
 waituntil_statement:
         wor_waituntil_clause                                                            %prec THEN
-                { $$ = new StatementNode( build_waituntil_stmt( yylloc, $1 ) ); }
+                // SKULLDUGGERY: create an empty compound statement to test parsing of waituntil statement.
+                {
+                        $$ = new StatementNode( build_waituntil_stmt( yylloc, $1 ) );
+                        // $$ = new StatementNode( build_compound( yylloc, nullptr ) );
+                }
         ;