Changeset 12f1156

Timestamp:

Jun 11, 2024, 9:42:39 PM (4 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

5144898

Parents:

2ab31fd

Message:

simplify grammar in a few places

File:

• src/Parser/parser.yy (modified) (10 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 : Tue Jun 11 16:56:42 2024
-// Update Count     : 6638
+// Last Modified On : Tue Jun 11 21:32:15 2024
+// Update Count     : 6641
 //
 
@@ -387 +387 @@
 // names and constants: lexer differentiates between identifier and typedef names
 %token<tok> IDENTIFIER          TYPEDIMname             TYPEDEFname             TYPEGENname
-%token<tok> TIMEOUT                     WAND    WOR                     CATCH                   RECOVER                 CATCHRESUME             FIXUP           FINALLY         // CFA
+%token<tok> TIMEOUT                     WAND    WOR             CATCH                   RECOVER                 CATCHRESUME             FIXUP           FINALLY         // CFA
 %token<tok> INTEGERconstant     CHARACTERconstant       STRINGliteral
 %token<tok> DIRECTIVE
@@ -493 +493 @@
 %type<decl> exception_declaration
 
-%type<decl> field_declaration_list_opt field_declaration field_declaring_list_opt field_declaring_list field_declarator field_abstract_list_opt field_abstract
+%type<decl> field_declaration_list_opt field_declaration field_declaring_list_opt field_declarator field_abstract_list_opt field_abstract
 %type<expr> field field_name_list field_name fraction_constants_opt
 
@@ -678 +678 @@
         | '@'                                                                                           // CFA
                 { Token tok = { new string( DeclarationNode::anonymous.newName() ), yylval.tok.loc }; $$ = tok; }
+        ;
+
+identifier_or_type_name:
+        identifier
+        | TYPEDEFname
+        | TYPEGENname
         ;
 
@@ -811 +817 @@
                 //       z.E;  // lexer returns E is TYPEDEFname
                 //   }
-        | postfix_expression '.' identifier
-                { $$ = new ExpressionNode( build_fieldSel( yylloc, $1, build_varref( yylloc, $3 ) ) ); }
-        | postfix_expression '.' TYPEDEFname                            // CFA, SKULLDUGGERY
-                { $$ = new ExpressionNode( build_fieldSel( yylloc, $1, build_varref( yylloc, $3 ) ) ); }
-        | postfix_expression '.' TYPEGENname                            // CFA, SKULLDUGGERY
+        | postfix_expression '.' identifier_or_type_name
                 { $$ = new ExpressionNode( build_fieldSel( yylloc, $1, build_varref( yylloc, $3 ) ) ); }
 
@@ -1613 +1615 @@
 enum_key:
         TYPEDEFname
-        | ENUM TYPEDEFname
+        | ENUM identifier_or_type_name
         ;
 
@@ -2692 +2694 @@
         // empty
                 { $$ = nullptr; }
-        | field_declaring_list
-        ;
-
-field_declaring_list:
-        field_declarator
-        | field_declaring_list ',' attribute_list_opt field_declarator
+        | field_declarator
+        | field_declaring_list_opt ',' attribute_list_opt field_declarator
                 { $$ = $1->set_last( $4->addQualifiers( $3 ) ); }
         ;
@@ -2961 +2959 @@
         ;
 
-identifier_or_type_name:
-        identifier
-        | TYPEDEFname
-        | TYPEGENname
-        ;
-
 type_no_function:                                                                               // sizeof, alignof, cast (constructor)
         cfa_abstract_declarator_tuple                                           // CFA
@@ -3230 +3222 @@
         // empty, input file
         | external_definition_list
-                { parseTree = parseTree ? parseTree->set_last( $1 ) : $1;       }
+                { parseTree = parseTree ? parseTree->set_last( $1 ) : $1; }
         ;
 
@@ -3488 +3480 @@
 
 attr_name:                                                                                              // GCC
-        IDENTIFIER
-        | quasi_keyword
-        | TYPEDEFname
-        | TYPEGENname
+        identifier_or_type_name
         | FALLTHROUGH
                 { $$ = Token{ new string( "fallthrough" ), { nullptr, -1 } }; }