Changeset 1f133dc for src

Timestamp:

Jun 29, 2018, 3:02:57 PM (6 years ago)

Author:

Thierry Delisle <tdelisle@…>

Branches:

ADT, aaron-thesis, arm-eh, ast-experimental, cleanup-dtors, deferred_resn, demangler, enum, forall-pointer-decay, jacob/cs343-translation, jenkins-sandbox, master, new-ast, new-ast-unique-expr, no_list, persistent-indexer, pthread-emulation, qualifiedEnum

Children:

adb60242

Parents:

c5283ba (diff), 713926ca (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

File:

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

src/Parser/parser.yy

@@ -10 +10 @@
 // Created On       : Sat Sep  1 20:22:55 2001
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Sun Jun 24 10:41:10 2018
-// Update Count     : 3587
+// Last Modified On : Fri Jun 29 10:31:42 2018
+// Update Count     : 3596
 //
 
@@ -1136 +1136 @@
 
 waitfor:
-        WAITFOR '(' identifier ')'
-                {
-                        $$ = new ExpressionNode( new NameExpr( *$3 ) );
-                        delete $3;
-                }
-        | WAITFOR '(' identifier ',' argument_expression_list ')'
-                {
-                        $$ = new ExpressionNode( new NameExpr( *$3 ) );
-                        $$->set_last( $5 );
-                        delete $3;
-                }
+        WAITFOR '(' cast_expression ')'
+                { $$ = $3; }
+        | WAITFOR '(' cast_expression ',' argument_expression_list ')'
+                { $$ = (ExpressionNode *)$3->set_last( $5 ); }
         ;
 
@@ -1163 +1156 @@
                 { $$ = build_waitfor_timeout( nullptr, $3, $1 ); }
                 // "else" must be conditional after timeout or timeout is never triggered (i.e., it is meaningless)
+        | when_clause_opt timeout statement WOR ELSE statement
+                { SemanticError( yylloc, "else clause must be conditional after timeout or timeout never triggered." ); $$ = nullptr; }
         | when_clause_opt timeout statement WOR when_clause ELSE statement
                 { $$ = build_waitfor_timeout( $2, $3, $1, $7, $5 ); }