mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +01:00
A lot of this is more boring "remove unused header", plus some other minor cleanups. I think the most significant changes were: - yaml_test_helpers.cpp is doing a switch on an unsigned int, comparing to enum values. - [bugprone-switch-missing-default-case](https://clang.llvm.org/extra/clang-tidy/checks/bugprone/switch-missing-default-case.html) is unhappy with EnumBase, but correctly identified yaml_test_helpers.cpp, so I'm opting to address it rather than disabling it even though it needs NOLINT in several locations as a result, in addition to what I think are some low-value `default` cases. I'd be fine going the other way with this too and disabling it globally (I could see it being noisier in the explorer). - MarkInitializerFor swaps the argument names between the .h and .cpp. I think the .cpp had the order as intended. - There's a new-ish [performance-enum-size](https://clang.llvm.org/extra/clang-tidy/checks/performance/enum-size.html) which I'm basically treating as "add int8_t to enums". My main motivation here is to just clean up as many of these as I can so that I stop seeing them in vscode.
126 lines
4.3 KiB
C++
126 lines
4.3 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/parser/parser_context.h"
|
|
|
|
namespace Carbon {
|
|
|
|
// Handles DeclarationNameAndParamsAs(Optional|Required).
|
|
static auto ParserHandleDeclarationNameAndParams(ParserContext& context,
|
|
ParserState after_name)
|
|
-> void {
|
|
auto state = context.PopState();
|
|
|
|
// TODO: Should handle designated names.
|
|
if (auto identifier = context.ConsumeIf(TokenKind::Identifier)) {
|
|
state.state = after_name;
|
|
context.PushState(state);
|
|
|
|
if (context.PositionIs(TokenKind::Period)) {
|
|
// Because there's a qualifier, we process the first segment as an
|
|
// expression for simplicity. This just means semantics has one less thing
|
|
// to handle here.
|
|
context.AddLeafNode(ParseNodeKind::NameExpression, *identifier);
|
|
state.state = ParserState::PeriodAsDeclaration;
|
|
context.PushState(state);
|
|
} else {
|
|
context.AddLeafNode(ParseNodeKind::Name, *identifier);
|
|
}
|
|
} else {
|
|
CARBON_DIAGNOSTIC(ExpectedDeclarationName, Error,
|
|
"`{0}` introducer should be followed by a name.",
|
|
TokenKind);
|
|
context.emitter().Emit(*context.position(), ExpectedDeclarationName,
|
|
context.tokens().GetKind(state.token));
|
|
context.ReturnErrorOnState();
|
|
context.AddLeafNode(ParseNodeKind::InvalidParse, *context.position());
|
|
}
|
|
}
|
|
|
|
auto ParserHandleDeclarationNameAndParamsAsNone(ParserContext& context)
|
|
-> void {
|
|
ParserHandleDeclarationNameAndParams(
|
|
context, ParserState::DeclarationNameAndParamsAfterNameAsNone);
|
|
}
|
|
|
|
auto ParserHandleDeclarationNameAndParamsAsOptional(ParserContext& context)
|
|
-> void {
|
|
ParserHandleDeclarationNameAndParams(
|
|
context, ParserState::DeclarationNameAndParamsAfterNameAsOptional);
|
|
}
|
|
|
|
auto ParserHandleDeclarationNameAndParamsAsRequired(ParserContext& context)
|
|
-> void {
|
|
ParserHandleDeclarationNameAndParams(
|
|
context, ParserState::DeclarationNameAndParamsAfterNameAsRequired);
|
|
}
|
|
|
|
enum class Params : int8_t {
|
|
None,
|
|
Optional,
|
|
Required,
|
|
};
|
|
|
|
static auto ParserHandleDeclarationNameAndParamsAfterName(
|
|
ParserContext& context, Params params) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (context.PositionIs(TokenKind::Period)) {
|
|
// Continue designator processing.
|
|
context.PushState(state);
|
|
state.state = ParserState::PeriodAsDeclaration;
|
|
context.PushState(state);
|
|
return;
|
|
}
|
|
|
|
if (params == Params::None) {
|
|
return;
|
|
}
|
|
|
|
if (context.PositionIs(TokenKind::OpenSquareBracket)) {
|
|
context.PushState(ParserState::DeclarationNameAndParamsAfterDeduced);
|
|
context.PushState(ParserState::ParameterListAsDeduced);
|
|
} else if (context.PositionIs(TokenKind::OpenParen)) {
|
|
context.PushState(ParserState::ParameterListAsRegular);
|
|
} else if (params == Params::Required) {
|
|
CARBON_DIAGNOSTIC(ParametersRequiredByIntroducer, Error,
|
|
"`{0}` requires a `(` for parameters.", TokenKind);
|
|
context.emitter().Emit(*context.position(), ParametersRequiredByIntroducer,
|
|
context.tokens().GetKind(state.token));
|
|
context.ReturnErrorOnState();
|
|
}
|
|
}
|
|
|
|
auto ParserHandleDeclarationNameAndParamsAfterNameAsNone(ParserContext& context)
|
|
-> void {
|
|
ParserHandleDeclarationNameAndParamsAfterName(context, Params::None);
|
|
}
|
|
|
|
auto ParserHandleDeclarationNameAndParamsAfterNameAsOptional(
|
|
ParserContext& context) -> void {
|
|
ParserHandleDeclarationNameAndParamsAfterName(context, Params::Optional);
|
|
}
|
|
|
|
auto ParserHandleDeclarationNameAndParamsAfterNameAsRequired(
|
|
ParserContext& context) -> void {
|
|
ParserHandleDeclarationNameAndParamsAfterName(context, Params::Required);
|
|
}
|
|
|
|
auto ParserHandleDeclarationNameAndParamsAfterDeduced(ParserContext& context)
|
|
-> void {
|
|
context.PopAndDiscardState();
|
|
|
|
if (context.PositionIs(TokenKind::OpenParen)) {
|
|
context.PushState(ParserState::ParameterListAsRegular);
|
|
} else {
|
|
CARBON_DIAGNOSTIC(
|
|
ParametersRequiredByDeduced, Error,
|
|
"A `(` for parameters is required after deduced parameters.");
|
|
context.emitter().Emit(*context.position(), ParametersRequiredByDeduced);
|
|
context.ReturnErrorOnState();
|
|
}
|
|
}
|
|
|
|
} // namespace Carbon
|