carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 22:02:23 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Rename self/Self enums to SelfValueIdentifier/SelfTypeIdentifier (#2701)

Browse Source 
Using `Identifier` because `self` and `Self` will resolve to different things. While `i32` uses `Literal`, it'd always resolve to the same type.
This commit is contained in:
Jon Ross-Perkins
2023-03-22 10:07:09 -07:00
committed by GitHub
parent df289efac4
commit e89fb83e7e
11 changed files with 104 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parser/parser.cpp
+6 -6
View File
@@ -948,13 +948,13 @@ auto Parser::HandleExpressionInPostfixState() -> void {
PushState(ParserState::ParenExpression);
break;
}
case TokenKind::SelfParameter: {
AddLeafNode(ParseNodeKind::SelfIdentifier, Consume());
case TokenKind::SelfValueIdentifier: {
AddLeafNode(ParseNodeKind::SelfValueIdentifier, Consume());
PushState(state);
break;
}
case TokenKind::SelfType: {
AddLeafNode(ParseNodeKind::SelfType, Consume());
case TokenKind::SelfTypeIdentifier: {
AddLeafNode(ParseNodeKind::SelfTypeIdentifier, Consume());
PushState(state);
break;
}
@@ -1498,8 +1498,8 @@ auto Parser::HandlePattern(PatternKind pattern_kind) -> void {
if (auto identifier = ConsumeIf(TokenKind::Identifier)) {
AddLeafNode(ParseNodeKind::DeclaredName, *identifier);
} else if (pattern_kind == PatternKind::DeducedParameter) {
if (auto self = ConsumeIf(TokenKind::SelfParameter)) {
AddLeafNode(ParseNodeKind::SelfIdentifier, *self);
if (auto self = ConsumeIf(TokenKind::SelfValueIdentifier)) {
AddLeafNode(ParseNodeKind::SelfValueIdentifier, *self);
} else {
on_error();
return;