Skip to content

Commit

Permalink
Report invalid parse on var x: i32 = {.7 = 8} (#4237)
Browse files Browse the repository at this point in the history
  • Loading branch information
brymer-meneses authored Aug 22, 2024
1 parent 4293c9f commit 435ee44
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 1 deletion.
3 changes: 2 additions & 1 deletion toolchain/parse/handle_period.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ static auto HandlePeriodOrArrow(Context& context, NodeKind node_kind,
} else if (context.ConsumeAndAddLeafNodeIf(Lex::TokenKind::Base,
NodeKind::BaseName)) {
// OK, `.base`.
} else if (context.ConsumeAndAddLeafNodeIf(Lex::TokenKind::IntLiteral,
} else if (node_kind != NodeKind::StructFieldDesignator &&
context.ConsumeAndAddLeafNodeIf(Lex::TokenKind::IntLiteral,
NodeKind::IntLiteral)) {
// OK, '.42'.
} else if (paren_state != State::Invalid &&
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// 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
// TIP: To test this file alone, run:
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/parse/testdata/struct/fail_invalid_struct_designator.carbon
// TIP: To dump output, run:
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/parse/testdata/struct/fail_invalid_struct_designator.carbon

// CHECK:STDERR: fail_invalid_struct_designator.carbon:[[@LINE+3]]:16: ERROR: Expected identifier after `.`.
// CHECK:STDERR: var x: i32 = {.7 = 8};
// CHECK:STDERR: ^
var x: i32 = {.7 = 8};

// CHECK:STDOUT: - filename: fail_invalid_struct_designator.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'},
// CHECK:STDOUT: {kind: 'IdentifierName', text: 'x'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'BindingPattern', text: ':', subtree_size: 3},
// CHECK:STDOUT: {kind: 'VariableInitializer', text: '='},
// CHECK:STDOUT: {kind: 'StructLiteralStart', text: '{'},
// CHECK:STDOUT: {kind: 'IdentifierName', text: '7', has_error: yes},
// CHECK:STDOUT: {kind: 'StructFieldDesignator', text: '.', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IntLiteral', text: '8'},
// CHECK:STDOUT: {kind: 'InvalidParse', text: '=', has_error: yes},
// CHECK:STDOUT: {kind: 'StructLiteral', text: '}', has_error: yes, subtree_size: 6},
// CHECK:STDOUT: {kind: 'VariableDecl', text: ';', subtree_size: 12},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]

0 comments on commit 435ee44

Please sign in to comment.