mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 21:50: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.7 KiB
C++
116 lines
3.7 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 VarAs(Decl|Returned).
|
|
static auto HandleVar(Context& context, State finish_state,
|
|
Lex::TokenIndex returned_token = Lex::TokenIndex::Invalid)
|
|
-> void {
|
|
auto state = context.PopState();
|
|
|
|
// The finished variable declaration will start at the `var` or `returned`.
|
|
context.PushState(state, finish_state);
|
|
|
|
context.PushState(state, State::VarAfterPattern);
|
|
|
|
if (returned_token.is_valid()) {
|
|
context.AddLeafNode(NodeKind::ReturnedModifier, returned_token);
|
|
}
|
|
|
|
context.PushState(State::Pattern);
|
|
}
|
|
|
|
auto HandleVarAsDecl(Context& context) -> void {
|
|
HandleVar(context, State::VarFinishAsDecl);
|
|
}
|
|
|
|
auto HandleVarAsReturned(Context& context) -> void {
|
|
auto returned_token = context.Consume();
|
|
|
|
if (!context.PositionIs(Lex::TokenKind::Var)) {
|
|
CARBON_DIAGNOSTIC(ExpectedVarAfterReturned, Error,
|
|
"Expected `var` after `returned`.");
|
|
context.emitter().Emit(*context.position(), ExpectedVarAfterReturned);
|
|
context.AddLeafNode(NodeKind::EmptyDecl,
|
|
context.SkipPastLikelyEnd(returned_token),
|
|
/*has_error=*/true);
|
|
context.PopAndDiscardState();
|
|
return;
|
|
}
|
|
|
|
context.AddLeafNode(NodeKind::VariableIntroducer, context.Consume());
|
|
HandleVar(context, State::VarFinishAsDecl, returned_token);
|
|
}
|
|
|
|
auto HandleVarAsFor(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
// The finished variable declaration will start at the `var`.
|
|
context.PushState(state, State::VarFinishAsFor);
|
|
|
|
context.PushState(State::Pattern);
|
|
}
|
|
|
|
auto HandleVarAfterPattern(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (state.has_error) {
|
|
if (auto after_pattern =
|
|
context.FindNextOf({Lex::TokenKind::Equal, Lex::TokenKind::Semi})) {
|
|
context.SkipTo(*after_pattern);
|
|
}
|
|
}
|
|
|
|
if (context.PositionIs(Lex::TokenKind::Equal)) {
|
|
context.AddLeafNode(NodeKind::VariableInitializer,
|
|
context.ConsumeChecked(Lex::TokenKind::Equal));
|
|
context.PushState(State::Expr);
|
|
}
|
|
}
|
|
|
|
auto HandleVarFinishAsDecl(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
auto end_token = state.token;
|
|
if (context.PositionIs(Lex::TokenKind::Semi)) {
|
|
end_token = context.Consume();
|
|
} else {
|
|
// TODO: Disambiguate between statement and member declaration.
|
|
context.DiagnoseExpectedDeclSemi(Lex::TokenKind::Var);
|
|
state.has_error = true;
|
|
end_token = context.SkipPastLikelyEnd(state.token);
|
|
}
|
|
context.AddNode(NodeKind::VariableDecl, end_token, state.subtree_start,
|
|
state.has_error);
|
|
}
|
|
|
|
auto HandleVarFinishAsFor(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
auto end_token = state.token;
|
|
if (context.PositionIs(Lex::TokenKind::In)) {
|
|
end_token = context.Consume();
|
|
} else if (context.PositionIs(Lex::TokenKind::Colon)) {
|
|
CARBON_DIAGNOSTIC(ExpectedInNotColon, Error,
|
|
"`:` should be replaced by `in`.");
|
|
context.emitter().Emit(*context.position(), ExpectedInNotColon);
|
|
state.has_error = true;
|
|
end_token = context.Consume();
|
|
} else {
|
|
CARBON_DIAGNOSTIC(ExpectedIn, Error,
|
|
"Expected `in` after loop `var` declaration.");
|
|
context.emitter().Emit(*context.position(), ExpectedIn);
|
|
state.has_error = true;
|
|
}
|
|
|
|
context.AddNode(NodeKind::ForIn, end_token, state.subtree_start,
|
|
state.has_error);
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|