Changeset 9bd6105 for src/Parser

Timestamp:

Aug 26, 2017, 10:29:03 PM (7 years ago)

Author:

Peter A. Buhr <pabuhr@…>

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:

eca3d10

Parents:

51d6d6a

Message:

formatting

File:

• src/Parser/parser.yy (modified) (6 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 : Sat Aug 26 14:41:43 2017
-// Update Count     : 2711
+// Last Modified On : Sat Aug 26 17:50:19 2017
+// Update Count     : 2712
 //
 
@@ -190 +190 @@
 
 // statements
-%type<sn> labeled_statement                             compound_statement                      expression_statement            selection_statement
+%type<sn> statement                                             labeled_statement                       compound_statement
+%type<sn> statement_decl                                statement_decl_list                     statement_list_nodecl
+%type<sn> selection_statement
+%type<sn> switch_clause_list_opt                switch_clause_list                      choose_clause_list_opt          choose_clause_list
+%type<en> case_value
+%type<sn> case_clause                                   case_value_list                         case_label                                      case_label_list
+%type<sn> fall_through                                  fall_through_opt
 %type<sn> iteration_statement                   jump_statement
-%type<sn> with_clause_opt                               with_statement
+%type<sn> expression_statement                  asm_statement
+%type<sn> with_statement                                with_clause_opt
 %type<sn> exception_statement                   handler_clause                          finally_clause
 %type<catch_kind> handler_key
-%type<en> when_clause                                   when_clause_opt                         timeout
+%type<en> when_clause                                   when_clause_opt                         waitfor                                         timeout
 %type<sn> waitfor_statement
-%type<en> waitfor
 %type<wfs> waitfor_clause
-%type<sn> statement                                             statement_list                          asm_statement
-%type<sn> block_item_list                               block_item
-%type<en> case_value
-%type<sn> case_clause                                   case_value_list                         case_label                                      case_label_list
-%type<sn> switch_clause_list_opt                switch_clause_list                      choose_clause_list_opt          choose_clause_list
-%type<sn> fall_through                                  fall_through_opt
 
 // declarations
@@ -776 +776 @@
           push push
           local_label_declaration_opt                                           // GCC, local labels
-          block_item_list                                                                       // C99, intermix declarations and statements
+          statement_decl_list                                                           // C99, intermix declarations and statements
           pop '}'
                 { $$ = new StatementNode( build_compound( $5 ) ); }
         ;
 
-block_item_list:                                                                                // C99
-        block_item
-        | block_item_list push block_item
+statement_decl_list:                                                                    // C99
+        statement_decl
+        | statement_decl_list push statement_decl
                 { if ( $1 != 0 ) { $1->set_last( $3 ); $$ = $1; } }
         ;
 
-block_item:
+statement_decl:
         declaration                                                                                     // CFA, new & old style declarations
                 { $$ = new StatementNode( $1 ); }
@@ -805 +805 @@
         ;
 
-statement_list:
+statement_list_nodecl:
         statement
-        | statement_list statement
+        | statement_list_nodecl statement
                 { if ( $1 != 0 ) { $1->set_last( $2 ); $$ = $1; } }
         ;
@@ -892 +892 @@
 
 switch_clause_list:                                                                             // CFA
-        case_label_list statement_list
+        case_label_list statement_list_nodecl
                 { $$ = $1->append_last_case( new StatementNode( build_compound( $2 ) ) ); }
-        | switch_clause_list case_label_list statement_list
+        | switch_clause_list case_label_list statement_list_nodecl
                 { $$ = (StatementNode *)( $1->set_last( $2->append_last_case( new StatementNode( build_compound( $3 ) ) ) ) ); }
         ;
@@ -907 +907 @@
         case_label_list fall_through
                 { $$ = $1->append_last_case( $2 ); }
-        | case_label_list statement_list fall_through_opt
+        | case_label_list statement_list_nodecl fall_through_opt
                 { $$ = $1->append_last_case( new StatementNode( build_compound( (StatementNode *)$2->set_last( $3 ) ) ) ); }
         | choose_clause_list case_label_list fall_through
                 { $$ = (StatementNode *)( $1->set_last( $2->append_last_case( $3 ))); }
-        | choose_clause_list case_label_list statement_list fall_through_opt
+        | choose_clause_list case_label_list statement_list_nodecl fall_through_opt
                 { $$ = (StatementNode *)( $1->set_last( $2->append_last_case( new StatementNode( build_compound( (StatementNode *)$3->set_last( $4 ) ) ) ) ) ); }
         ;