mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-29 19:15:00 +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
48 lines
2.7 KiB
Plaintext
48 lines
2.7 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: 'InterfaceIntroducer', text: 'interface'},
|
|
// CHECK:STDOUT: {kind: 'Name', text: 'Foo'},
|
|
// CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 3},
|
|
// CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'},
|
|
// CHECK:STDOUT: {kind: 'Name', text: 'Add'},
|
|
// CHECK:STDOUT: {kind: 'DeducedParameterListStart', text: '['},
|
|
// CHECK:STDOUT: {kind: 'SelfValueName', text: 'self'},
|
|
// CHECK:STDOUT: {kind: 'SelfTypeNameExpression', text: 'Self'},
|
|
// CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3},
|
|
// CHECK:STDOUT: {kind: 'DeducedParameterList', text: ']', subtree_size: 5},
|
|
// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('},
|
|
// CHECK:STDOUT: {kind: 'Name', text: 'b'},
|
|
// CHECK:STDOUT: {kind: 'SelfTypeNameExpression', text: 'Self'},
|
|
// CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3},
|
|
// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5},
|
|
// CHECK:STDOUT: {kind: 'SelfTypeNameExpression', text: 'Self'},
|
|
// CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'FunctionDeclaration', text: ';', subtree_size: 15},
|
|
// CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'},
|
|
// CHECK:STDOUT: {kind: 'Name', text: 'Add'},
|
|
// CHECK:STDOUT: {kind: 'DeducedParameterListStart', text: '['},
|
|
// CHECK:STDOUT: {kind: 'SelfValueName', text: 'self'},
|
|
// CHECK:STDOUT: {kind: 'NameExpression', text: 'foo'},
|
|
// CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3},
|
|
// CHECK:STDOUT: {kind: 'DeducedParameterList', text: ']', subtree_size: 5},
|
|
// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('},
|
|
// CHECK:STDOUT: {kind: 'Name', text: 'b'},
|
|
// CHECK:STDOUT: {kind: 'SelfTypeNameExpression', text: 'Self'},
|
|
// CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3},
|
|
// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5},
|
|
// CHECK:STDOUT: {kind: 'SelfTypeNameExpression', text: 'Self'},
|
|
// CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'FunctionDeclaration', text: ';', subtree_size: 15},
|
|
// CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 34},
|
|
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
|
|
// CHECK:STDOUT: ]
|
|
|
|
interface Foo {
|
|
fn Add[self: Self](b: Self) -> Self;
|
|
fn Add[self: foo](b: Self) -> Self;
|
|
}
|