carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-04 22:02:52 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Improve diagnostic for unknown name in name qualifier. (#2579)

Browse Source 
As requested in #2572.
This commit is contained in:
Richard Smith
2023-02-03 16:05:08 -08:00
committed by GitHub
parent 6d4920148b
commit 1a8a41a5a6
5 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
explorer/ast/static_scope.cpp
+10 -3
View File
@@ -52,14 +52,21 @@ auto StaticScope::Resolve(std::string_view name,
return *result;
}
auto StaticScope::ResolveHere(std::string_view name, SourceLocation source_loc,
auto StaticScope::ResolveHere(std::optional<ValueNodeView> this_scope,
std::string_view name, SourceLocation source_loc,
bool allow_undeclared) const
-> ErrorOr<ValueNodeView> {
CARBON_ASSIGN_OR_RETURN(std::optional<ValueNodeView> result,
TryResolveHere(name, source_loc, allow_undeclared));
if (!result) {
return ProgramError(source_loc)
<< "could not resolve '" << name << "' in this scope";
if (this_scope) {
return ProgramError(source_loc)
<< "name '" << name << "' has not been declared in "
<< PrintAsID(this_scope->base());
} else {
return ProgramError(source_loc)
<< "name '" << name << "' has not been declared in this scope";
}
}
return *result;
}