Changeset 63be3387 for src/Parser/parser.yy

Timestamp:

Nov 14, 2022, 11:52:44 AM (3 years ago)

Author:

caparson <caparson@…>

Branches:

ADT, ast-experimental, master

Children:

7d9598d8

Parents:

b77f0e1 (diff), 19a8c40 (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 Oct 14 14:04:43 2022
-// Update Count     : 5751
+// Last Modified On : Wed Nov  2 21:31:21 2022
+// Update Count     : 5810
 //
 
@@ -278 +278 @@
 
 // Types declaration for productions
+
 %union {
         Token tok;
@@ -290 +291 @@
         CondCtl * ifctl;
         ForCtrl * fctl;
-        enum OperKinds compop;
+        OperKinds compop;
         LabelNode * label;
         InitializerNode * in;
@@ -296 +297 @@
         std::string * str;
         bool flag;
+        EnumHiding hide;
         CatchStmt::Kind catch_kind;
         GenericExpr * genexpr;
@@ -364 +366 @@
 %type<constant> string_literal
 %type<str> string_literal_list
+
+%type<hide> hide_opt                                    visible_hide_opt
 
 // expressions
@@ -2553 +2557 @@
         | ENUM attribute_list_opt identifier
                 { typedefTable.makeTypedef( *$3 ); }
-          '{' enumerator_list comma_opt '}'
-                { $$ = DeclarationNode::newEnum( $3, $6, true, false )->addQualifiers( $2 ); }
+          hide_opt '{' enumerator_list comma_opt '}'
+          { $$ = DeclarationNode::newEnum( $3, $7, true, false )->addQualifiers( $2 ); }
         | ENUM attribute_list_opt typedef_name                          // unqualified type name
-          '{' enumerator_list comma_opt '}'
-                { $$ = DeclarationNode::newEnum( $3->name, $5, true, false )->addQualifiers( $2 ); }
+          hide_opt '{' enumerator_list comma_opt '}'
+                { $$ = DeclarationNode::newEnum( $3->name, $6, true, false )->addQualifiers( $2 ); }
         | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt '{' enumerator_list comma_opt '}'
                 {
@@ -2574 +2578 @@
                         typedefTable.makeTypedef( *$6 );
                 }
-          '{' enumerator_list comma_opt '}'
-                {
-                        $$ = DeclarationNode::newEnum( $6, $10, true, true, $3 )->addQualifiers( $5 )->addQualifiers( $7 );
+          hide_opt '{' enumerator_list comma_opt '}'
+                {
+                        $$ = DeclarationNode::newEnum( $6, $11, true, true, $3 )->addQualifiers( $5 )->addQualifiers( $7 );
                 }
         | ENUM '(' ')' attribute_list_opt identifier attribute_list_opt
-          '{' enumerator_list comma_opt '}'
-                {
-                        $$ = DeclarationNode::newEnum( $5, $8, true, true, nullptr )->addQualifiers( $4 )->addQualifiers( $6 );
-                }
-        | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt typedef_name attribute_list_opt '{' enumerator_list comma_opt '}'
-                {
-                        $$ = DeclarationNode::newEnum( $6->name, $9, true, true, $3 )->addQualifiers( $5 )->addQualifiers( $7 );
-                }
-        | ENUM '(' ')' attribute_list_opt typedef_name attribute_list_opt '{' enumerator_list comma_opt '}'
-                {
-                        $$ = DeclarationNode::newEnum( $5->name, $8, true, true, nullptr )->addQualifiers( $4 )->addQualifiers( $6 );
+          hide_opt '{' enumerator_list comma_opt '}'
+                {
+                        $$ = DeclarationNode::newEnum( $5, $9, true, true, nullptr )->addQualifiers( $4 )->addQualifiers( $6 );
+                }
+        | ENUM '(' cfa_abstract_parameter_declaration ')' attribute_list_opt typedef_name attribute_list_opt
+          hide_opt '{' enumerator_list comma_opt '}'
+                {
+                        $$ = DeclarationNode::newEnum( $6->name, $10, true, true, $3 )->addQualifiers( $5 )->addQualifiers( $7 );
+                }
+        | ENUM '(' ')' attribute_list_opt typedef_name attribute_list_opt
+          hide_opt '{' enumerator_list comma_opt '}'
+                {
+                        $$ = DeclarationNode::newEnum( $5->name, $9, true, true, nullptr )->addQualifiers( $4 )->addQualifiers( $6 );
                 }
         | enum_type_nobody
+        ;
+
+hide_opt:
+        // empty
+                { $$ = EnumHiding::Visible; }
+        | '!'
+                { $$ = EnumHiding::Hide; }
         ;
 
@@ -2602 +2615 @@
 
 enumerator_list:
-        identifier_or_type_name enumerator_value_opt
-                { $$ = DeclarationNode::newEnumValueGeneric( $1, $2 ); }
+        visible_hide_opt identifier_or_type_name enumerator_value_opt
+                { $$ = DeclarationNode::newEnumValueGeneric( $2, $3 ); }
         | INLINE type_name
                 { $$ = DeclarationNode::newEnumInLine( *$2->type->symbolic.name ); }
-        | enumerator_list ',' identifier_or_type_name enumerator_value_opt
-                { $$ = $1->appendList( DeclarationNode::newEnumValueGeneric( $3, $4 ) ); }
+        | enumerator_list ',' visible_hide_opt identifier_or_type_name enumerator_value_opt
+                { $$ = $1->appendList( DeclarationNode::newEnumValueGeneric( $4, $5 ) ); }
         | enumerator_list ',' INLINE type_name enumerator_value_opt
                 { $$ = $1->appendList( DeclarationNode::newEnumValueGeneric( new string("inline"), nullptr ) ); }
+        ;
+
+visible_hide_opt:
+        hide_opt
+        | '^'
+                { $$ = EnumHiding::Visible; }
         ;