mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-30 12:25:03 +01:00
Jon Meow
af694b97cb
I'm doing this to avoid macro name conflicts, following https://google.github.io/styleguide/cppguide.html#Preprocessor_Macros: "If you do export a macro from a header, it must have a globally unique name. To achieve this, it must be named with a prefix consisting of your project's namespace name (but upper case)." Commands run: ``` sed -i 's/\(DCHECK\|CHECK\|FATAL\|MAKE_UNIQUE_NAME\|MAKE_UNIQUE_NAME_IMPL\|RAW_EXITING_STREAM\|RETURN_IF_ERROR\|RETURN_IF_ERROR_IMPL\|ASSIGN_OR_RETURN\|ASSIGN_OR_RETURN_IMPL\|DIAGNOSTIC_KIND\|RETURN_IF_STACK_LIMITED\)(/CARBON_\1(/g' $(git ls-files *.cpp *.h *.lpp *.ypp *.def ':!third_party') sed -i 's/#undef DIAGNOSTIC_KIND/#undef CARBON_DIAGNOSTIC_KIND/' toolchain/diagnostics/diagnostic_registry.def ``` Note this isn't *quite* everything, but it's intended to be a large pass at everything: ``` ╚╡git grep '#define ' *.cpp *.h *.lpp *.ypp *.def ':!third_party' | grep -v '#define CARBON' | grep -v _H_ explorer/syntax/lexer.lpp: #define YY_USER_ACTION \ explorer/syntax/lexer.lpp: #define SIMPLE_TOKEN(name) \ explorer/syntax/lexer.lpp: #define ARG_TOKEN(name, arg) \ explorer/syntax/parse_and_lex_context.h:#define YY_DECL \ migrate_cpp/cpp_refactoring/var_decl.cpp:#define ABSTRACT_TYPE(Class, Base) migrate_cpp/cpp_refactoring/var_decl.cpp:#define TYPE(Class, Base) \ ``` We may in particular want to do a pass to clean up #ifdef guards and make them be CARBON_ rooted.
58 lines
2.0 KiB
C++
58 lines
2.0 KiB
C++
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
|
|
#include "explorer/ast/static_scope.h"
|
|
|
|
#include "explorer/common/error_builders.h"
|
|
#include "llvm/Support/Error.h"
|
|
|
|
namespace Carbon {
|
|
|
|
auto StaticScope::Add(std::string name, ValueNodeView entity)
|
|
-> ErrorOr<Success> {
|
|
auto [it, success] = declared_names_.insert({name, entity});
|
|
if (!success && it->second != entity) {
|
|
return CompilationError(entity.base().source_loc())
|
|
<< "Duplicate name `" << name << "` also found at "
|
|
<< it->second.base().source_loc();
|
|
}
|
|
return Success();
|
|
}
|
|
|
|
auto StaticScope::Resolve(const std::string& name,
|
|
SourceLocation source_loc) const
|
|
-> ErrorOr<ValueNodeView> {
|
|
CARBON_ASSIGN_OR_RETURN(std::optional<ValueNodeView> result,
|
|
TryResolve(name, source_loc));
|
|
if (!result) {
|
|
return CompilationError(source_loc) << "could not resolve '" << name << "'";
|
|
}
|
|
return *result;
|
|
}
|
|
|
|
auto StaticScope::TryResolve(const std::string& name,
|
|
SourceLocation source_loc) const
|
|
-> ErrorOr<std::optional<ValueNodeView>> {
|
|
auto it = declared_names_.find(name);
|
|
if (it != declared_names_.end()) {
|
|
return std::make_optional(it->second);
|
|
}
|
|
std::optional<ValueNodeView> result;
|
|
for (Nonnull<const StaticScope*> parent : parent_scopes_) {
|
|
CARBON_ASSIGN_OR_RETURN(std::optional<ValueNodeView> parent_result,
|
|
parent->TryResolve(name, source_loc));
|
|
if (parent_result.has_value() && result.has_value() &&
|
|
*parent_result != *result) {
|
|
return CompilationError(source_loc)
|
|
<< "'" << name << "' is ambiguous between "
|
|
<< result->base().source_loc() << " and "
|
|
<< parent_result->base().source_loc();
|
|
}
|
|
result = parent_result;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
} // namespace Carbon
|