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

Support parsing namespace declarations (#2563)

Browse Source 
Initial support for parsing namespace declarations and referring to namespace names. No support for declaring members of namespaces yet.
This commit is contained in:
Richard Smith
2023-01-30 17:25:44 -08:00
committed by GitHub
parent a7916c57fe
commit 60af531f5b
22 changed files with 214 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
explorer/ast/static_scope.cpp
+5 -5
View File
@@ -11,7 +11,7 @@
namespace Carbon {
auto StaticScope::Add(const std::string& name, ValueNodeView entity,
auto StaticScope::Add(std::string_view name, ValueNodeView entity,
NameStatus status) -> ErrorOr<Success> {
auto [it, inserted] = declared_names_.insert({name, {entity, status}});
if (!inserted) {
@@ -27,7 +27,7 @@ auto StaticScope::Add(const std::string& name, ValueNodeView entity,
return Success();
}
void StaticScope::MarkDeclared(const std::string& name) {
void StaticScope::MarkDeclared(std::string_view name) {
auto it = declared_names_.find(name);
CARBON_CHECK(it != declared_names_.end()) << name << " not found";
if (it->second.status == NameStatus::KnownButNotDeclared) {
@@ -35,13 +35,13 @@ void StaticScope::MarkDeclared(const std::string& name) {
}
}
void StaticScope::MarkUsable(const std::string& name) {
void StaticScope::MarkUsable(std::string_view name) {
auto it = declared_names_.find(name);
CARBON_CHECK(it != declared_names_.end()) << name << " not found";
it->second.status = NameStatus::Usable;
}
auto StaticScope::Resolve(const std::string& name,
auto StaticScope::Resolve(std::string_view name,
SourceLocation source_loc) const
-> ErrorOr<ValueNodeView> {
CARBON_ASSIGN_OR_RETURN(std::optional<ValueNodeView> result,
@@ -52,7 +52,7 @@ auto StaticScope::Resolve(const std::string& name,
return *result;
}
auto StaticScope::TryResolve(const std::string& name,
auto StaticScope::TryResolve(std::string_view name,
SourceLocation source_loc) const
-> ErrorOr<std::optional<ValueNodeView>> {
for (const StaticScope* scope = this; scope;