Changeset 135b431 for src/Parser/parser.yy

Timestamp:

Aug 25, 2017, 11:09:02 AM (7 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, new-env, no_list, persistent-indexer, pthread-emulation, qualifiedEnum, resolv-new, with_gc

Children:

6b224a52

Parents:

3eab0ef6

Message:

First step for waitfor statments, does nothing but is there

File:

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

src/Parser/parser.yy

@@ -97 +97 @@
         DeclarationNode::TypeClass tclass;
         StatementNode * sn;
+        WaitForStmt * wfs;
         ConstantExpr * constant;
         IfCtl * ifctl;
@@ -187 +188 @@
 %type<flag> asm_volatile_opt
 %type<en> handler_predicate_opt
+%type<en> when_clause_opt timeout
 
 // statements
@@ -192 +194 @@
 %type<sn> iteration_statement                   jump_statement
 %type<sn> with_statement                                exception_statement                     asm_statement
-%type<sn> when_clause_opt                               waitfor_statement                       waitfor_clause                          waitfor                         timeout
+%type<sn> waitfor_statement
 %type<sn> fall_through_opt                              fall_through
 %type<sn> statement                                             statement_list
@@ -202 +204 @@
 %type<sn> handler_clause                                finally_clause
 %type<catch_kind> handler_key
+%type<wfs> waitfor_clause
+%type<en> waitfor
 
 // declarations
@@ -979 +983 @@
 when_clause_opt:
         // empty
-                { $$ = nullptr; }                                                               // FIX ME
+                { $$ = nullptr; }
         | WHEN '(' comma_expression ')'
-                { $$ = nullptr; }                                                               // FIX ME
+                { $$ = $3; }
         ;
 
 waitfor:
         WAITFOR '(' identifier ')'
-                { $$ = nullptr; }                                                               // FIX ME
+                {
+                        $$ = new ExpressionNode( new NameExpr( *$3 ) );
+                        delete $3;
+                }
         | WAITFOR '(' identifier ',' argument_expression_list ')'
-                { $$ = nullptr; }                                                               // FIX ME
+                {
+                        $$ = new ExpressionNode( new NameExpr( *$3 ) );
+                        $$->set_last( $5 );
+                        delete $3;
+                }
         ;
 
 timeout:
         TIMEOUT '(' comma_expression ')'
-                { $$ = nullptr; }                                                               // FIX ME
+                { $$ = $3; }
         ;
 
 waitfor_clause:
         when_clause_opt waitfor statement %prec THEN
-                { $$ = nullptr; }                                                               // FIX ME
+                { $$ = build_waitfor( $2, $3, $1 ); }
         | when_clause_opt waitfor statement WOR waitfor_clause
-                { $$ = nullptr; }                                                               // FIX ME
+                { $$ = build_waitfor( $2, $3, $1, $5 ); }
         | when_clause_opt timeout statement %prec THEN
-                { $$ = nullptr; }                                                               // FIX ME
+                { $$ = build_waitfor_timeout( $2, $3, $1 ); }
         | when_clause_opt ELSE statement
-                { $$ = nullptr; }                                                               // FIX ME
+                { $$ = build_waitfor_timeout( nullptr, $3, $1 ); }
         | when_clause_opt timeout statement WOR when_clause_opt ELSE statement
-                { $$ = nullptr; }                                                               // FIX ME
+                { $$ = build_waitfor_timeout( $2, $3, $1, $7, $5 ); }
         ;
 
 waitfor_statement:
         when_clause_opt waitfor statement %prec THEN
-                { $$ = nullptr; }                                                               // FIX ME
+                { $$ = new StatementNode( build_waitfor( $2, $3, $1 ) ); }
         | when_clause_opt waitfor statement WOR waitfor_clause
-                { $$ = nullptr; }                                                               // FIX ME
+                { $$ = new StatementNode( build_waitfor( $2, $3, $1, $5 ) ); }
         ;