mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-25 13:30:16 +01:00
aa8a5f174d
* Replaced std::exit() with return llvm::Expected/llvm::Error<T> for expected errors like invalid syntax. * Use llvm::formatv() for formatting lexer error messages. x * Addresed merge errors. * Fixed impl scope. * Made ErrorBuilder::operator<< nodiscard, to catch code forgetting 'return' in 'return FATAL_COMPILATION_ERROR()'. * FatalComplationError() -> ParseAndLexContext::RecordLexerError(). Other usages of ERROR_TOKEN in lexer.lpp were actually supposed to be END_OF_FILE. * Update executable_semantics/syntax/parse_and_lex_context.h Co-authored-by: Jon Meow <jperkins@google.com> * Code review fixes. * Update executable_semantics/syntax/parser.ypp Co-authored-by: Jon Meow <jperkins@google.com> * More code review fixes. * Update executable_semantics/interpreter/type_checker.h Co-authored-by: Jon Meow <jperkins@google.com> * Yet more code review fixes... * Update executable_semantics/syntax/lexer.lpp Co-authored-by: Jon Meow <jperkins@google.com> * code review comments * Update executable_semantics/interpreter/interpreter.cpp Co-authored-by: Geoff Romer <gromer@google.com> * Apply suggestions from code review Co-authored-by: Jon Meow <jperkins@google.com> * Update executable_semantics/syntax/lexer.lpp Co-authored-by: Jon Meow <jperkins@google.com> * code review * code review * Apply suggestions from code review Co-authored-by: Jon Meow <jperkins@google.com> * formatted code * review comments * Switched to the new ErrorOr<V> error implementation * code review comments * fixed comment * restored ostream.h as #976 makes the change unnecesary * review comments Co-authored-by: Jon Meow <jperkins@google.com> Co-authored-by: Geoff Romer <gromer@google.com>
59 lines
2.0 KiB
C++
59 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 "executable_semantics/ast/static_scope.h"
|
|
|
|
#include "executable_semantics/common/error.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 FATAL_COMPILATION_ERROR(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> {
|
|
ASSIGN_OR_RETURN(std::optional<ValueNodeView> result,
|
|
TryResolve(name, source_loc));
|
|
if (!result) {
|
|
return FATAL_COMPILATION_ERROR(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_) {
|
|
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 FATAL_COMPILATION_ERROR(source_loc)
|
|
<< "'" << name << "' is ambiguous between "
|
|
<< result->base().source_loc() << " and "
|
|
<< parent_result->base().source_loc();
|
|
}
|
|
result = parent_result;
|
|
}
|
|
return result;
|
|
}
|
|
|
|
} // namespace Carbon
|