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

Use a separate type for a parameterized entity name that is waiting for its arguments to arrive. (#1223)

Browse Source 
Previously we modeled these as being class types or interface types, with special case checks to treat them as not actually being class or interface types.
This commit is contained in:
Richard Smith
2022-05-05 14:30:18 -07:00
committed by GitHub
parent 56604322f0
commit a2176e1e28
9 changed files with 184 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
explorer/interpreter/interpreter.cpp
+31 -34
View File
@@ -479,6 +479,7 @@ auto Interpreter::Convert(Nonnull<const Value*> value,
case Value::Kind::NominalClassType:
case Value::Kind::InterfaceType:
case Value::Kind::Witness:
case Value::Kind::ParameterizedEntityName:
case Value::Kind::ChoiceType:
case Value::Kind::ContinuationType:
case Value::Kind::VariableType:
@@ -490,6 +491,7 @@ auto Interpreter::Convert(Nonnull<const Value*> value,
case Value::Kind::TypeOfClassType:
case Value::Kind::TypeOfInterfaceType:
case Value::Kind::TypeOfChoiceType:
case Value::Kind::TypeOfParameterizedEntityName:
case Value::Kind::StaticArrayType:
// TODO: add `CHECK(TypeEqual(type, value->dynamic_type()))`, once we
// have Value::dynamic_type.
@@ -628,42 +630,37 @@ auto Interpreter::CallFunction(const CallExpression& call,
return todo_.Spawn(std::make_unique<StatementAction>(*method.body()),
std::move(method_scope));
}
case Value::Kind::NominalClassType: {
const NominalClassType& class_type = cast<NominalClassType>(*fun);
const ClassDeclaration& class_decl = class_type.declaration();
RuntimeScope type_params_scope(&heap_);
BindingMap generic_args;
CHECK(class_decl.type_params().has_value())
<< "instantiation of non-generic class " << class_type;
CHECK(PatternMatch(&(*class_decl.type_params())->value(), arg,
call.source_loc(), &type_params_scope, generic_args,
trace_stream_));
switch (phase()) {
case Phase::RunTime:
return todo_.FinishAction(arena_->New<NominalClassType>(
&class_decl, generic_args, witnesses));
case Phase::CompileTime:
return todo_.FinishAction(arena_->New<NominalClassType>(
&class_decl, generic_args, call.impls()));
}
}
case Value::Kind::InterfaceType: {
const InterfaceType& iface_type = cast<InterfaceType>(*fun);
const InterfaceDeclaration& iface_decl = iface_type.declaration();
case Value::Kind::ParameterizedEntityName: {
const auto& name = cast<ParameterizedEntityName>(*fun);
const Declaration& decl = name.declaration();
RuntimeScope params_scope(&heap_);
BindingMap generic_args;
CHECK(iface_decl.params().has_value())
<< "call of unparameterized interface " << iface_type;
CHECK(PatternMatch(&(*iface_decl.params())->value(), arg,
call.source_loc(), &params_scope, generic_args,
trace_stream_));
switch (phase()) {
case Phase::RunTime:
return todo_.FinishAction(
arena_->New<InterfaceType>(&iface_decl, generic_args, witnesses));
case Phase::CompileTime:
return todo_.FinishAction(arena_->New<InterfaceType>(
&iface_decl, generic_args, call.impls()));
CHECK(PatternMatch(&name.params().value(), arg, call.source_loc(),
&params_scope, generic_args, trace_stream_));
switch (decl.kind()) {
case DeclarationKind::ClassDeclaration: {
switch (phase()) {
case Phase::RunTime:
return todo_.FinishAction(arena_->New<NominalClassType>(
&cast<ClassDeclaration>(decl), generic_args, witnesses));
case Phase::CompileTime:
return todo_.FinishAction(arena_->New<NominalClassType>(
&cast<ClassDeclaration>(decl), generic_args, call.impls()));
}
}
case DeclarationKind::InterfaceDeclaration: {
switch (phase()) {
case Phase::RunTime:
return todo_.FinishAction(arena_->New<InterfaceType>(
&cast<InterfaceDeclaration>(decl), generic_args, witnesses));
case Phase::CompileTime:
return todo_.FinishAction(
arena_->New<InterfaceType>(&cast<InterfaceDeclaration>(decl),
generic_args, call.impls()));
}
}
default:
FATAL() << "unknown kind of ParameterizedEntityName " << decl;
}
}
default: