mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 22:02:23 +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
69 lines
2.3 KiB
C++
69 lines
2.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/parse/context.h"
|
|
#include "toolchain/parse/handle.h"
|
|
|
|
namespace Carbon::Parse {
|
|
|
|
// Handles ParenConditionAs(If|While|Match).
|
|
static auto HandleParenCondition(Context& context, NodeKind start_kind,
|
|
State finish_state) -> void {
|
|
auto state = context.PopState();
|
|
|
|
std::optional<Lex::TokenIndex> open_paren =
|
|
context.ConsumeAndAddOpenParen(state.token, start_kind);
|
|
if (open_paren) {
|
|
state.token = *open_paren;
|
|
}
|
|
context.PushState(state, finish_state);
|
|
|
|
if (!open_paren && context.PositionIs(Lex::TokenKind::OpenCurlyBrace)) {
|
|
// For an open curly, assume the condition was completely omitted.
|
|
// Expression parsing would treat the { as a struct, but instead assume it's
|
|
// a code block and just emit an invalid parse.
|
|
context.AddLeafNode(NodeKind::InvalidParse, *context.position(),
|
|
/*has_error=*/true);
|
|
} else {
|
|
context.PushState(State::Expr);
|
|
}
|
|
}
|
|
|
|
auto HandleParenConditionAsIf(Context& context) -> void {
|
|
HandleParenCondition(context, NodeKind::IfConditionStart,
|
|
State::ParenConditionFinishAsIf);
|
|
}
|
|
|
|
auto HandleParenConditionAsWhile(Context& context) -> void {
|
|
HandleParenCondition(context, NodeKind::WhileConditionStart,
|
|
State::ParenConditionFinishAsWhile);
|
|
}
|
|
|
|
auto HandleParenConditionAsMatch(Context& context) -> void {
|
|
HandleParenCondition(context, NodeKind::MatchConditionStart,
|
|
State::ParenConditionFinishAsMatch);
|
|
}
|
|
|
|
auto HandleParenConditionFinishAsIf(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.ConsumeAndAddCloseSymbol(state.token, state, NodeKind::IfCondition);
|
|
}
|
|
|
|
auto HandleParenConditionFinishAsWhile(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.ConsumeAndAddCloseSymbol(state.token, state,
|
|
NodeKind::WhileCondition);
|
|
}
|
|
|
|
auto HandleParenConditionFinishAsMatch(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.ConsumeAndAddCloseSymbol(state.token, state,
|
|
NodeKind::MatchCondition);
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|