-
Notifications
You must be signed in to change notification settings - Fork 1.5k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
On invalid parse nodes, if the token may vary, allow any token. (#3484)
Note #3486 rewrites the macro behavior, and is already approved: so this PR is only for the changed enforcement during error. Also, #3493 already changed several things to allow any token while this PR was awaiting review, but this still changes enforcement for `For` and `If`. This was brought up on [#toolchain](https://discord.com/channels/655572317891461132/655578254970716160/1182066616456970251), and I think this any-on-error approach gets at least some support. We could try setting it to the introducer, but it's quite possible we want it to be something like the token which led to the parse error, rather than a static token. That leads to a conclusion that, most typically, we'll expect arbitrary tokens when error conditions may lead to tokens which aren't the expected token. A couple related, recent `CARBON_IF_ERROR` crash fixes can be found in #3404 and #3424. Something like #3404 would've been needed regardless because `namespace` didn't have `CARBON_IF_ERROR` before, although I might've missed the underlying issue with declarations because only `namespace` had a relevant test (that is, if #3404 had added `CARBON_ANY_TOKEN_ON_ERROR`, I wouldn't have had a crash in #3462). #3424 would've been avoided with this change because there was a `CARBON_IF_ERROR`, and it was just too restrictive.
- Loading branch information
Showing
4 changed files
with
105 additions
and
71 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| // 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 | ||
|
|
||
| virtual class B | ||
|
|
||
| // CHECK:STDERR: fail_modifiers.carbon:[[@LINE+6]]:1: ERROR: `virtual` declarations must either end with a `;` or have a `{ ... }` block for a definition. | ||
| // CHECK:STDERR: impl class | ||
| // CHECK:STDERR: ^~~~ | ||
| // CHECK:STDERR: fail_modifiers.carbon:[[@LINE+3]]:6: ERROR: `class` introducer should be followed by a name. | ||
| // CHECK:STDERR: impl class | ||
| // CHECK:STDERR: ^~~~~ | ||
| impl class | ||
|
|
||
| // CHECK:STDOUT: - filename: fail_modifiers.carbon | ||
| // CHECK:STDOUT: parse_tree: [ | ||
| // CHECK:STDOUT: {kind: 'FileStart', text: ''}, | ||
| // CHECK:STDOUT: {kind: 'ClassIntroducer', text: 'class'}, | ||
| // CHECK:STDOUT: {kind: 'VirtualModifier', text: 'virtual'}, | ||
| // CHECK:STDOUT: {kind: 'IdentifierName', text: 'B'}, | ||
| // CHECK:STDOUT: {kind: 'ClassDecl', text: 'impl', has_error: yes, subtree_size: 4}, | ||
| // CHECK:STDOUT: {kind: 'ClassIntroducer', text: 'class'}, | ||
| // CHECK:STDOUT: {kind: 'InvalidParse', text: '', has_error: yes}, | ||
| // CHECK:STDOUT: {kind: 'ClassDecl', text: 'class', has_error: yes, subtree_size: 3}, | ||
| // CHECK:STDOUT: {kind: 'FileEnd', text: ''}, | ||
| // CHECK:STDOUT: ] |
Oops, something went wrong.