Changes in src/SymTab/Validate.cc [298fe57:9e7236f4]

File:

• src/SymTab/Validate.cc (modified) (5 diffs)

src/SymTab/Validate.cc

@@ -10 +10 @@
 // Created On       : Sun May 17 21:50:04 2015
 // Last Modified By : Andrew Beach
-// Last Modified On : Fri Apr 29  9:45:00 2022
-// Update Count     : 365
+// Last Modified On : Fri Nov 12 11:00:00 2021
+// Update Count     : 364
 //
 
@@ -143 +143 @@
         struct LinkReferenceToTypes_old final : public WithIndexer, public WithGuards, public WithVisitorRef<LinkReferenceToTypes_old>, public WithShortCircuiting {
                 LinkReferenceToTypes_old( const Indexer * indexer );
-
                 void postvisit( TypeInstType * typeInst );
 
@@ -371 +370 @@
         }
 
-        void linkReferenceToTypes( std::list< Declaration * > & translationUnit ) {
+        void validate_B( std::list< Declaration * > & translationUnit ) {
                 PassVisitor<LinkReferenceToTypes_old> lrt( nullptr );
-                acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
-        }
-
-        void validate_B( std::list< Declaration * > & translationUnit ) {
                 PassVisitor<FixQualifiedTypes> fixQual;
                 {
                         Stats::Heap::newPass("validate-B");
                         Stats::Time::BlockGuard guard("validate-B");
-                        //linkReferenceToTypes( translationUnit );
+                        acceptAll( translationUnit, lrt ); // must happen before autogen, because sized flag needs to propagate to generated functions
                         mutateAll( translationUnit, fixQual ); // must happen after LinkReferenceToTypes_old, because aggregate members are accessed
                         HoistStruct::hoistStruct( translationUnit );
@@ -765 +760 @@
                 } // if
         }
-
         void LinkReferenceToTypes_old::postvisit( StructInstType * structInst ) {
                 const StructDecl * st = local_indexer->lookupStruct( structInst->name );
@@ -891 +885 @@
         void LinkReferenceToTypes_old::postvisit( EnumDecl * enumDecl ) {
                 // visit enum members first so that the types of self-referencing members are updated properly
+                // Replace the enum base; right now it works only for StructEnum
+                if ( enumDecl->base && dynamic_cast<TypeInstType*>(enumDecl->base) ) {
+                        std::string baseName = static_cast<TypeInstType*>(enumDecl->base)->name;
+                        const StructDecl * st = local_indexer->lookupStruct( baseName );
+                        if ( st ) {
+                                enumDecl->base = new StructInstType(Type::Qualifiers(),const_cast<StructDecl *>(st)); // Just linking in the node
+                        }
+                }
                 if ( enumDecl->body ) {
                         ForwardEnumsType::iterator fwds = forwardEnums.find( enumDecl->name );