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
116 lines
3.9 KiB
C++
116 lines
3.9 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 HandleOnlyParenExpr(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
// Advance past the open paren.
|
|
auto open_paren = context.ConsumeChecked(Lex::TokenKind::OpenParen);
|
|
context.AddLeafNode(NodeKind::ParenExprStart, open_paren);
|
|
|
|
state.token = open_paren;
|
|
context.PushState(state, State::OnlyParenExprFinish);
|
|
context.PushState(State::Expr);
|
|
}
|
|
|
|
static auto FinishParenExpr(Context& context,
|
|
const Context::StateStackEntry& state) -> void {
|
|
context.AddNode(NodeKind::ParenExpr, context.Consume(), state.subtree_start,
|
|
state.has_error);
|
|
}
|
|
|
|
auto HandleOnlyParenExprFinish(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (!context.PositionIs(Lex::TokenKind::CloseParen)) {
|
|
if (!state.has_error) {
|
|
CARBON_DIAGNOSTIC(UnexpectedTokenInCompoundMemberAccess, Error,
|
|
"Expected `)`.");
|
|
context.emitter().Emit(*context.position(),
|
|
UnexpectedTokenInCompoundMemberAccess);
|
|
state.has_error = true;
|
|
}
|
|
|
|
// Recover from the invalid token.
|
|
context.SkipTo(context.tokens().GetMatchedClosingToken(state.token));
|
|
}
|
|
|
|
FinishParenExpr(context, state);
|
|
}
|
|
|
|
auto HandleParenExpr(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
// Advance past the open paren. The placeholder will be replaced at the end
|
|
// based on whether we determine this is a tuple or parenthesized expression.
|
|
context.AddLeafNode(NodeKind::Placeholder,
|
|
context.ConsumeChecked(Lex::TokenKind::OpenParen));
|
|
|
|
if (context.PositionIs(Lex::TokenKind::CloseParen)) {
|
|
context.PushState(state, State::TupleLiteralFinish);
|
|
} else {
|
|
context.PushState(state, State::ParenExprFinish);
|
|
context.PushState(State::ExprAfterOpenParenFinish);
|
|
context.PushState(State::Expr);
|
|
}
|
|
}
|
|
|
|
auto HandleExprAfterOpenParenFinish(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
auto list_token_kind = context.ConsumeListToken(
|
|
NodeKind::TupleLiteralComma, Lex::TokenKind::CloseParen, state.has_error);
|
|
if (list_token_kind == Context::ListTokenKind::Close) {
|
|
return;
|
|
}
|
|
|
|
// We found a comma, so switch parent state to tuple handling.
|
|
auto finish_state = context.PopState();
|
|
CARBON_CHECK(finish_state.state == State::ParenExprFinish)
|
|
<< "Unexpected parent state, found: " << finish_state.state;
|
|
context.PushState(finish_state, State::TupleLiteralFinish);
|
|
|
|
// If the comma is not immediately followed by a close paren, push handlers
|
|
// for the next tuple element.
|
|
if (list_token_kind != Context::ListTokenKind::CommaClose) {
|
|
context.PushState(state, State::TupleLiteralElementFinish);
|
|
context.PushState(State::Expr);
|
|
}
|
|
}
|
|
|
|
auto HandleTupleLiteralElementFinish(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (context.ConsumeListToken(NodeKind::TupleLiteralComma,
|
|
Lex::TokenKind::CloseParen, state.has_error) ==
|
|
Context::ListTokenKind::Comma) {
|
|
context.PushState(state);
|
|
context.PushState(State::Expr);
|
|
}
|
|
}
|
|
|
|
auto HandleParenExprFinish(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.ReplacePlaceholderNode(state.subtree_start, NodeKind::ParenExprStart,
|
|
state.token);
|
|
FinishParenExpr(context, state);
|
|
}
|
|
|
|
auto HandleTupleLiteralFinish(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.ReplacePlaceholderNode(state.subtree_start,
|
|
NodeKind::TupleLiteralStart, state.token);
|
|
context.AddNode(NodeKind::TupleLiteral, context.Consume(),
|
|
state.subtree_start, state.has_error);
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|