mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-25 12:20:10 +01:00
interfaces, impls, and constrained generics (basics) (#1073)
* interfaces, impls, and constrained generics (basics) * separate type checking into declare vs. type check, removing redundancy * external impls * added impl scopes to handle generics calling generics * cleanup * more cleanup * Update executable_semantics/testdata/interface/external_impl_point_vector.carbon Co-authored-by: josh11b <josh11b@users.noreply.github.com> * Update executable_semantics/testdata/interface/generic_call_generic.carbon Co-authored-by: josh11b <josh11b@users.noreply.github.com> * Update executable_semantics/testdata/interface/tuple_vector_add_scale.carbon Co-authored-by: josh11b <josh11b@users.noreply.github.com> * Update executable_semantics/testdata/interface/vector_point_add_scale.carbon Co-authored-by: josh11b <josh11b@users.noreply.github.com> * change ImplementationDeclaration to ImplDeclaration * remove impl_type_value * split NamedEntity into two * changed GetName to be a free function * adding comments * more edits to respond to review * introduce ImplBinding, remove punning on GenericBinding * new test case and some minor edits * refactor GetMember and GetField to move impl logic to interpreter * remove commennt * change EntityView to ImplBinding in FieldAccess... * move ImplBinding * review response * added example to impl_scope.h * minor edits * Update executable_semantics/interpreter/field_path.h Co-authored-by: Geoff Romer <gromer@google.com> * Update executable_semantics/interpreter/value.cpp Co-authored-by: Geoff Romer <gromer@google.com> * Update executable_semantics/interpreter/interpreter.cpp Co-authored-by: Geoff Romer <gromer@google.com> * Update executable_semantics/ast/expression.h Co-authored-by: Geoff Romer <gromer@google.com> * Update executable_semantics/ast/expression.h Co-authored-by: Geoff Romer <gromer@google.com> * Update executable_semantics/ast/generic_binding.h Co-authored-by: Geoff Romer <gromer@google.com> * more edits from review * review response * Update executable_semantics/ast/static_scope.h Co-authored-by: Geoff Romer <gromer@google.com> * remove ImplType, renamed node_view to value_node Co-authored-by: josh11b <josh11b@users.noreply.github.com> Co-authored-by: Geoff Romer <gromer@google.com>
This commit is contained in:
committed by
GitHub
co-authored by
josh11b
Geoff Romer
parent
8f6e42d866
commit
7cce1bd124
@@ -44,20 +44,20 @@ RuntimeScope::~RuntimeScope() {
|
||||
void RuntimeScope::Print(llvm::raw_ostream& out) const {
|
||||
out << "{";
|
||||
llvm::ListSeparator sep;
|
||||
for (const auto& [named_entity, value] : locals_) {
|
||||
out << sep << named_entity.name() << ": " << *value;
|
||||
for (const auto& [value_node, value] : locals_) {
|
||||
out << sep << value_node.base() << ": " << *value;
|
||||
}
|
||||
out << "}";
|
||||
}
|
||||
|
||||
void RuntimeScope::Initialize(NamedEntityView named_entity,
|
||||
void RuntimeScope::Initialize(ValueNodeView value_node,
|
||||
Nonnull<const Value*> value) {
|
||||
CHECK(!named_entity.constant_value().has_value());
|
||||
CHECK(!value_node.constant_value().has_value());
|
||||
CHECK(value->kind() != Value::Kind::LValue);
|
||||
allocations_.push_back(heap_->AllocateValue(value));
|
||||
auto [it, success] = locals_.insert(
|
||||
{named_entity, heap_->arena().New<LValue>(Address(allocations_.back()))});
|
||||
CHECK(success) << "Duplicate definition of " << named_entity.name();
|
||||
{value_node, heap_->arena().New<LValue>(Address(allocations_.back()))});
|
||||
CHECK(success) << "Duplicate definition of " << value_node.base();
|
||||
}
|
||||
|
||||
void RuntimeScope::Merge(RuntimeScope other) {
|
||||
@@ -65,15 +65,15 @@ void RuntimeScope::Merge(RuntimeScope other) {
|
||||
locals_.merge(other.locals_);
|
||||
CHECK(other.locals_.empty())
|
||||
<< "Duplicate definition of " << other.locals_.size()
|
||||
<< " names, including " << other.locals_.begin()->first.name();
|
||||
<< " names, including " << other.locals_.begin()->first.base();
|
||||
allocations_.insert(allocations_.end(), other.allocations_.begin(),
|
||||
other.allocations_.end());
|
||||
other.allocations_.clear();
|
||||
}
|
||||
|
||||
auto RuntimeScope::Get(NamedEntityView named_entity) const
|
||||
auto RuntimeScope::Get(ValueNodeView value_node) const
|
||||
-> std::optional<Nonnull<const LValue*>> {
|
||||
auto it = locals_.find(named_entity);
|
||||
auto it = locals_.find(value_node);
|
||||
if (it != locals_.end()) {
|
||||
return it->second;
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user