Changeset 044ae62 for src/Parser/parser.yy

Timestamp:

May 29, 2023, 11:44:29 AM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT

Children:

fa2c005

Parents:

3a513d89 (diff), 2b78949 (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' into ADT

File:

• src/Parser/parser.yy (modified) (6 diffs)

src/Parser/parser.yy

@@ -9 +9 @@
 // Author           : Peter A. Buhr
 // Created On       : Sat Sep  1 20:22:55 2001
-// Last Modified By : Andrew Beach
-// Last Modified On : Tue Apr  4 14:02:00 2023
-// Update Count     : 6329
+// Last Modified By : Peter A. Buhr
+// Last Modified On : Wed Apr 26 16:45:37 2023
+// Update Count     : 6330
 //
 
@@ -307 +307 @@
         ClauseNode * clause;
         ast::WaitForStmt * wfs;
+    ast::WaitUntilStmt::ClauseNode * wucn;
         CondCtl * ifctl;
         ForCtrl * forctl;
@@ -427 +428 @@
 %type<expr> when_clause                                 when_clause_opt                         waitfor         waituntil               timeout
 %type<stmt> waitfor_statement                           waituntil_statement
-%type<wfs> wor_waitfor_clause                   waituntil_clause                        wand_waituntil_clause   wor_waituntil_clause
+%type<wfs> wor_waitfor_clause
+%type<wucn> waituntil_clause                    wand_waituntil_clause       wor_waituntil_clause
 
 // declarations
@@ -1682 +1684 @@
 
 waituntil:
-        WAITUNTIL '(' cast_expression ')'
+        WAITUNTIL '(' comma_expression ')'
                 { $$ = $3; }
         ;
@@ -1688 +1690 @@
 waituntil_clause:
         when_clause_opt waituntil statement
-                { printf( "waituntil_clause 1\n" ); $$ = nullptr; }
+                { $$ = build_waituntil_clause( yylloc, $1, $2, maybe_build_compound( yylloc, $3 ) ); }
         | '(' wor_waituntil_clause ')'
-                { printf( "waituntil_clause 2\n" ); $$ = nullptr; }
+                { $$ = $2; }
         ;
 
 wand_waituntil_clause:
         waituntil_clause                                                                        %prec THEN
-                { printf( "wand_waituntil_clause 1\n" ); $$ = nullptr; }
+                { $$ = $1; }
         | waituntil_clause wand wand_waituntil_clause
-                { printf( "wand_waituntil_clause 2\n" ); $$ = nullptr; }
+                { $$ = new ast::WaitUntilStmt::ClauseNode( ast::WaitUntilStmt::ClauseNode::Op::AND, $1, $3 ); }
         ;
 
 wor_waituntil_clause:
         wand_waituntil_clause
-                { printf( "wor_waituntil_clause 1\n" ); $$ = nullptr; }
+                { $$ = $1; }
         | wor_waituntil_clause wor wand_waituntil_clause
-                { printf( "wor_waituntil_clause 2\n" ); $$ = nullptr; }
+                { $$ = new ast::WaitUntilStmt::ClauseNode( ast::WaitUntilStmt::ClauseNode::Op::OR, $1, $3 ); }
         | wor_waituntil_clause wor when_clause_opt ELSE statement
-                { printf( "wor_waituntil_clause 3\n" ); $$ = nullptr; }
+                { $$ = 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
-                { printf( "wor_waituntil_clause 4\n" ); $$ = nullptr; }
+                { $$ = 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 // syntax error
                 { SemanticError( yylloc, "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
-                { printf( "wor_waituntil_clause 6\n" ); $$ = nullptr; }
+                { $$ = 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 ) ) ) ); }
         ;
 
@@ -1719 +1724 @@
         wor_waituntil_clause                                                            %prec THEN
                 // SKULLDUGGERY: create an empty compound statement to test parsing of waituntil statement.
-                { $$ = new StatementNode( build_compound( yylloc, nullptr ) ); }
+                {
+            $$ = new StatementNode( build_waituntil_stmt( yylloc, $1 ) );
+            // $$ = new StatementNode( build_compound( yylloc, nullptr ) );
+        }
         ;