Changeset 77de429 for src/Validate

Timestamp:

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

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master

Children:

72b5805e, e874605

Parents:

9511841

Message:

Fix overriding enum value

File:

• src/Validate/LinkReferenceToTypes.cpp (modified) (2 diffs)

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 );
                 }