Changeset 85855b0 for src/Parser

Timestamp:

Jun 10, 2024, 2:43:13 AM (4 weeks ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

42cdd07d

Parents:

d68de59

Message:

1. Implement enum cast; 2. Change valueE so that opague enum returns quasi_void; 3. change enum hiding interpretation and pass visiting scheme

Location:

src/Parser

Files:

• TypeData.cpp (modified) (2 diffs)
• parser.yy (modified) (1 diff)

src/Parser/TypeData.cpp

@@ -1465 +1465 @@
         ret->hide = td->aggregate.hiding == EnumHiding::Hide ? ast::EnumDecl::EnumHiding::Hide : ast::EnumDecl::EnumHiding::Visible;
         for ( const DeclarationNode * cur = td->aggregate.fields ; cur != nullptr ; cur = cur->next, ++members ) {
-                if ( cur->enumInLine ) {
-                        // Do Nothing
-                } else if ( ret->isTyped && !ret->base && cur->has_enumeratorValue() ) {
+                if (cur->enumInLine) continue;
+                ast::Decl * member = members->get_and_mutate();
+                ast::ObjectDecl * object = strict_dynamic_cast<ast::ObjectDecl *>( member );
+                object->isHidden = ast::EnumDecl::EnumHiding::Hide == ret->hide;
+                if ( ret->isTyped && !ret->base && cur->has_enumeratorValue() ) {
                         SemanticError( td->location, "Enumerator of enum(void) cannot have an explicit initializer value." );
                 } else if ( cur->has_enumeratorValue() ) {
-                        ast::Decl * member = members->get_and_mutate();
-                        ast::ObjectDecl * object = strict_dynamic_cast<ast::ObjectDecl *>( member );
                         object->init = new ast::SingleInit(
                                 td->location,
@@ -1477 +1477 @@
                                 ast::NoConstruct
                         );
-                } else if ( !cur->initializer ) {
-                        if ( baseType && (!dynamic_cast<ast::BasicType *>(baseType) || !dynamic_cast<ast::BasicType *>(baseType)->isInteger())) {
-                                SemanticError( td->location, "Enumerators of an non-integer typed enum must be explicitly initialized." );
-                        }
-                }
+                } 
                 // else cur is a List Initializer and has been set as init in buildList()
                 // if

src/Parser/parser.yy

@@ -2827 +2827 @@
         | enumerator_list ',' visible_hide_opt identifier_or_type_name enumerator_value_opt
                 { $$ = $1->set_last( DeclarationNode::newEnumValueGeneric( $4, $5 ) ); }
-        | enumerator_list ',' INLINE type_name enumerator_value_opt
-                { $$ = $1->set_last( DeclarationNode::newEnumValueGeneric( new string("inline"), nullptr ) ); }
+        | enumerator_list ',' INLINE type_name
+                { $$ = $1->set_last( DeclarationNode::newEnumInLine( $4->symbolic.name )  ); }
         ;