Simplify checking if a token can be an argument label #1911
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
bnbarham
approved these changes
Jul 17, 2023
Sources/SwiftParser/Names.swift
Outdated
| case .identifier, .wildcard: | ||
| // Identifiers, escaped identifiers, and '_' can be argument labels. | ||
| return true | ||
| case .dollarIdentifier: | ||
| return allowDollarIdentifier | ||
| case .keyword(.inout): | ||
| // `inout` is reserved as an argument label for historical reasons. |
There was a problem hiding this comment.
I realize this is copied from above, but wouldn't this make it not reserved, ie. inout cannot be an argument label?
| @@ -235,19 +235,50 @@ extension Parser { | |||
| mutating func parseSimpleType( | |||
| stopAtFirstPeriod: Bool = false | |||
| ) -> RawTypeSyntax { | |||
| enum TypeBaseStart: TokenSpecSet { | |||
There was a problem hiding this comment.
Maybe a stupid question: is it possible to use one of the generated ones?
There was a problem hiding this comment.
I don’t think there’s any one that has these cases because we do walk into different parsing functions based on the token, similar to ExpressionModifierKeyword.
ahoppen
force-pushed
the
ahoppen/isargumentlabel
branch
from
4b4ae9c to
0664c79
Compare
|
@swift-ci Please test |
kimdv
approved these changes
Jul 18, 2023
Sources/SwiftParser/Types.swift
Outdated
| case .wildcard: return .wildcard | ||
| } | ||
| } | ||
|
|
| @@ -235,19 +235,50 @@ extension Parser { | |||
| mutating func parseSimpleType( | |||
| stopAtFirstPeriod: Bool = false | |||
| ) -> RawTypeSyntax { | |||
| enum TypeBaseStart: TokenSpecSet { | |||
There was a problem hiding this comment.
Maybe a stupid question: is it possible to use one of the generated ones?
ahoppen
force-pushed
the
ahoppen/isargumentlabel
branch
from
0664c79 to
00845be
Compare
ahoppen
force-pushed
the
ahoppen/isargumentlabel
branch
from
00845be to
011f790
Compare
|
@swift-ci Please test |
|
@swift-ci Please test Windows |
kimdv
approved these changes
Jul 23, 2023
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.
Mostly, change
self.currentToken.canBeArgumentLabeltoself.atArgumentLabel.Also some other miscellaneous smaller improvements in the parser.