Changeset 73f04fd

Timestamp:

Jan 26, 2021, 11:55:56 AM (3 years ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, arm-eh, ast-experimental, enum, forall-pointer-decay, jacob/cs343-translation, master, new-ast-unique-expr, pthread-emulation, qualifiedEnum

Children:

352cbc2

Parents:

667b3c7

Message:

remove temporary token "fred" from grammar, add comments for enumeration rules

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 : Mon Jan 25 21:41:56 2021
-// Update Count     : 4670
+// Last Modified On : Tue Jan 26 11:18:19 2021
+// Update Count     : 4674
 //
 
@@ -2014 +2014 @@
         ;
 
-fred:
-        // empty
-                { yyy = false; }
-        ;
-
 aggregate_type:                                                                                 // struct, union
         aggregate_key attribute_list_opt
@@ -2024 +2019 @@
           '{' field_declaration_list_opt '}' type_parameters_opt
                 { $$ = DeclarationNode::newAggregate( $1, nullptr, $7, $5, true )->addQualifiers( $2 ); }
-        | aggregate_key attribute_list_opt identifier fred
+        | aggregate_key attribute_list_opt identifier
                 {
                         typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname ); // create typedef
@@ -2030 +2025 @@
                 }
           '{' field_declaration_list_opt '}' type_parameters_opt
-                { $$ = DeclarationNode::newAggregate( $1, $3, $9, $7, true )->addQualifiers( $2 ); }
-        | aggregate_key attribute_list_opt type_name fred
+                { $$ = DeclarationNode::newAggregate( $1, $3, $8, $6, true )->addQualifiers( $2 ); }
+        | aggregate_key attribute_list_opt type_name
                 {
                         // for type_name can be a qualified type name S.T, in which case only the last name in the chain needs a typedef (other names in the chain should already have one)
@@ -2038 +2033 @@
                 }
           '{' field_declaration_list_opt '}' type_parameters_opt
-                { $$ = DeclarationNode::newAggregate( $1, $3->type->symbolic.name, $9, $7, true )->addQualifiers( $2 ); }
+                { $$ = DeclarationNode::newAggregate( $1, $3->type->symbolic.name, $8, $6, true )->addQualifiers( $2 ); }
         | aggregate_type_nobody
         ;
@@ -2050 +2045 @@
 
 aggregate_type_nobody:                                                                  // struct, union - {...}
-        aggregate_key attribute_list_opt identifier fred
+        aggregate_key attribute_list_opt identifier
                 {
                         typedefTable.makeTypedef( *$3, forall || typedefTable.getEnclForall() ? TYPEGENname : TYPEDEFname );
@@ -2056 +2051 @@
                         $$ = DeclarationNode::newAggregate( $1, $3, nullptr, nullptr, false )->addQualifiers( $2 );
                 }
-        | aggregate_key attribute_list_opt type_name fred
+        | aggregate_key attribute_list_opt type_name
                 {
                         forall = false;                                                         // reset
@@ -2194 +2189 @@
         ;
 
-// Cannot use attribute_list_opt because of ambiguity with enum_specifier_nobody, which already parses attributes.
+// Cannot use attribute_list_opt because of ambiguity with enum_specifier_nobody, which already parses attribute.
+// Hence, only a single attribute is allowed after the "ENUM".
 enum_type:                                                                                              // enum
         ENUM attribute_opt '{' enumerator_list comma_opt '}'
@@ -2202 +2198 @@
           '{' enumerator_list comma_opt '}'
                 { $$ = DeclarationNode::newEnum( $3, $6, true )->addQualifiers( $2 ); }
-        | ENUM attribute_opt typedef
+        | ENUM attribute_opt typedef                                            // enum cannot be generic
           '{' enumerator_list comma_opt '}'
                 { $$ = DeclarationNode::newEnum( $3->name, $5, true )->addQualifiers( $2 ); }
@@ -2223 +2219 @@
                         $$ = DeclarationNode::newEnum( $3, 0, false )->addQualifiers( $2 );
                 }
-        | ENUM attribute_opt type_name
+        | ENUM attribute_opt type_name                                          // enum cannot be generic
                 {
                         typedefTable.makeTypedef( *$3->type->symbolic.name );