Changeset 77de429

Timestamp:

Oct 19, 2022, 1:42:29 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master

Children:

72b5805e, e874605

Parents:

9511841

Message:

Fix overriding enum value

Files:

• src/AST/Decl.hpp (modified) (1 diff)
• src/Validate/LinkReferenceToTypes.cpp (modified) (2 diffs)
• tests/enum_tests/.expect/enumInlineValue.txt (modified) (1 diff)
• tests/enum_tests/enumInlineValue.cfa (modified) (1 diff)

src/AST/Decl.hpp

@@ -105 +105 @@
         ptr<Init> init;
         ptr<Expr> bitfieldWidth;
-        bool enumInLine = false; // A flag vairable to tell the compile:
-        // this is not a real object declaration. It is a place holder for 
-        // a set of enum value (ObjectDecl).
+        bool enumInLine = false; // enum inline is not a real object declaration. 
+        // It is a place holder for a set of enum value (ObjectDecl)
+        bool importValue = false; // if the value copied from somewhere else
 
         ObjectDecl( const CodeLocation & loc, const std::string & name, const Type * type,

src/Validate/LinkReferenceToTypes.cpp

@@ -209 +209 @@
                 if ( member->enumInLine ) {
                         auto targetEnum = symtab.lookupEnum( member->name );
-                        if (targetEnum) {                       
-                                for (auto singleMamber : targetEnum->members) {
+                        if ( targetEnum ) {                     
+                                for ( auto singleMamber : targetEnum->members ) {
                                         auto tm = singleMamber.as<ast::ObjectDecl>();
                                         auto t = new ast::ObjectDecl(
@@ -224 +224 @@
                                                 tm->funcSpec
                                         );
+                                        t->importValue = true;
                                         buffer.push_back(t);
                                 }
                         }
                 } else {
+                        auto search_it = std::find_if( buffer.begin(), buffer.end(), [member](ast::ptr<ast::Decl> cur) {
+                                auto curAsObjDecl = cur.as<ast::ObjectDecl>();
+                                return (curAsObjDecl->importValue) && (curAsObjDecl->name == member->name);
+                        });
+                        if ( search_it != buffer.end() ) {
+                                buffer.erase( search_it ); // Found an import enum value that has the same name
+                                // override the imported value
+                        }
                         buffer.push_back( *it );
                 }

tests/enum_tests/.expect/enumInlineValue.txt

@@ -1 +1 @@
 enumB.A is 5
-enumB.B is 6
+enumB.B is 10
 enumB.D is 11
 enumB.E is 12

tests/enum_tests/enumInlineValue.cfa

@@ -6 +6 @@
 enum enumB {
     inline enumA,
-    E, F
+    E, B=10
 };