mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-03 22:02:51 +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
49 lines
1.8 KiB
C++
49 lines
1.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/parser/parser_context.h"
|
|
|
|
namespace Carbon {
|
|
|
|
// Handles DesignatorAs.
|
|
auto ParserHandleDesignator(ParserContext& context, bool as_struct) -> void {
|
|
auto state = context.PopState();
|
|
|
|
// `.` identifier
|
|
auto dot = context.ConsumeChecked(TokenKind::Period);
|
|
|
|
if (!context.ConsumeAndAddLeafNodeIf(TokenKind::Identifier,
|
|
ParseNodeKind::Name)) {
|
|
CARBON_DIAGNOSTIC(ExpectedIdentifierAfterDot, Error,
|
|
"Expected identifier after `.`.");
|
|
context.emitter().Emit(*context.position(), ExpectedIdentifierAfterDot);
|
|
// If we see a keyword, assume it was intended to be the designated name.
|
|
// TODO: Should keywords be valid in designators?
|
|
if (context.PositionKind().is_keyword()) {
|
|
context.AddLeafNode(ParseNodeKind::Name, context.Consume(),
|
|
/*has_error=*/true);
|
|
} else {
|
|
context.AddLeafNode(ParseNodeKind::Name, *context.position(),
|
|
/*has_error=*/true);
|
|
// Indicate the error to the parent state so that it can avoid producing
|
|
// more errors.
|
|
context.ReturnErrorOnState();
|
|
}
|
|
}
|
|
|
|
context.AddNode(as_struct ? ParseNodeKind::StructFieldDesignator
|
|
: ParseNodeKind::DesignatorExpression,
|
|
dot, state.subtree_start, state.has_error);
|
|
}
|
|
|
|
auto ParserHandleDesignatorAsExpression(ParserContext& context) -> void {
|
|
ParserHandleDesignator(context, /*as_struct=*/false);
|
|
}
|
|
|
|
auto ParserHandleDesignatorAsStruct(ParserContext& context) -> void {
|
|
ParserHandleDesignator(context, /*as_struct=*/true);
|
|
}
|
|
|
|
} // namespace Carbon
|