Changeset 2a301ff for src/Validate/FixQualifiedTypes.cpp

Timestamp:

Aug 31, 2023, 11:31:15 PM (2 years ago)

Author:

JiadaL <j82liang@…>

Branches:

master

Children:

950c58e

Parents:

92355883 (diff), 686912c (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:

Resolve conflict

File:

• src/Validate/FixQualifiedTypes.cpp (modified) (1 diff)

src/Validate/FixQualifiedTypes.cpp

@@ -89 +89 @@
         }
 
-        ast::Expr const * postvisit( ast::QualifiedNameExpr const * t) {
+        ast::Expr const * postvisit( ast::QualifiedNameExpr const * t ) {
                 assert( location );
-                if ( t->type_decl ) {
-                auto enumName = t->type_decl->name;
-                const ast::EnumDecl * enumDecl = symtab.lookupEnum( enumName );
-                        for ( ast::ptr<ast::Decl> const & member : enumDecl->members ) {
-                                if ( auto memberAsObj = member.as<ast::ObjectDecl>() ) {
-                                        if ( memberAsObj->name == t->name ) {
-                                                return new ast::VariableExpr( t->location, memberAsObj );
-                                        }
-                                } else {
-                                        assertf( false, "unhandled qualified child type");
+                if ( !t->type_decl ) return t;
+
+                auto enumName = t->type_decl->name;
+                const ast::EnumDecl * enumDecl = symtab.lookupEnum( enumName );
+                for ( ast::ptr<ast::Decl> const & member : enumDecl->members ) {
+                        if ( auto memberAsObj = member.as<ast::ObjectDecl>() ) {
+                                if ( memberAsObj->name == t->name ) {
+                                        return new ast::VariableExpr( t->location, memberAsObj );
                                 }
+                        } else {
+                                assertf( false, "unhandled qualified child type" );
                         }
+                }
 
-                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 t;
+                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 );
         }