chore: Add views::members

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

Author: robertoraggi

src/lsp/cxx/lsp/cxx_document.cc

@@ -259,8 +259,7 @@ void CxxDocument::parse(std::string source) {
 
       if (auto classType = type_cast<ClassType>(objectType)) {
         auto classSymbol = classType->symbol();
-        for (auto member : classSymbol->scope()->symbols()) {
-          if (!member->name()) continue;
+        for (auto member : views::members(classSymbol)) {
           auto item = d->completionItems.emplace_back();
           item.label(to_string(member->name()));
         }

src/parser/cxx/scope.h

@@ -106,6 +106,18 @@ constexpr auto functions = std::views::filter(&Symbol::isFunction) |
 constexpr auto variables = std::views::filter(&Symbol::isVariable) |
                            std::views::transform(symbol_cast<VariableSymbol>);
 
+inline auto members(Scope* scope) { return std::views::all(scope->symbols()); }
+
+inline auto members(ScopedSymbol* symbol) {
+  return std::views::all(symbol->scope()->symbols());
+}
+
+inline auto find(Scope* scope, const Name* name) {
+  return scope ? scope->find(name) : SymbolChainView{nullptr};
+}
+
+constexpr auto named_symbol = std::views::filter(&Symbol::name);
+
 }  // namespace views
 
 }  // namespace cxx

src/parser/cxx/symbol_instantiation.cc

@@ -229,7 +229,7 @@ auto SymbolInstantiation::VisitSymbol::operator()(ClassSymbol* symbol)
     auto newCtor = self.instantiate(ctor);
     newSymbol->addConstructor(newCtor);
   }
-  for (auto member : symbol->scope()->symbols()) {
+  for (auto member : views::members(symbol)) {
     auto newMember = self.instantiate(member);
     newSymbol->addMember(newMember);
   }
@@ -239,7 +239,7 @@ auto SymbolInstantiation::VisitSymbol::operator()(ClassSymbol* symbol)
 auto SymbolInstantiation::VisitSymbol::operator()(EnumSymbol* symbol)
     -> Symbol* {
   auto newSymbol = self.replacement(symbol);
-  for (auto member : symbol->scope()->symbols()) {
+  for (auto member : views::members(symbol)) {
     auto newMember = self.instantiate(member);
     newSymbol->addMember(newMember);
   }
@@ -249,7 +249,7 @@ auto SymbolInstantiation::VisitSymbol::operator()(EnumSymbol* symbol)
 auto SymbolInstantiation::VisitSymbol::operator()(ScopedEnumSymbol* symbol)
     -> Symbol* {
   auto newSymbol = self.replacement(symbol);
-  for (auto member : symbol->scope()->symbols()) {
+  for (auto member : views::members(symbol)) {
     auto newMember = self.instantiate(member);
     newSymbol->addMember(newMember);
   }
@@ -259,7 +259,7 @@ auto SymbolInstantiation::VisitSymbol::operator()(ScopedEnumSymbol* symbol)
 auto SymbolInstantiation::VisitSymbol::operator()(FunctionSymbol* symbol)
     -> Symbol* {
   auto newSymbol = self.replacement(symbol);
-  for (auto member : symbol->scope()->symbols()) {
+  for (auto member : views::members(symbol)) {
     if (member->isBlock()) continue;
     auto newMember = self.instantiate(member);
     newSymbol->addMember(newMember);
@@ -300,7 +300,7 @@ auto SymbolInstantiation::VisitSymbol::operator()(EnumeratorSymbol* symbol)
 auto SymbolInstantiation::VisitSymbol::operator()(
     FunctionParametersSymbol* symbol) -> Symbol* {
   auto newSymbol = self.replacement(symbol);
-  for (auto member : symbol->scope()->symbols()) {
+  for (auto member : views::members(symbol)) {
     if (member->isBlock()) continue;
     auto newMember = self.instantiate(member);
     newSymbol->addMember(newMember);
@@ -311,7 +311,7 @@ auto SymbolInstantiation::VisitSymbol::operator()(
 auto SymbolInstantiation::VisitSymbol::operator()(
     TemplateParametersSymbol* symbol) -> Symbol* {
   auto newSymbol = self.replacement(symbol);
-  for (auto member : symbol->scope()->symbols()) {
+  for (auto member : views::members(symbol)) {
     auto newMember = self.instantiate(member);
     newSymbol->addMember(newMember);
   }