Changeset 5408b59 for src/Validate

Timestamp:

Oct 18, 2022, 9:12:19 PM (19 months ago)

Author:

JiadaL <j82liang@…>

Branches:

ADT, ast-experimental, master

Children:

c2b3243

Parents:

1e30df7

Message:

Remove var in QualifiedNameExpr?

Location:

src/Validate

Files:

• FixQualifiedTypes.cpp (modified) (1 diff)
• LinkReferenceToTypes.cpp (modified) (2 diffs)

src/Validate/FixQualifiedTypes.cpp

@@ -102 +102 @@
                         }
 
-
-                auto var = new ast::ObjectDecl( t->var->location, t->name,
-                         new ast::EnumInstType(enumDecl, ast::CV::Const), nullptr, {}, ast::Linkage::Cforall );
-                        var->scopeLevel = 1; // 1 for now; should copy the scopeLevel of the enumValue
+                auto var = new ast::ObjectDecl( t->location, t->name,
+                        new ast::EnumInstType(enumDecl, ast::CV::Const), nullptr, {}, ast::Linkage::Cforall );
                         var->mangleName = Mangle::mangle( var );
                         return new ast::VariableExpr( t->location, var );
-                // return ret;
         }
 

src/Validate/LinkReferenceToTypes.cpp

@@ -44 +44 @@
         void postvisit( ast::UnionDecl const * decl );
         ast::TraitDecl const * postvisit( ast::TraitDecl const * decl );
-        ast::QualifiedNameExpr const * previsit( ast::QualifiedNameExpr const * decl);
 
 private:
@@ -316 +315 @@
 }
 
-ast::QualifiedNameExpr const * LinkTypesCore::previsit( ast::QualifiedNameExpr const * decl ) {
-        // Try to lookup type
-        if ( auto objDecl = decl->type_decl.as<ast::ObjectDecl>() ) {
-                if ( auto inst = objDecl->type.as<ast::TypeInstType>()) {
-                        if ( auto enumDecl = symtab.lookupEnum ( inst->name ) ) {
-                                auto mut = ast::mutate( decl );
-                                mut->type_decl = enumDecl;
-                                auto enumInst = new ast::EnumInstType( enumDecl );
-                                enumInst->name = decl->name;
-                                // Adding result; addCandidate() use result
-                                mut->result = enumInst;
-                                decl = mut;
-                        }
-                }
-        } else if ( auto enumDecl = decl->type_decl.as<ast::EnumDecl>() ) {
-                auto mut = ast::mutate( decl );
-                auto enumInst = new ast::EnumInstType( enumDecl );
-                enumInst->name = decl->name;
-                // Adding result; addCandidate() use result
-                mut->result = enumInst;
-                decl = mut;
-        }
-        // ast::EnumDecl const * decl = symtab.lookupEnum( type->name );
-        // // It's not a semantic error if the enum is not found, just an implicit forward declaration.
-        // if ( decl ) {
-        //      // Just linking in the node.
-        //      auto mut = ast::mutate( type );
-        //      mut->base = const_cast<ast::EnumDecl *>( decl );
-        //      type = mut;
-        // }
-        return decl;
-}
-
 } // namespace