mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-16 02:18:12 +00:00
Continuing on #3070. I moved ParseTree::Node to just Parse::Node, versus Parse::Tree::Node. Other name changes are just removing "Parse" or "Parser" prefixes. In EnumBase, I'm directly defining operator<< because the ostream.h approach just isn't working, not for either of Parse::State nor Parse::NodeKind. Errors look like: ```toolchain/parser/parser_context.cpp:449:34: error: invalid operands to binary expression ('llvm::raw_ostream' and 'const Carbon::Parse::State') output << "\t" << i << ".\t" << entry.state; ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^ ~~~~~~~~~~~ ``` The expected template in `Carbon::` is not in the error list; I only see the: ``` ./common/ostream.h:112:6: note: candidate template ignored: requirement 'std::is_base_of_v<std::ostream, llvm::raw_ostream>' was not satisfied [with S = llvm::raw_ostream, T = Carbon::Parse::State] auto operator<<(S& standard_out, const T& value) -> S& { ^ ``` I'm still prodding at this, but not seeing an obvious fix. --------- Co-authored-by: Richard Smith <richard@metafoo.co.uk>
96 lines
3.4 KiB
C++
96 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/parser/parser_context.h"
|
|
|
|
namespace Carbon::Parse {
|
|
|
|
auto HandleFunctionIntroducer(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
context.AddLeafNode(NodeKind::FunctionIntroducer, context.Consume());
|
|
|
|
state.state = State::FunctionAfterParameters;
|
|
context.PushState(state);
|
|
context.PushState(State::DeclarationNameAndParamsAsRequired, state.token);
|
|
}
|
|
|
|
auto HandleFunctionAfterParameters(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
|
|
// Regardless of whether there's a return type, we'll finish the signature.
|
|
state.state = State::FunctionSignatureFinish;
|
|
context.PushState(state);
|
|
|
|
// If there is a return type, parse the expression before adding the return
|
|
// type nod.e
|
|
if (context.PositionIs(TokenKind::MinusGreater)) {
|
|
context.PushState(State::FunctionReturnTypeFinish);
|
|
++context.position();
|
|
context.PushStateForExpression(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 TokenKind::Semi: {
|
|
context.AddNode(NodeKind::FunctionDeclaration, context.Consume(),
|
|
state.subtree_start, state.has_error);
|
|
break;
|
|
}
|
|
case TokenKind::OpenCurlyBrace: {
|
|
if (auto decl_context = context.GetDeclarationContext();
|
|
decl_context == Context::DeclarationContext::Interface ||
|
|
decl_context == Context::DeclarationContext::NamedConstraint) {
|
|
CARBON_DIAGNOSTIC(
|
|
MethodImplNotAllowed, Error,
|
|
"Method implementations are not allowed in interfaces.");
|
|
context.emitter().Emit(*context.position(), MethodImplNotAllowed);
|
|
context.RecoverFromDeclarationError(state,
|
|
NodeKind::FunctionDeclaration,
|
|
/*skip_past_likely_end=*/true);
|
|
break;
|
|
}
|
|
|
|
context.AddNode(NodeKind::FunctionDefinitionStart, context.Consume(),
|
|
state.subtree_start, state.has_error);
|
|
// Any error is recorded on the FunctionDefinitionStart.
|
|
state.has_error = false;
|
|
state.state = State::FunctionDefinitionFinish;
|
|
context.PushState(state);
|
|
context.PushState(State::StatementScopeLoop);
|
|
break;
|
|
}
|
|
default: {
|
|
if (!state.has_error) {
|
|
context.EmitExpectedDeclarationSemiOrDefinition(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.RecoverFromDeclarationError(state, NodeKind::FunctionDeclaration,
|
|
skip_past_likely_end);
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
|
|
auto HandleFunctionDefinitionFinish(Context& context) -> void {
|
|
auto state = context.PopState();
|
|
context.AddNode(NodeKind::FunctionDefinition, context.Consume(),
|
|
state.subtree_start, state.has_error);
|
|
}
|
|
|
|
} // namespace Carbon::Parse
|