Shift Parser from 'Identifier' to 'Name' naming (#2947)

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
This commit is contained in:
Jon Ross-Perkins authored and GitHub committed 2023-06-26 15:49:57 -07:00
1 parent 3a9bc01ec4
commit b2084ea15d
156 files changed
+548 -549

No files matched your search

@@ -14,17 +14,17 @@ auto ParserHandleDesignator(ParserContext& context, bool as_struct) -> void {
auto dot = context.ConsumeChecked(TokenKind::Period);
if (!context.ConsumeAndAddLeafNodeIf(TokenKind::Identifier,
ParseNodeKind::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::Identifier, context.Consume(),
context.AddLeafNode(ParseNodeKind::Name, context.Consume(),
/*has_error=*/true);
} else {
context.AddLeafNode(ParseNodeKind::Identifier, *context.position(),
context.AddLeafNode(ParseNodeKind::Name, *context.position(),
/*has_error=*/true);
// Indicate the error to the parent state so that it can avoid producing
// more errors.