Changed NestedNameSpecifierAST to use ScopedSymbol

Signed-off-by: Roberto Raggi <[email protected]>

Author: robertoraggi

src/parser/cxx/ast.h

@@ -217,7 +217,7 @@ class MemInitializerAST : public AST {
 class NestedNameSpecifierAST : public AST {
  public:
   using AST::AST;
-  Symbol* symbol = nullptr;
+  ScopedSymbol* symbol = nullptr;
 };
 
 class NewInitializerAST : public AST {

src/parser/cxx/binder.cc

@@ -652,6 +652,32 @@ auto Binder::isConstructor(Symbol* symbol) const -> bool {
   return true;
 }
 
+auto Binder::resolveNestedNameSpecifier(Symbol* symbol) -> ScopedSymbol* {
+  if (auto classSymbol = symbol_cast<ClassSymbol>(symbol)) return classSymbol;
+
+  if (auto namespaceSymbol = symbol_cast<NamespaceSymbol>(symbol))
+    return namespaceSymbol;
+
+  if (auto enumSymbol = symbol_cast<EnumSymbol>(symbol)) return enumSymbol;
+
+  if (auto scopedEnumSymbol = symbol_cast<ScopedEnumSymbol>(symbol))
+    return scopedEnumSymbol;
+
+  if (auto typeAliasSymbol = symbol_cast<TypeAliasSymbol>(symbol)) {
+    if (auto classType = type_cast<ClassType>(typeAliasSymbol->type()))
+      return classType->symbol();
+
+    if (auto enumType = type_cast<EnumType>(typeAliasSymbol->type()))
+      return enumType->symbol();
+
+    if (auto scopedEnumType =
+            type_cast<ScopedEnumType>(typeAliasSymbol->type()))
+      return scopedEnumType->symbol();
+  }
+
+  return nullptr;
+}
+
 auto Binder::resolve(NestedNameSpecifierAST* nestedNameSpecifier,
                      UnqualifiedIdAST* unqualifiedId, bool canInstantiate)
     -> Symbol* {

src/parser/cxx/binder.h

@@ -136,6 +136,9 @@ class Binder {
                              UnqualifiedIdAST* unqualifiedId,
                              bool canInstantiate) -> Symbol*;
 
+  [[nodiscard]] auto resolveNestedNameSpecifier(Symbol* symbol)
+      -> ScopedSymbol*;
+
   class ScopeGuard {
    public:
     Binder* p = nullptr;

src/parser/cxx/parser.cc

@@ -972,7 +972,7 @@ auto Parser::parse_type_nested_name_specifier(NestedNameSpecifierAST*& yyast,
   ast->identifierLoc = identifierLoc;
   ast->identifier = identifier;
   ast->scopeLoc = scopeLoc;
-  ast->symbol = symbol;
+  ast->symbol = binder_.resolveNestedNameSpecifier(symbol);
 
   return true;
 }
@@ -1048,12 +1048,14 @@ auto Parser::parse_template_nested_name_specifier(
     }
 
     if (isReferencingPrimaryTemplate) {
-      ast->symbol = templateId->primaryTemplateSymbol;
+      ast->symbol =
+          binder_.resolveNestedNameSpecifier(templateId->primaryTemplateSymbol);
     }
   }
 
   if (!ast->symbol && config().checkTypes) {
-    ast->symbol = binder_.instantiate(templateId);
+    ast->symbol =
+        binder_.resolveNestedNameSpecifier(binder_.instantiate(templateId));
   }
 
   return true;