[Parse] Improve parser diagnostics for keyword-as-identifer errors #6045
Conversation
This file contains hidden or 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
|
LGTM. This is really a marked improvement. @swift-ci please smoke test. |
jrose-apple
reviewed
Dec 13, 2016
| @@ -14,10 +14,6 @@ var bfx : Int, bfy : Int | |||
|
|
|||
| _ = 10 | |||
|
|
|||
| func _(_ x: Int) {} // expected-error {{keyword '_' cannot be used as an identifier here}} | |||
There was a problem hiding this comment.
What happened to this test case?
There was a problem hiding this comment.
I moved it to test/Parse/identifiers.swift where I added a number of related test cases.
There was a problem hiding this comment.
Ah, I missed that at the bottom there. Thanks!
|
Re-testing just in case. @swift-ci Please smoke test |
|
Merged. Thanks, Robin! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR improves the diagnostic output for parser errors where a Swift keyword is being used as an identifier.
Instead of the simple "expected identifier in declaration", the error will now read "keyword '%' cannot be used as an identifier here", and will be accompanied by a note suggesting escaping the keyword with backticks, as well as a fixit.
I started work on this after picking up SR-3167. When SR-3167 was created, Swift 3 was already exhibiting the desired behavior for the given example, so I decided to extent it other types of declarations as well.