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
105 lines
3.8 KiB
C++
105 lines
3.8 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 {
|
|
|
|
// Handles PatternListElementAs(Implicit|Tuple).
|
|
static auto HandlePatternListElement(Context& context, State pattern_state,
|
|
State finish_state) -> void {
|
|
context.PopAndDiscardState();
|
|
|
|
context.PushState(finish_state);
|
|
context.PushState(pattern_state);
|
|
}
|
|
|
|
auto HandlePatternListElementAsImplicit(Context& context) -> void {
|
|
HandlePatternListElement(context, State::BindingPattern,
|
|
State::PatternListElementFinishAsImplicit);
|
|
}
|
|
|
|
auto HandlePatternListElementAsTuple(Context& context) -> void {
|
|
HandlePatternListElement(context, State::BindingPattern,
|
|
State::PatternListElementFinishAsTuple);
|
|
}
|
|
|
|
// Handles PatternListElementFinishAs(Implicit|Tuple).
|
|
static auto HandlePatternListElementFinish(Context& context,
|
|
Lex::TokenKind close_token,
|
|
State param_state) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (state.has_error) {
|
|
context.ReturnErrorOnState();
|
|
}
|
|
|
|
if (context.ConsumeListToken(NodeKind::PatternListComma, close_token,
|
|
state.has_error) ==
|
|
Context::ListTokenKind::Comma) {
|
|
context.PushState(param_state);
|
|
}
|
|
}
|
|
|
|
auto HandlePatternListElementFinishAsImplicit(Context& context) -> void {
|
|
HandlePatternListElementFinish(context, Lex::TokenKind::CloseSquareBracket,
|
|
State::PatternListElementAsImplicit);
|
|
}
|
|
|
|
auto HandlePatternListElementFinishAsTuple(Context& context) -> void {
|
|
HandlePatternListElementFinish(context, Lex::TokenKind::CloseParen,
|
|
State::PatternListElementAsTuple);
|
|
}
|
|
|
|
// Handles PatternListAs(Implicit|Tuple).
|
|
static auto HandlePatternList(Context& context, NodeKind node_kind,
|
|
Lex::TokenKind open_token_kind,
|
|
Lex::TokenKind close_token_kind,
|
|
State param_state, State finish_state) -> void {
|
|
context.PopAndDiscardState();
|
|
|
|
context.PushState(finish_state);
|
|
context.AddLeafNode(node_kind, context.ConsumeChecked(open_token_kind));
|
|
|
|
if (!context.PositionIs(close_token_kind)) {
|
|
context.PushState(param_state);
|
|
}
|
|
}
|
|
|
|
auto HandlePatternListAsImplicit(Context& context) -> void {
|
|
HandlePatternList(
|
|
context, NodeKind::ImplicitParamListStart,
|
|
Lex::TokenKind::OpenSquareBracket, Lex::TokenKind::CloseSquareBracket,
|
|
State::PatternListElementAsImplicit, State::PatternListFinishAsImplicit);
|
|
}
|
|
|
|
auto HandlePatternListAsTuple(Context& context) -> void {
|
|
HandlePatternList(context, NodeKind::TuplePatternStart,
|
|
Lex::TokenKind::OpenParen, Lex::TokenKind::CloseParen,
|
|
State::PatternListElementAsTuple,
|
|
State::PatternListFinishAsTuple);
|
|
}
|
|
|
|
// Handles PatternListFinishAs(Implicit|Tuple).
|
|
static auto HandlePatternListFinish(Context& context, NodeKind node_kind,
|
|
Lex::TokenKind token_kind) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.AddNode(node_kind, context.ConsumeChecked(token_kind),
|
|
state.subtree_start, state.has_error);
|
|
}
|
|
|
|
auto HandlePatternListFinishAsImplicit(Context& context) -> void {
|
|
HandlePatternListFinish(context, NodeKind::ImplicitParamList,
|
|
Lex::TokenKind::CloseSquareBracket);
|
|
}
|
|
|
|
auto HandlePatternListFinishAsTuple(Context& context) -> void {
|
|
HandlePatternListFinish(context, NodeKind::TuplePattern,
|
|
Lex::TokenKind::CloseParen);
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|