mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-01 06:35:01 +01:00
Jon Ross-Perkins
7e81c1710e
Right now, each sequential modifier verification tends to re-fetch the enclosing scope, doing equivalent verification. Change code to more explicitly do the fetch once, sharing the result, also making the enclosing scope available to the caller for other work. Note, the type store similarly carries an inst store pointer; that's what I'm basing having the name scope store's inst store pointer on.
119 lines
4.6 KiB
C++
119 lines
4.6 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 "toolchain/check/context.h"
|
|
#include "toolchain/check/convert.h"
|
|
#include "toolchain/check/modifiers.h"
|
|
|
|
namespace Carbon::Check {
|
|
|
|
auto HandleVariableIntroducer(Context& context,
|
|
Parse::VariableIntroducerId node_id) -> bool {
|
|
// No action, just a bracketing node.
|
|
context.node_stack().Push(node_id);
|
|
context.decl_state_stack().Push(DeclState::Var);
|
|
return true;
|
|
}
|
|
|
|
auto HandleReturnedModifier(Context& context, Parse::ReturnedModifierId node_id)
|
|
-> bool {
|
|
// No action, just a bracketing node.
|
|
context.node_stack().Push(node_id);
|
|
return true;
|
|
}
|
|
|
|
auto HandleVariableInitializer(Context& context,
|
|
Parse::VariableInitializerId node_id) -> bool {
|
|
if (context.scope_stack().PeekIndex() == ScopeIndex::Package) {
|
|
context.inst_block_stack().PushGlobalInit();
|
|
}
|
|
context.node_stack().Push(node_id);
|
|
return true;
|
|
}
|
|
|
|
auto HandleVariableDecl(Context& context, Parse::VariableDeclId node_id)
|
|
-> bool {
|
|
// Handle the optional initializer.
|
|
std::optional<SemIR::InstId> init_id;
|
|
if (context.node_stack().PeekNextIs<Parse::NodeKind::VariableInitializer>()) {
|
|
init_id = context.node_stack().PopExpr();
|
|
context.node_stack()
|
|
.PopAndDiscardSoloNodeId<Parse::NodeKind::VariableInitializer>();
|
|
}
|
|
|
|
if (context.node_stack().PeekIs<Parse::NodeKind::TuplePattern>()) {
|
|
if (init_id && context.scope_stack().PeekIndex() == ScopeIndex::Package) {
|
|
context.inst_block_stack().PopGlobalInit();
|
|
}
|
|
return context.TODO(node_id, "tuple pattern in var");
|
|
}
|
|
|
|
// Extract the name binding.
|
|
auto value_id = context.node_stack().PopPattern();
|
|
if (auto bind_name = context.insts().TryGetAs<SemIR::AnyBindName>(value_id)) {
|
|
// Form a corresponding name in the current context, and bind the name to
|
|
// the variable.
|
|
auto name_context = context.decl_name_stack().MakeUnqualifiedName(
|
|
context.insts().GetLocId(value_id),
|
|
context.bind_names().Get(bind_name->bind_name_id).name_id);
|
|
context.decl_name_stack().AddNameOrDiagnoseDuplicate(name_context,
|
|
value_id);
|
|
value_id = bind_name->value_id;
|
|
} else if (auto field_decl =
|
|
context.insts().TryGetAs<SemIR::FieldDecl>(value_id)) {
|
|
// Introduce the field name into the class.
|
|
auto name_context = context.decl_name_stack().MakeUnqualifiedName(
|
|
context.insts().GetLocId(value_id), field_decl->name_id);
|
|
context.decl_name_stack().AddNameOrDiagnoseDuplicate(name_context,
|
|
value_id);
|
|
}
|
|
// TODO: Handle other kinds of pattern.
|
|
|
|
// Pop the `returned` specifier if present.
|
|
context.node_stack()
|
|
.PopAndDiscardSoloNodeIdIf<Parse::NodeKind::ReturnedModifier>();
|
|
|
|
// If there was an initializer, assign it to the storage.
|
|
if (init_id) {
|
|
if (context.GetCurrentScopeAs<SemIR::ClassDecl>()) {
|
|
// TODO: In a class scope, we should instead save the initializer
|
|
// somewhere so that we can use it as a default.
|
|
context.TODO(node_id, "Field initializer");
|
|
} else {
|
|
init_id = Initialize(context, node_id, value_id, *init_id);
|
|
// TODO: Consider using different instruction kinds for assignment versus
|
|
// initialization.
|
|
context.AddInst({node_id, SemIR::Assign{value_id, *init_id}});
|
|
}
|
|
if (context.scope_stack().PeekIndex() == ScopeIndex::Package) {
|
|
context.inst_block_stack().PopGlobalInit();
|
|
}
|
|
}
|
|
|
|
context.node_stack()
|
|
.PopAndDiscardSoloNodeId<Parse::NodeKind::VariableIntroducer>();
|
|
|
|
// Process declaration modifiers.
|
|
// TODO: For a qualified `var` declaration, this should use the target scope
|
|
// of the name introduced in the declaration. See #2590.
|
|
auto [_, enclosing_scope_inst] = context.name_scopes().GetInstIfValid(
|
|
context.scope_stack().PeekNameScopeId());
|
|
CheckAccessModifiersOnDecl(context, Lex::TokenKind::Var,
|
|
enclosing_scope_inst);
|
|
LimitModifiersOnDecl(context, KeywordModifierSet::Access,
|
|
Lex::TokenKind::Var);
|
|
auto modifiers = context.decl_state_stack().innermost().modifier_set;
|
|
if (modifiers.HasAnyOf(KeywordModifierSet::Access)) {
|
|
context.TODO(context.decl_state_stack().innermost().modifier_node_id(
|
|
ModifierOrder::Access),
|
|
"access modifier");
|
|
}
|
|
|
|
context.decl_state_stack().Pop(DeclState::Var);
|
|
|
|
return true;
|
|
}
|
|
|
|
} // namespace Carbon::Check
|