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
86 lines
3.4 KiB
C++
86 lines
3.4 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 PeriodAs variants and ArrowExpr.
|
|
// TODO: This currently only supports identifiers on the rhs, but will in the
|
|
// future need to handle things like `object.(Interface.member)` for qualifiers.
|
|
static auto HandlePeriodOrArrow(Context& context, NodeKind node_kind,
|
|
State paren_state, bool is_arrow) -> void {
|
|
auto state = context.PopState();
|
|
|
|
// We're handling `.something` or `->something`.
|
|
auto dot = context.ConsumeChecked(is_arrow ? Lex::TokenKind::MinusGreater
|
|
: Lex::TokenKind::Period);
|
|
|
|
if (context.ConsumeAndAddLeafNodeIf(Lex::TokenKind::Identifier,
|
|
NodeKind::IdentifierName)) {
|
|
// OK, `.` identifier.
|
|
} else if (context.ConsumeAndAddLeafNodeIf(Lex::TokenKind::Base,
|
|
NodeKind::BaseName)) {
|
|
// OK, `.base`.
|
|
} else if (paren_state != State::Invalid &&
|
|
context.PositionIs(Lex::TokenKind::OpenParen)) {
|
|
state.state = paren_state;
|
|
context.PushState(state);
|
|
context.PushState(State::OnlyParenExpr);
|
|
return;
|
|
} else {
|
|
CARBON_DIAGNOSTIC(ExpectedIdentifierAfterDotOrArrow, Error,
|
|
"Expected identifier after `{0}`.", llvm::StringLiteral);
|
|
context.emitter().Emit(
|
|
*context.position(), ExpectedIdentifierAfterDotOrArrow,
|
|
is_arrow ? llvm::StringLiteral("->") : llvm::StringLiteral("."));
|
|
// If we see a keyword, assume it was intended to be a name.
|
|
// TODO: Should keywords be valid here?
|
|
if (context.PositionKind().is_keyword()) {
|
|
context.AddLeafNode(NodeKind::IdentifierName, context.Consume(),
|
|
/*has_error=*/true);
|
|
} else {
|
|
context.AddLeafNode(NodeKind::IdentifierName, *context.position(),
|
|
/*has_error=*/true);
|
|
// Indicate the error to the parent state so that it can avoid producing
|
|
// more errors.
|
|
context.ReturnErrorOnState();
|
|
}
|
|
}
|
|
|
|
context.AddNode(node_kind, dot, state.subtree_start, state.has_error);
|
|
}
|
|
|
|
auto HandlePeriodAsExpr(Context& context) -> void {
|
|
HandlePeriodOrArrow(context, NodeKind::MemberAccessExpr,
|
|
State::CompoundMemberAccess,
|
|
/*is_arrow=*/false);
|
|
}
|
|
|
|
auto HandlePeriodAsStruct(Context& context) -> void {
|
|
HandlePeriodOrArrow(context, NodeKind::StructFieldDesignator, State::Invalid,
|
|
/*is_arrow=*/false);
|
|
}
|
|
|
|
auto HandleArrowExpr(Context& context) -> void {
|
|
HandlePeriodOrArrow(context, NodeKind::PointerMemberAccessExpr,
|
|
State::CompoundPointerMemberAccess,
|
|
/*is_arrow=*/true);
|
|
}
|
|
|
|
auto HandleCompoundMemberAccess(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
context.AddNode(NodeKind::MemberAccessExpr, state.token, state.subtree_start,
|
|
state.has_error);
|
|
}
|
|
|
|
auto HandleCompoundPointerMemberAccess(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
context.AddNode(NodeKind::PointerMemberAccessExpr, state.token,
|
|
state.subtree_start, state.has_error);
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|