Changeset 7cf8006 for src

Timestamp:

Nov 2, 2022, 9:36:27 PM (18 months ago)

Author:

Peter A. Buhr <pabuhr@…>

Branches:

ADT, ast-experimental, master

Children:

f6aa89c

Parents:

e50d9cb8

Message:

add type to enum hiding productions

Location:

src/Parser

Files:

• ParseNode.h (modified) (2 diffs)
• parser.yy (modified) (9 diffs)

src/Parser/ParseNode.h

@@ -10 +10 @@
 // Created On       : Sat May 16 13:28:16 2015
 // Last Modified By : Peter A. Buhr
-// Last Modified On : Tue Oct 18 16:22:15 2022
-// Update Count     : 937
+// Last Modified On : Wed Nov  2 21:27:07 2022
+// Update Count     : 939
 //
 
@@ -168 +168 @@
         Ctor, Dtor,
 }; // OperKinds
+
+enum class EnumHiding { Visible, Hide };
 
 struct LabelNode {

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 28 15:27:08 2022
-// Update Count     : 5764
+// 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
@@ -2554 +2558 @@
                 { typedefTable.makeTypedef( *$3 ); }
           hide_opt '{' enumerator_list comma_opt '}'
-                { $$ = DeclarationNode::newEnum( $3, $7, true, false )->addQualifiers( $2 ); }
+          { $$ = DeclarationNode::newEnum( $3, $7, true, false )->addQualifiers( $2 ); }
         | ENUM attribute_list_opt typedef_name                          // unqualified type name
           hide_opt '{' enumerator_list comma_opt '}'
@@ -2598 +2602 @@
 hide_opt:
         // empty
+                { $$ = EnumHiding::Visible; }
         | '!'
+                { $$ = EnumHiding::Hide; }
         ;
 
@@ -2609 +2615 @@
 
 enumerator_list:
-        hide_visible_opt identifier_or_type_name enumerator_value_opt
+        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 ',' hide_visible_opt identifier_or_type_name enumerator_value_opt
+        | 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
@@ -2619 +2625 @@
         ;
 
-hide_visible_opt:
+visible_hide_opt:
         hide_opt
         | '^'
+                { $$ = EnumHiding::Visible; }
         ;