mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-27 16:40:10 +01:00
Jon Ross-Perkins
11deb14dc6
The problem I'm trying to solve is: `var x: i32 = x;`. This change makes it so that name lookup fails, by removing `x` from name lookup between the `=` and `;`. `var x: i32` still adds to name lookup to handle future situations like `var (x: i32, x: i32);` which is still a redefinition of `x`; if we don't add `x` to name lookup, it gets harder to catch that example. The VariableDeclaration/VariableInitializer refactor in ParseTree supports this by given a bracketing-like structure for semantics to cue that it's entering an initialization expression. With this, VariableInitializer can remove the name lookup and queue it to be restored. VariableDeclaration doesn't need to change too much since it's still bracketed by VariableIntroducer, and so we just traverse slightly differently. Note this also incidentally changes a little about NameReference, that it's returning the storage consistently instead of the name. You can see this e.g. in global_lookup.carbon, `Assign(node8, node4): node2;` using node4 (VarStorage) instead of Node5 (BindName). Really either _could_ work, since from a BindName we can get to the VarStorage, and that may be reason to switch later if we find it preferable to have the BindName for whatever reason. But the *actual* value in NameLookup is a BindName so that errors can associate with the _name_ instead of the "storage" parse node, which is currently the `:`. This is mainly for fail_duplicate_decl.carbon, which has a "Previous definition" note that points at the storage's parse node.
31 lines
1.7 KiB
Plaintext
31 lines
1.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
|
|
// RUN: %{not} %{carbon-run-parser}
|
|
// CHECK:STDOUT: [
|
|
// CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'},
|
|
// CHECK:STDOUT: {kind: 'DeclaredName', text: 'x'},
|
|
// CHECK:STDOUT: {kind: 'StructLiteralOrStructTypeLiteralStart', text: '{'},
|
|
// CHECK:STDOUT: {kind: 'DesignatedName', text: '"hello"', has_error: yes},
|
|
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'Literal', text: '0'},
|
|
// CHECK:STDOUT: {kind: 'StructFieldUnknown', text: '=', has_error: yes},
|
|
// CHECK:STDOUT: {kind: 'StructComma', text: ','},
|
|
// CHECK:STDOUT: {kind: 'DesignatedName', text: 'y'},
|
|
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'Literal', text: '4'},
|
|
// CHECK:STDOUT: {kind: 'StructFieldValue', text: '=', subtree_size: 4},
|
|
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 11},
|
|
// CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 13},
|
|
// CHECK:STDOUT: {kind: 'VariableInitializer', text: '='},
|
|
// CHECK:STDOUT: {kind: 'StructLiteralOrStructTypeLiteralStart', text: '{'},
|
|
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'VariableDeclaration', text: ';', subtree_size: 18},
|
|
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
|
|
// CHECK:STDOUT: ]
|
|
|
|
// CHECK:STDERR: {{.*}}/toolchain/parser/testdata/struct/fail_dot_string_equals.carbon:[[@LINE+1]]:10: Expected identifier after `.`.
|
|
var x: {."hello" = 0, .y = 4} = {};
|