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
82 lines
2.8 KiB
C++
82 lines
2.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 {
|
|
|
|
static auto ExpectAsOrTypeExpression(Context& context) -> void {
|
|
if (context.PositionIs(Lex::TokenKind::As)) {
|
|
// as <expression> ...
|
|
context.AddLeafNode(NodeKind::DefaultSelfImplAs, context.Consume());
|
|
context.PushState(State::Expr);
|
|
} else {
|
|
// <expression> as <expression>...
|
|
context.PushState(State::ImplBeforeAs);
|
|
context.PushStateForExpr(PrecedenceGroup::ForImplAs());
|
|
}
|
|
}
|
|
|
|
auto HandleImplAfterIntroducer(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
state.state = State::DeclOrDefinitionAsImpl;
|
|
context.PushState(state);
|
|
|
|
if (context.PositionIs(Lex::TokenKind::Forall)) {
|
|
// forall [<implicit parameter list>] ...
|
|
context.PushState(State::ImplAfterForall);
|
|
context.ConsumeAndDiscard();
|
|
if (context.PositionIs(Lex::TokenKind::OpenSquareBracket)) {
|
|
context.PushState(State::PatternListAsImplicit);
|
|
} else {
|
|
CARBON_DIAGNOSTIC(ImplExpectedAfterForall, Error,
|
|
"Expected `[` after `forall` in `impl` declaration.");
|
|
context.emitter().Emit(*context.position(), ImplExpectedAfterForall);
|
|
context.ReturnErrorOnState();
|
|
// If we aren't producing a node from the PatternListAsImplicit state,
|
|
// we still need to create a node to be the child of the `ImplForall`
|
|
// token created in the `ImplAfterForall` state.
|
|
context.AddLeafNode(NodeKind::InvalidParse, *context.position(),
|
|
/*has_error=*/true);
|
|
}
|
|
} else {
|
|
// One of:
|
|
// as <expression> ...
|
|
// <expression> as <expression>...
|
|
ExpectAsOrTypeExpression(context);
|
|
}
|
|
}
|
|
|
|
auto HandleImplAfterForall(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
if (state.has_error) {
|
|
context.ReturnErrorOnState();
|
|
}
|
|
context.AddNode(NodeKind::ImplForall, state.token, state.subtree_start,
|
|
state.has_error);
|
|
// One of:
|
|
// as <expression> ...
|
|
// <expression> as <expression>...
|
|
ExpectAsOrTypeExpression(context);
|
|
}
|
|
|
|
auto HandleImplBeforeAs(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
if (auto as = context.ConsumeIf(Lex::TokenKind::As)) {
|
|
context.AddNode(NodeKind::TypeImplAs, *as, state.subtree_start,
|
|
state.has_error);
|
|
context.PushState(State::Expr);
|
|
} else {
|
|
if (!state.has_error) {
|
|
CARBON_DIAGNOSTIC(ImplExpectedAs, Error,
|
|
"Expected `as` in `impl` declaration.");
|
|
context.emitter().Emit(*context.position(), ImplExpectedAs);
|
|
}
|
|
context.ReturnErrorOnState();
|
|
}
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|