mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-01 19: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
57 lines
3.3 KiB
Plaintext
57 lines
3.3 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: 'VariableIntroducer', text: 'var'},
|
|
// CHECK:STDOUT: {kind: 'Name', text: 'x'},
|
|
// CHECK:STDOUT: {kind: 'Literal', text: 'i32'},
|
|
// CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3},
|
|
// CHECK:STDOUT: {kind: 'VariableInitializer', text: '='},
|
|
// CHECK:STDOUT: {kind: 'StructLiteralOrStructTypeLiteralStart', text: '{'},
|
|
// CHECK:STDOUT: {kind: 'Name', text: 'a'},
|
|
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'Literal', text: '1'},
|
|
// CHECK:STDOUT: {kind: 'StructFieldValue', text: '=', subtree_size: 4},
|
|
// CHECK:STDOUT: {kind: 'StructComma', text: ','},
|
|
// CHECK:STDOUT: {kind: 'Name', text: 'b'},
|
|
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'StructFieldUnknown', text: '.', has_error: yes},
|
|
// CHECK:STDOUT: {kind: 'StructComma', text: ','},
|
|
// CHECK:STDOUT: {kind: 'Name', text: 'c'},
|
|
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'StructFieldUnknown', text: '.', has_error: yes},
|
|
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 14},
|
|
// CHECK:STDOUT: {kind: 'VariableDeclaration', text: ';', subtree_size: 20},
|
|
// CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'},
|
|
// CHECK:STDOUT: {kind: 'Name', text: 'x'},
|
|
// CHECK:STDOUT: {kind: 'Literal', text: 'i32'},
|
|
// CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3},
|
|
// CHECK:STDOUT: {kind: 'VariableInitializer', text: '='},
|
|
// CHECK:STDOUT: {kind: 'StructLiteralOrStructTypeLiteralStart', text: '{'},
|
|
// CHECK:STDOUT: {kind: 'Name', text: 'a'},
|
|
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'Literal', text: 'i32'},
|
|
// CHECK:STDOUT: {kind: 'StructFieldType', text: ':', subtree_size: 4},
|
|
// CHECK:STDOUT: {kind: 'StructComma', text: ','},
|
|
// CHECK:STDOUT: {kind: 'Name', text: 'b'},
|
|
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'StructFieldUnknown', text: '.', has_error: yes},
|
|
// CHECK:STDOUT: {kind: 'StructComma', text: ','},
|
|
// CHECK:STDOUT: {kind: 'Name', text: 'c'},
|
|
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'StructFieldUnknown', text: '.', has_error: yes},
|
|
// CHECK:STDOUT: {kind: 'StructTypeLiteral', text: '}', subtree_size: 14},
|
|
// CHECK:STDOUT: {kind: 'VariableDeclaration', text: ';', subtree_size: 20},
|
|
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
|
|
// CHECK:STDOUT: ]
|
|
|
|
// CHECK:STDERR: fail_mix_with_unknown.carbon:[[@LINE+2]]:25: Expected `.field = value`.
|
|
// CHECK:STDERR: fail_mix_with_unknown.carbon:[[@LINE+1]]:29: Expected `.field = value`.
|
|
var x: i32 = {.a = 1, .b, .c: i32};
|
|
|
|
// CHECK:STDERR: fail_mix_with_unknown.carbon:[[@LINE+2]]:26: Expected `.field: field_type`.
|
|
// CHECK:STDERR: fail_mix_with_unknown.carbon:[[@LINE+1]]:31: Expected `.field: field_type`.
|
|
var x: i32 = {.a: i32, .b, .c = 1};
|