Changeset a73c16e for src/Parser

Timestamp:

Oct 11, 2021, 11:10:33 PM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, enum, forall-pointer-decay, master, pthread-emulation, qualifiedEnum

Children:

efc8f3e

Parents:

d4d4ac8

Message:

parse loop default-block for while/do/for

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 : Fri Oct  8 06:57:16 2021
-// Update Count     : 5086
+// Last Modified On : Mon Oct 11 16:14:04 2021
+// Update Count     : 5131
 //
 
@@ -346 +346 @@
 %type<en> case_value
 %type<sn> case_clause                                   case_value_list                         case_label                                      case_label_list
-%type<sn> iteration_statement                   jump_statement
+%type<sn> iteration_statement                   loop_default_opt                        jump_statement
 %type<sn> expression_statement                  asm_statement
 %type<sn> with_statement
@@ -1192 +1192 @@
 
 iteration_statement:
-        WHILE '(' push if_control_expression ')' statement pop
-                { $$ = new StatementNode( build_while( $4, maybe_build_compound( $6 ) ) ); }
+        WHILE '(' push if_control_expression ')' loop_default_opt statement pop
+                { $$ = new StatementNode( build_while( $4, maybe_build_compound( $7 ) ) ); }
         | WHILE '(' ')' statement                                                       // CFA => while ( 1 )
                 { $$ = new StatementNode( build_while( new IfCtrl( nullptr, new ExpressionNode( build_constantInteger( *new string( "1" ) ) ) ), maybe_build_compound( $4 ) ) ); }
-        | DO statement WHILE '(' comma_expression ')' ';'
+        | DO statement WHILE '(' comma_expression ')' loop_default_opt ';'
                 { $$ = new StatementNode( build_do_while( $5, maybe_build_compound( $2 ) ) ); }
         | DO statement WHILE '(' ')' ';'                                        // CFA => do while( 1 )
                 { $$ = new StatementNode( build_do_while( new ExpressionNode( build_constantInteger( *new string( "1" ) ) ), maybe_build_compound( $2 ) ) ); }
-        | FOR '(' push for_control_expression_list ')' statement pop
-                { $$ = new StatementNode( build_for( $4, maybe_build_compound( $6 ) ) ); }
+        | FOR '(' push for_control_expression_list ')' loop_default_opt statement pop
+                { $$ = new StatementNode( build_for( $4, maybe_build_compound( $7 ) ) ); }
         | FOR '(' ')' statement                                                         // CFA => for ( ;; )
                 { $$ = new StatementNode( build_for( new ForCtrl( (ExpressionNode * )nullptr, (ExpressionNode * )nullptr, (ExpressionNode * )nullptr ), maybe_build_compound( $4 ) ) ); }
+        ;
+
+loop_default_opt:
+        // empty
+                { $$ = nullptr; }
+        | DEFAULT statement ELSE
+                { SemanticError( yylloc, "Loop default block is currently unimplemented." ); $$ = nullptr; }
+                // { $$ = $2; }
         ;