mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 20:40:11 +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
102 lines
3.8 KiB
C++
102 lines
3.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 {
|
|
|
|
auto HandleFunctionIntroducer(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
context.PushState(state, State::FunctionAfterParams);
|
|
context.PushState(State::DeclNameAndParams, state.token);
|
|
}
|
|
|
|
auto HandleFunctionAfterParams(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
// Regardless of whether there's a return type, we'll finish the signature.
|
|
context.PushState(state, State::FunctionSignatureFinish);
|
|
|
|
// If there is a return type, parse the expression before adding the return
|
|
// type node.
|
|
if (context.PositionIs(Lex::TokenKind::MinusGreater)) {
|
|
context.PushState(State::FunctionReturnTypeFinish);
|
|
context.ConsumeAndDiscard();
|
|
context.PushStateForExpr(PrecedenceGroup::ForType());
|
|
}
|
|
}
|
|
|
|
auto HandleFunctionReturnTypeFinish(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.AddNode(NodeKind::ReturnType, state.token, state.subtree_start,
|
|
state.has_error);
|
|
}
|
|
|
|
auto HandleFunctionSignatureFinish(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
switch (context.PositionKind()) {
|
|
case Lex::TokenKind::Semi: {
|
|
context.AddNode(NodeKind::FunctionDecl, context.Consume(),
|
|
state.subtree_start, state.has_error);
|
|
break;
|
|
}
|
|
case Lex::TokenKind::OpenCurlyBrace: {
|
|
context.AddFunctionDefinitionStart(context.Consume(), state.subtree_start,
|
|
state.has_error);
|
|
// Any error is recorded on the FunctionDefinitionStart.
|
|
state.has_error = false;
|
|
context.PushState(state, State::FunctionDefinitionFinish);
|
|
context.PushState(State::StatementScopeLoop);
|
|
break;
|
|
}
|
|
case Lex::TokenKind::Equal: {
|
|
context.AddNode(NodeKind::BuiltinFunctionDefinitionStart,
|
|
context.Consume(), state.subtree_start, state.has_error);
|
|
if (!context.ConsumeAndAddLeafNodeIf(Lex::TokenKind::StringLiteral,
|
|
NodeKind::BuiltinName)) {
|
|
CARBON_DIAGNOSTIC(ExpectedBuiltinName, Error,
|
|
"Expected builtin function name after `=`.");
|
|
context.emitter().Emit(*context.position(), ExpectedBuiltinName);
|
|
state.has_error = true;
|
|
}
|
|
auto semi = context.ConsumeIf(Lex::TokenKind::Semi);
|
|
if (!semi && !state.has_error) {
|
|
context.DiagnoseExpectedDeclSemi(context.tokens().GetKind(state.token));
|
|
state.has_error = true;
|
|
}
|
|
if (state.has_error) {
|
|
context.RecoverFromDeclError(state, NodeKind::BuiltinFunctionDefinition,
|
|
/*skip_past_likely_end=*/true);
|
|
} else {
|
|
context.AddNode(NodeKind::BuiltinFunctionDefinition, *semi,
|
|
state.subtree_start, state.has_error);
|
|
}
|
|
break;
|
|
}
|
|
default: {
|
|
if (!state.has_error) {
|
|
context.DiagnoseExpectedDeclSemiOrDefinition(Lex::TokenKind::Fn);
|
|
}
|
|
// Only need to skip if we've not already found a new line.
|
|
bool skip_past_likely_end =
|
|
context.tokens().GetLine(*context.position()) ==
|
|
context.tokens().GetLine(state.token);
|
|
context.RecoverFromDeclError(state, NodeKind::FunctionDecl,
|
|
skip_past_likely_end);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
auto HandleFunctionDefinitionFinish(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
context.AddFunctionDefinition(context.Consume(), state.subtree_start,
|
|
state.has_error);
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|