Changeset d1f5054 for src/Parser/parser.yy

Timestamp:

Aug 14, 2024, 11:55:20 AM (17 months ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

960665c

Parents:

26d40a1 (diff), 2870cb6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' of plg.uwaterloo.ca:software/cfa/cfa-cc

File:

• src/Parser/parser.yy (modified) (8 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 Jul 26 14:09:30 2024
-// Update Count     : 6733
+// Last Modified On : Tue Aug 13 11:25:16 2024
+// Update Count     : 6740
 //
 
@@ -952 +952 @@
                 }
         | COUNTOF unary_expression
-                {  $$ = new ExpressionNode( new ast::CountExpr( yylloc, maybeMoveBuild( $2 ) ) ); }
+                { $$ = new ExpressionNode( new ast::CountExpr( yylloc, maybeMoveBuild( $2 ) ) ); }
         | COUNTOF '(' type_no_function ')'
                 { $$ = new ExpressionNode( new ast::CountExpr( yylloc, maybeMoveBuildType( $3 ) ) ); }
@@ -1626 +1626 @@
 enum_key:
         type_name
-                {       typedefTable.makeTypedef( *$1->symbolic.name, "enum_type_nobody 1" );
-                        $$ = DeclarationNode::newEnum( $1->symbolic.name, nullptr, false, false ); }
+                {
+                        typedefTable.makeTypedef( *$1->symbolic.name, "enum_type_nobody 1" );
+                        $$ = DeclarationNode::newEnum( $1->symbolic.name, nullptr, false, false );
+                }
         | ENUM identifier
-                {       typedefTable.makeTypedef( *$2, "enum_type_nobody 2" );
-                        $$ = DeclarationNode::newEnum( $2, nullptr, false, false ); }
+                {
+                        typedefTable.makeTypedef( *$2, "enum_type_nobody 2" );
+                        $$ = DeclarationNode::newEnum( $2, nullptr, false, false );
+                }
         | ENUM type_name
-                {       typedefTable.makeTypedef( *$2->symbolic.name, "enum_type_nobody 3" );
-                        $$ = DeclarationNode::newEnum( $2->symbolic.name, nullptr, false, false ); }
+                {
+                        typedefTable.makeTypedef( *$2->symbolic.name, "enum_type_nobody 3" );
+                        $$ = DeclarationNode::newEnum( $2->symbolic.name, nullptr, false, false );
+                }
         ;
 
@@ -1849 +1855 @@
 
 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 ) ) ); }
         ;
 
@@ -2850 +2856 @@
 
 enumerator_list:
-        visible_hide_opt identifier_or_type_name enumerator_value_opt
+        // empty
+                { SemanticError( yylloc, "enumeration must have a minimum of one enumerator, empty enumerator list is meaningless." );  $$ = nullptr; }
+        | visible_hide_opt identifier_or_type_name enumerator_value_opt
                 { $$ = DeclarationNode::newEnumValueGeneric( $2, $3 ); }
         | INLINE type_name
@@ -3155 +3163 @@
         '|' 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; }
@@ -3208 +3216 @@
         | 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 ); }
         ;
 
@@ -3231 +3239 @@
         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 ) ); }
         ;
 
 trait_declaring_list:                                                                   // CFA
-        type_specifier declarator
+                // Cannot declare an aggregate or enumeration in a trait.
+        type_specifier_nobody 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 ) ); }
+        | error
+                { SemanticError( yylloc, "Possible cause is declaring an aggregate or enumeration type in a trait." ); $$ = nullptr; }
         ;