mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-01 21:45:58 +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
76 lines
3.9 KiB
Plaintext
76 lines
3.9 KiB
Plaintext
// 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
|
|
//
|
|
// AUTOUPDATE
|
|
// CHECK:STDOUT: [
|
|
// CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'},
|
|
// CHECK:STDOUT: {kind: 'Name', text: 'F'},
|
|
// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('},
|
|
// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
|
|
// CHECK:STDOUT: {kind: 'IfConditionStart', text: '('},
|
|
// CHECK:STDOUT: {kind: 'NameExpression', text: 'a'},
|
|
// CHECK:STDOUT: {kind: 'IfCondition', text: ')', subtree_size: 3},
|
|
// CHECK:STDOUT: {kind: 'CodeBlockStart', text: '{'},
|
|
// CHECK:STDOUT: {kind: 'IfConditionStart', text: '('},
|
|
// CHECK:STDOUT: {kind: 'NameExpression', text: 'b'},
|
|
// CHECK:STDOUT: {kind: 'IfCondition', text: ')', subtree_size: 3},
|
|
// CHECK:STDOUT: {kind: 'CodeBlockStart', text: '{'},
|
|
// CHECK:STDOUT: {kind: 'NameExpression', text: 'c'},
|
|
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'CodeBlock', text: '}', subtree_size: 4},
|
|
// CHECK:STDOUT: {kind: 'IfStatementElse', text: 'else'},
|
|
// CHECK:STDOUT: {kind: 'CodeBlockStart', text: '{'},
|
|
// CHECK:STDOUT: {kind: 'NameExpression', text: 'd'},
|
|
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'CodeBlock', text: '}', subtree_size: 4},
|
|
// CHECK:STDOUT: {kind: 'IfStatement', text: 'if', subtree_size: 13},
|
|
// CHECK:STDOUT: {kind: 'CodeBlock', text: '}', subtree_size: 15},
|
|
// CHECK:STDOUT: {kind: 'IfStatementElse', text: 'else'},
|
|
// CHECK:STDOUT: {kind: 'CodeBlockStart', text: '{'},
|
|
// CHECK:STDOUT: {kind: 'NameExpression', text: 'e'},
|
|
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'CodeBlock', text: '}', subtree_size: 4},
|
|
// CHECK:STDOUT: {kind: 'IfStatement', text: 'if', subtree_size: 24},
|
|
// CHECK:STDOUT: {kind: 'IfConditionStart', text: '('},
|
|
// CHECK:STDOUT: {kind: 'NameExpression', text: 'x'},
|
|
// CHECK:STDOUT: {kind: 'IfCondition', text: ')', subtree_size: 3},
|
|
// CHECK:STDOUT: {kind: 'CodeBlockStart', text: '{'},
|
|
// CHECK:STDOUT: {kind: 'NameExpression', text: 'f'},
|
|
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'CodeBlock', text: '}', subtree_size: 4},
|
|
// CHECK:STDOUT: {kind: 'IfStatementElse', text: 'else'},
|
|
// CHECK:STDOUT: {kind: 'IfConditionStart', text: '('},
|
|
// CHECK:STDOUT: {kind: 'NameExpression', text: 'x'},
|
|
// CHECK:STDOUT: {kind: 'IfCondition', text: ')', subtree_size: 3},
|
|
// CHECK:STDOUT: {kind: 'CodeBlockStart', text: '{'},
|
|
// CHECK:STDOUT: {kind: 'NameExpression', text: 'g'},
|
|
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'CodeBlock', text: '}', subtree_size: 4},
|
|
// CHECK:STDOUT: {kind: 'IfStatementElse', text: 'else'},
|
|
// CHECK:STDOUT: {kind: 'CodeBlockStart', text: '{'},
|
|
// CHECK:STDOUT: {kind: 'NameExpression', text: 'h'},
|
|
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'CodeBlock', text: '}', subtree_size: 4},
|
|
// CHECK:STDOUT: {kind: 'IfStatement', text: 'if', subtree_size: 13},
|
|
// CHECK:STDOUT: {kind: 'IfStatement', text: 'if', subtree_size: 22},
|
|
// CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', subtree_size: 52},
|
|
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
|
|
// CHECK:STDOUT: ]
|
|
|
|
fn F() {
|
|
if (a) {
|
|
if (b) {
|
|
c;
|
|
} else {
|
|
d;
|
|
}
|
|
} else {
|
|
e;
|
|
}
|
|
if (x) { f; }
|
|
else if (x) { g; }
|
|
else { h; }
|
|
}
|