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

Use the scope stack instead of the decl state stack for context (#3460)

Browse Source
This commit is contained in:
josh11b
2023-12-06 17:59:22 +00:00
committed by GitHub
parent 2de79a6db0
commit f4677eea8d
4 changed files with 44 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/handle_function.cpp
+10 -11
View File
@@ -17,23 +17,22 @@ static auto DiagnoseModifiers(Context& context) -> KeywordModifierSet {
KeywordModifierSet::Interface,
decl_kind);
// Rules for abstract, virtual, and impl, which are only allowed in classes.
auto containing_kind = context.decl_state_stack().containing().kind;
if (containing_kind != DeclState::Class) {
ForbidModifiersOnDecl(context, KeywordModifierSet::Method, decl_kind,
" outside of a class");
} else {
auto containing_decl_modifiers =
context.decl_state_stack().containing().modifier_set;
if (!(containing_decl_modifiers & KeywordModifierSet::Class)) {
if (auto class_decl = context.GetCurrentScopeAs<SemIR::ClassDecl>()) {
auto inheritance_kind =
context.classes().Get(class_decl->class_id).inheritance_kind;
if (inheritance_kind == SemIR::Class::Final) {
ForbidModifiersOnDecl(context, KeywordModifierSet::Virtual, decl_kind,
" in a non-abstract non-base `class` definition",
context.decl_state_stack().containing().first_node);
class_decl->parse_node);
}
if (!(containing_decl_modifiers & KeywordModifierSet::Abstract)) {
if (inheritance_kind != SemIR::Class::Abstract) {
ForbidModifiersOnDecl(context, KeywordModifierSet::Abstract, decl_kind,
" in a non-abstract `class` definition",
context.decl_state_stack().containing().first_node);
class_decl->parse_node);
}
} else {
ForbidModifiersOnDecl(context, KeywordModifierSet::Method, decl_kind,
" outside of a class");
}
RequireDefaultFinalOnlyInInterfaces(context, decl_kind);