carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 19:31:08 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Switch decl_state to an arg for modifier functions (#4027)

Browse Source 
With private modifiers, we'll want to start checking modifiers later,
e.g. after a name conflict is detected (and potentially merged). I think
we've agreed to be more explicit about whether the modifier functions
are manipulating state, versus trying to keep the state on the stack a
little longer (moving Pop to the end of these functions).

Removing FileScope from the stack and renaming it to DeclIntroducerStack
to better reflect the usage and behavior. The FileScope mostly reflects
an approach that wasn't ultimately adopted.
This commit is contained in:
Jon Ross-Perkins
2024-06-04 23:12:12 +00:00
committed by GitHub
parent 8c64f0bfdd
commit a910eda020
17 changed files with 192 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/handle_class.cpp
+26 -24
View File
@@ -36,7 +36,7 @@ auto HandleClassIntroducer(Context& context, Parse::ClassIntroducerId node_id)
// Push the bracketing node.
context.node_stack().Push(node_id);
// Optional modifiers and the name follow.
context.decl_state_stack().Push(DeclState::Class);
context.decl_introducer_state_stack().Push(DeclIntroducerState::Class);
context.decl_name_stack().PushScopeAndStartName();
return true;
}
@@ -187,28 +187,30 @@ static auto BuildClassDecl(Context& context, Parse::AnyClassDeclId node_id,
// Process modifiers.
auto [_, parent_scope_inst] =
context.name_scopes().GetInstIfValid(name_context.parent_scope_id);
CheckAccessModifiersOnDecl(context, Lex::TokenKind::Class, parent_scope_inst);
LimitModifiersOnDecl(context,
auto introducer =
context.decl_introducer_state_stack().Pop(DeclIntroducerState::Class);
CheckAccessModifiersOnDecl(context, introducer, Lex::TokenKind::Class,
parent_scope_inst);
LimitModifiersOnDecl(context, introducer,
KeywordModifierSet::Class | KeywordModifierSet::Access |
KeywordModifierSet::Extern,
Lex::TokenKind::Class);
RestrictExternModifierOnDecl(context, Lex::TokenKind::Class,
RestrictExternModifierOnDecl(context, introducer, Lex::TokenKind::Class,
parent_scope_inst, is_definition);
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),
if (introducer.modifier_set.HasAnyOf(KeywordModifierSet::Access)) {
context.TODO(introducer.modifier_node_id(ModifierOrder::Access),
"access modifier");
}
bool is_extern = modifiers.HasAnyOf(KeywordModifierSet::Extern);
bool is_extern = introducer.modifier_set.HasAnyOf(KeywordModifierSet::Extern);
auto inheritance_kind =
modifiers.HasAnyOf(KeywordModifierSet::Abstract) ? SemIR::Class::Abstract
: modifiers.HasAnyOf(KeywordModifierSet::Base) ? SemIR::Class::Base
: SemIR::Class::Final;
introducer.modifier_set.HasAnyOf(KeywordModifierSet::Abstract)
? SemIR::Class::Abstract
: introducer.modifier_set.HasAnyOf(KeywordModifierSet::Base)
? SemIR::Class::Base
: SemIR::Class::Final;
context.decl_state_stack().Pop(DeclState::Class);
auto decl_block_id = context.inst_block_stack().Pop();
// Add the class declaration.
@@ -355,7 +357,7 @@ static auto DiagnoseClassSpecificDeclRepeated(Context& context,
auto HandleAdaptIntroducer(Context& context,
Parse::AdaptIntroducerId /*node_id*/) -> bool {
context.decl_state_stack().Push(DeclState::Adapt);
context.decl_introducer_state_stack().Push(DeclIntroducerState::Adapt);
return true;
}
@@ -364,10 +366,10 @@ auto HandleAdaptDecl(Context& context, Parse::AdaptDeclId node_id) -> bool {
context.node_stack().PopExprWithNodeId();
// Process modifiers. `extend` is permitted, no others are allowed.
LimitModifiersOnDecl(context, KeywordModifierSet::Extend,
auto introducer =
context.decl_introducer_state_stack().Pop(DeclIntroducerState::Adapt);
LimitModifiersOnDecl(context, introducer, KeywordModifierSet::Extend,
Lex::TokenKind::Adapt);
auto modifiers = context.decl_state_stack().innermost().modifier_set;
context.decl_state_stack().Pop(DeclState::Adapt);
auto parent_class_decl =
GetCurrentScopeAsClassOrDiagnose(context, node_id, Lex::TokenKind::Adapt);
@@ -396,7 +398,7 @@ auto HandleAdaptDecl(Context& context, Parse::AdaptDeclId node_id) -> bool {
node_id, {.adapted_type_id = adapted_type_id});
// Extend the class scope with the adapted type's scope if requested.
if (modifiers.HasAnyOf(KeywordModifierSet::Extend)) {
if (introducer.modifier_set.HasAnyOf(KeywordModifierSet::Extend)) {
auto extended_scope_id = SemIR::NameScopeId::Invalid;
if (adapted_type_id == SemIR::TypeId::Error) {
// Recover by not extending any scope. We instead set has_error to true
@@ -423,7 +425,7 @@ auto HandleAdaptDecl(Context& context, Parse::AdaptDeclId node_id) -> bool {
auto HandleBaseIntroducer(Context& context, Parse::BaseIntroducerId /*node_id*/)
-> bool {
context.decl_state_stack().Push(DeclState::Base);
context.decl_introducer_state_stack().Push(DeclIntroducerState::Base);
return true;
}
@@ -495,15 +497,15 @@ auto HandleBaseDecl(Context& context, Parse::BaseDeclId node_id) -> bool {
context.node_stack().PopExprWithNodeId();
// Process modifiers. `extend` is required, no others are allowed.
LimitModifiersOnDecl(context, KeywordModifierSet::Extend,
auto introducer =
context.decl_introducer_state_stack().Pop(DeclIntroducerState::Base);
LimitModifiersOnDecl(context, introducer, KeywordModifierSet::Extend,
Lex::TokenKind::Base);
auto modifiers = context.decl_state_stack().innermost().modifier_set;
if (!modifiers.HasAnyOf(KeywordModifierSet::Extend)) {
if (!introducer.modifier_set.HasAnyOf(KeywordModifierSet::Extend)) {
CARBON_DIAGNOSTIC(BaseMissingExtend, Error,
"Missing `extend` before `base` declaration in class.");
context.emitter().Emit(node_id, BaseMissingExtend);
}
context.decl_state_stack().Pop(DeclState::Base);
auto parent_class_decl =
GetCurrentScopeAsClassOrDiagnose(context, node_id, Lex::TokenKind::Base);
@@ -546,7 +548,7 @@ auto HandleBaseDecl(Context& context, Parse::BaseDeclId node_id) -> bool {
class_info.base_id);
// Extend the class scope with the base class.
if (modifiers.HasAnyOf(KeywordModifierSet::Extend)) {
if (introducer.modifier_set.HasAnyOf(KeywordModifierSet::Extend)) {
auto& class_scope = context.name_scopes().Get(class_info.scope_id);
if (base_info.scope_id.is_valid()) {
class_scope.extended_scopes.push_back(base_info.scope_id);