mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-27 11:40:10 +01:00
Jon Ross-Perkins
b2084ea15d
This PR renames parse nodes on a Name/NameExpression taxonomy. NameExpressions occur in a name context. The difference is that in non-expression contexts it's useful to return the identifier / string ID for adding to name lookup, whereas in expression contexts it's useful to return the resolved node ID for consistency with other expressions. In the code, I do note SelfValueName is returned in the expression context: I'd expect this to change, as `self` in `[self: Self]` versus `self.Foo()` will probably be best handled similarly to the above. That means that, in the proposed taxonomy, both `SelfValueName` and `SelfValueNameExpression` will exist in order to assist semantics. To contrast choices: Original | Current | [zygoloid suggestion](https://discord.com/channels/655572317891461132/655578254970716160/1121581663399464970) | [This PR](https://discord.com/channels/655572317891461132/655578254970716160/1121814551789318215) --- | --- | --- | --- DeclaredName/DesignatedName | Identifier | NameComponent | Name NameReference | NameReference | NameReference | NameExpression SelfValueIdentifier | SelfValueIdentifier | SelfValueReference | SelfValueName SelfTypeIdentifier | SelfTypeIdentiifer | SelfTypeReference | SelfTypeNameExpression
65 lines
2.5 KiB
C++
65 lines
2.5 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 {
|
|
|
|
// Handles DeclarationNameAndParamsAs(Optional|Required).
|
|
static auto ParserHandleDeclarationNameAndParams(ParserContext& context,
|
|
bool params_required) -> void {
|
|
auto state = context.PopState();
|
|
|
|
if (!context.ConsumeAndAddLeafNodeIf(TokenKind::Identifier,
|
|
ParseNodeKind::Name)) {
|
|
CARBON_DIAGNOSTIC(ExpectedDeclarationName, Error,
|
|
"`{0}` introducer should be followed by a name.",
|
|
TokenKind);
|
|
context.emitter().Emit(*context.position(), ExpectedDeclarationName,
|
|
context.tokens().GetKind(state.token));
|
|
context.ReturnErrorOnState();
|
|
return;
|
|
}
|
|
|
|
if (context.PositionIs(TokenKind::OpenSquareBracket)) {
|
|
context.PushState(ParserState::DeclarationNameAndParamsAfterDeduced);
|
|
context.PushState(ParserState::ParameterListAsDeduced);
|
|
} else if (context.PositionIs(TokenKind::OpenParen)) {
|
|
context.PushState(ParserState::ParameterListAsRegular);
|
|
} else if (params_required) {
|
|
CARBON_DIAGNOSTIC(ParametersRequiredByIntroducer, Error,
|
|
"`{0}` requires a `(` for parameters.", TokenKind);
|
|
context.emitter().Emit(*context.position(), ParametersRequiredByIntroducer,
|
|
context.tokens().GetKind(state.token));
|
|
context.ReturnErrorOnState();
|
|
}
|
|
}
|
|
|
|
auto ParserHandleDeclarationNameAndParamsAsOptional(ParserContext& context)
|
|
-> void {
|
|
ParserHandleDeclarationNameAndParams(context, /*params_required=*/false);
|
|
}
|
|
|
|
auto ParserHandleDeclarationNameAndParamsAsRequired(ParserContext& context)
|
|
-> void {
|
|
ParserHandleDeclarationNameAndParams(context, /*params_required=*/true);
|
|
}
|
|
|
|
auto ParserHandleDeclarationNameAndParamsAfterDeduced(ParserContext& context)
|
|
-> void {
|
|
context.PopAndDiscardState();
|
|
|
|
if (context.PositionIs(TokenKind::OpenParen)) {
|
|
context.PushState(ParserState::ParameterListAsRegular);
|
|
} else {
|
|
CARBON_DIAGNOSTIC(
|
|
ParametersRequiredByDeduced, Error,
|
|
"A `(` for parameters is required after deduced parameters.");
|
|
context.emitter().Emit(*context.position(), ParametersRequiredByDeduced);
|
|
context.ReturnErrorOnState();
|
|
}
|
|
}
|
|
|
|
} // namespace Carbon
|