Changeset 4520b77e for src/SymTab

Timestamp:

Sep 20, 2022, 8:37:05 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master, pthread-emulation

Children:

a065f1f

Parents:

d489da8 (diff), 12df6fe (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge to Master Sept 19

Location:

src/SymTab

Files:

• Mangler.cc (modified) (4 diffs)
• Validate.cc (modified) (1 diff)
• ValidateType.cc (modified) (2 diffs)

src/SymTab/Mangler.cc

@@ -65 +65 @@
                                 void postvisit( const QualifiedType * qualType );
 
+                                void postvisit( const QualifiedNameExpr * qualNameExpr );
+
                                 std::string get_mangleName() { return mangleName; }
                           private:
@@ -305 +307 @@
                                         mangleName += Encoding::qualifiedTypeEnd;
                                 }
+                        }
+
+                        void Mangler_old::postvisit( const QualifiedNameExpr * qual ) {
+                                maybeAccept( qual->var, *visitor );
                         }
 
@@ -417 +423 @@
                         void postvisit( const ast::OneType * oneType );
                         void postvisit( const ast::QualifiedType * qualType );
+                        void postvisit( const ast::QualifiedNameExpr * qualNameExpr );
 
                         std::string get_mangleName() { return mangleName; }
@@ -645 +652 @@
                                 mangleName += Encoding::qualifiedTypeEnd;
                         }
+                }
+                void Mangler_new::postvisit( const ast::QualifiedNameExpr * qual ) {
+                        maybeAccept( qual->var.get(), *visitor );
                 }
 

src/SymTab/Validate.cc

@@ -857 +857 @@
                 } else if ( UnionInstType * aggDecl = dynamic_cast< UnionInstType * >( designatorType ) ) {
                         declsToAddBefore.push_back( new UnionDecl( aggDecl->name, noAttributes, tyDecl->linkage ) );
-                } else if ( EnumInstType * enumDecl = dynamic_cast< EnumInstType * >( designatorType ) ) {
+                } else if ( EnumInstType * enumInst = dynamic_cast< EnumInstType * >( designatorType ) ) {
                         // declsToAddBefore.push_back( new EnumDecl( enumDecl->name, noAttributes, tyDecl->linkage, enumDecl->baseEnum->base ) );
-                        if (enumDecl->baseEnum) {
-                                declsToAddBefore.push_back( new EnumDecl( enumDecl->name, noAttributes, tyDecl->linkage, enumDecl->baseEnum->base ) );
+                        if ( enumInst->baseEnum ) {
+                                const EnumDecl * enumDecl = enumInst->baseEnum;
+                                declsToAddBefore.push_back( new EnumDecl( enumDecl->name, noAttributes, enumDecl->isTyped, tyDecl->linkage, enumDecl->base ) );
                         } else {
-                                declsToAddBefore.push_back( new EnumDecl( enumDecl->name, noAttributes, tyDecl->linkage ) );
+                                declsToAddBefore.push_back( new EnumDecl( enumInst->name, noAttributes, tyDecl->linkage ) );
                         }
                 } // if

src/SymTab/ValidateType.cc

@@ -82 +82 @@
         void postvisit( QualifiedType * qualType );
 
+        void postvisit( QualifiedNameExpr * qualExpr );
+
         void postvisit( EnumDecl * enumDecl );
         void postvisit( StructDecl * structDecl );
@@ -157 +159 @@
         // linking only makes sense for the 'oldest ancestor' of the qualified type
         qualType->parent->accept( * visitor );
+}
+
+void LinkReferenceToTypes_old::postvisit( QualifiedNameExpr * qualExpr ) {
+        const EnumDecl * st = local_indexer->lookupEnum( qualExpr->type_decl->name );
+        qualExpr->type_decl = const_cast<EnumDecl *>(st);
 }