mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 20:30:14 +01:00
Chandler Carruth
8c64f0bfdd
Most of these are places where we failed to include a header file and simply never got an error about this. The fix is to include the header file. Most other cases are functions that should have been marked `static` but were not. Finding all of these was a main motivation for me enabling the warning despite how much work it is. One complicating factor was that we weren't including the `handle.h` for all the state-based handler functions. While this isn't a tiny amount of code, it is just declarations and doesn't add any extra dependencies. It also lets us have the checking for which functions need to be `static` and which don't. For the `parse` library I had to add the `handle.h` header as well, I tried to match the design of it in `check`. I have also had to work around a bug in the warning, but given the value it seems to be providing, that seems reasonable. I've filed the bug upstream: https://github.com/llvm/llvm-project/issues/94138 I also had to use some hacks to work around limitations of Bazel rules that wrap `cc_library` rules and don't expose `copts`. I filed a bug for `cc_proto_library` specifically: ~https://github.com/bazelbuild/bazel/issues/22610~ https://github.com/bazelbuild/bazel/issues/4446
100 lines
3.1 KiB
C++
100 lines
3.1 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/parse/context.h"
|
|
#include "toolchain/parse/handle.h"
|
|
|
|
namespace Carbon::Parse {
|
|
auto HandleChoiceIntroducer(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.PushState(state, State::ChoiceDefinitionStart);
|
|
context.PushState(State::DeclNameAndParams, state.token);
|
|
}
|
|
|
|
auto HandleChoiceDefinitionStart(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (!context.PositionIs(Lex::TokenKind::OpenCurlyBrace)) {
|
|
if (!state.has_error) {
|
|
CARBON_DIAGNOSTIC(ExpectedChoiceDefinition, Error,
|
|
"Choice definition expected.");
|
|
context.emitter().Emit(*context.position(), ExpectedChoiceDefinition);
|
|
}
|
|
|
|
context.AddNode(NodeKind::ChoiceDefinitionStart, *context.position(),
|
|
state.subtree_start, /*has_error=*/true);
|
|
|
|
context.AddNode(NodeKind::ChoiceDefinition, *context.position(),
|
|
state.subtree_start, /*has_error=*/true);
|
|
|
|
context.SkipPastLikelyEnd(*context.position());
|
|
return;
|
|
}
|
|
|
|
context.AddNode(NodeKind::ChoiceDefinitionStart, context.Consume(),
|
|
state.subtree_start, state.has_error);
|
|
|
|
state.has_error = false;
|
|
state.state = State::ChoiceDefinitionFinish;
|
|
context.PushState(state);
|
|
|
|
if (!context.PositionIs(Lex::TokenKind::CloseCurlyBrace)) {
|
|
context.PushState(State::ChoiceAlternative);
|
|
}
|
|
}
|
|
|
|
auto HandleChoiceAlternative(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.PushState(State::ChoiceAlternativeFinish);
|
|
|
|
if (!context.ConsumeAndAddLeafNodeIf(Lex::TokenKind::Identifier,
|
|
NodeKind::IdentifierName)) {
|
|
if (!state.has_error) {
|
|
CARBON_DIAGNOSTIC(ExpectedChoiceAlternativeName, Error,
|
|
"Expected choice alternative name.");
|
|
context.emitter().Emit(*context.position(),
|
|
ExpectedChoiceAlternativeName);
|
|
}
|
|
|
|
context.SkipPastLikelyEnd(*context.position());
|
|
|
|
context.ReturnErrorOnState();
|
|
|
|
return;
|
|
}
|
|
|
|
if (context.PositionIs(Lex::TokenKind::OpenParen)) {
|
|
context.PushState(State::PatternListAsTuple);
|
|
}
|
|
}
|
|
|
|
auto HandleChoiceAlternativeFinish(Context& context) -> void {
|
|
const auto state = context.PopState();
|
|
|
|
if (state.has_error) {
|
|
context.ReturnErrorOnState();
|
|
if (!context.PositionIs(Lex::TokenKind::CloseCurlyBrace)) {
|
|
context.PushState(State::ChoiceAlternative);
|
|
}
|
|
return;
|
|
}
|
|
|
|
if (context.ConsumeListToken(
|
|
NodeKind::ChoiceAlternativeListComma, Lex::TokenKind::CloseCurlyBrace,
|
|
state.has_error) == Context::ListTokenKind::Comma) {
|
|
context.PushState(State::ChoiceAlternative);
|
|
}
|
|
}
|
|
|
|
auto HandleChoiceDefinitionFinish(Context& context) -> void {
|
|
const auto state = context.PopState();
|
|
|
|
context.AddNode(NodeKind::ChoiceDefinition,
|
|
context.ConsumeChecked(Lex::TokenKind::CloseCurlyBrace),
|
|
state.subtree_start, state.has_error);
|
|
}
|
|
} // namespace Carbon::Parse
|