Changeset 206ecae for src/Parser

Timestamp:

Aug 12, 2024, 10:34:48 AM (2 days ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

master

Children:

8492b85

Parents:

43d9679

Message:

remove spurious push/pop from grammar contexts where type declarations are not allowed

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 10 09:47:05 2024
-// Update Count     : 6734
+// Last Modified On : Mon Aug 12 10:21:46 2024
+// Update Count     : 6737
 //
 
@@ -1849 +1849 @@
 
 handler_clause:
-        handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement
-                { $$ = new ClauseNode( build_catch( yylloc, $1, $4, $6, $8 ) ); }
-        | handler_clause handler_key '(' push exception_declaration pop handler_predicate_opt ')' compound_statement
-                { $$ = $1->set_last( new ClauseNode( build_catch( yylloc, $2, $5, $7, $9 ) ) ); }
+        handler_key '(' exception_declaration handler_predicate_opt ')' compound_statement
+                { $$ = new ClauseNode( build_catch( yylloc, $1, $3, $4, $6 ) ); }
+        | handler_clause handler_key '(' exception_declaration handler_predicate_opt ')' compound_statement
+                { $$ = $1->set_last( new ClauseNode( build_catch( yylloc, $2, $4, $5, $7 ) ) ); }
         ;
 
@@ -3157 +3157 @@
         '|' identifier_or_type_name '(' type_list ')'
                 { $$ = DeclarationNode::newTraitUse( $2, $4 ); }
-        | '|' '{' push trait_declaration_list pop '}'
-                { $$ = $4; }
+        | '|' '{' trait_declaration_list '}'
+                { $$ = $3; }
         // | '|' '(' push type_parameter_list pop ')' '{' push trait_declaration_list pop '}' '(' type_list ')'
         //      { SemanticError( yylloc, "Generic data-type assertion is currently unimplemented." ); $$ = nullptr; }
@@ -3210 +3210 @@
         | forall TRAIT identifier_or_type_name '{' '}'          // alternate
                 { $$ = DeclarationNode::newTrait( $3, $1, nullptr ); }
-        | TRAIT identifier_or_type_name '(' type_parameter_list ')' '{' push trait_declaration_list pop '}'
+        | TRAIT identifier_or_type_name '(' type_parameter_list ')' '{' trait_declaration_list '}'
                 {
                         SemanticWarning( yylloc, Warning::DeprecTraitSyntax );
-                        $$ = DeclarationNode::newTrait( $2, $4, $8 );
-                }
-        | forall TRAIT identifier_or_type_name '{' push trait_declaration_list pop '}' // alternate
-                { $$ = DeclarationNode::newTrait( $3, $1, $6 ); }
+                        $$ = DeclarationNode::newTrait( $2, $4, $7 );
+                }
+        | forall TRAIT identifier_or_type_name '{' trait_declaration_list '}' // alternate
+                { $$ = DeclarationNode::newTrait( $3, $1, $5 ); }
         ;
 
 trait_declaration_list:                                                                 // CFA
         trait_declaration
-        | trait_declaration_list pop push trait_declaration
-                { $$ = $1->set_last( $4 ); }
+        | trait_declaration_list trait_declaration
+                { $$ = $1->set_last( $2 ); }
         ;
 
@@ -3233 +3233 @@
         cfa_variable_specifier
         | cfa_function_specifier
-        | cfa_trait_declaring_list pop ',' push identifier_or_type_name
-                { $$ = $1->set_last( $1->cloneType( $5 ) ); }
+        | cfa_trait_declaring_list ',' identifier_or_type_name
+                { $$ = $1->set_last( $1->cloneType( $3 ) ); }
         ;
 
@@ -3240 +3240 @@
         type_specifier declarator
                 { $$ = $2->addType( $1 ); }
-        | trait_declaring_list pop ',' push declarator
-                { $$ = $1->set_last( $1->cloneBaseType( $5 ) ); }
+        | trait_declaring_list ',' declarator
+                { $$ = $1->set_last( $1->cloneBaseType( $3 ) ); }
         ;