Don't declare attribute names as keywords #2486
Open
Conversation
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
They were declared as `Keyword` only for `TokenSpecs` (DeclarationAttributeWithSpecialSyntax and TypeAttribute), the attribute names are always parsed as `TypeSyntax` so those keywords weren't even appear in the parsed syntax tree. Instead, make those `TokenSpecSet` to accept `.identifier` lexemes.
|
@swift-ci Please test |
|
@swift-ci Please test |
rintaro
commented
Feb 8, 2024
Sources/SwiftParser/Attributes.swift
Outdated
| } | ||
| case .identifier: | ||
| switch lexeme.tokenText { | ||
| case "_alignment": self = ._alignment |
There was a problem hiding this comment.
I'm leaning toward making TokenSpec for fixed text. I.e. TokenSpec("_alignment").
rintaro
force-pushed
the
parse-attrkeywords
branch
from
73afa81
to
655cd79
Compare
Matches a specific tokenText. Use it in decl/type attribute TokenSpecSet.
rintaro
force-pushed
the
parse-attrkeywords
branch
from
655cd79
to
dbcc021
Compare
|
The last commit implements |
|
@swift-ci Please test |
ahoppen
reviewed
Feb 9, 2024
Comment on lines
+64
to
+65
| /// `fileprivate` because only functions in this file should access it since | ||
| /// they know how to handle the identifier -> keyword remapping. |
There was a problem hiding this comment.
This comment doesn’t really make sense on an enum case.
| return TokenSpec(keyword) | ||
| } | ||
|
|
||
| static func fixedText(_ text: SyntaxText) -> TokenSpec { |
There was a problem hiding this comment.
I think it would be good to add a short comment that explains when somebody should use fixedText vs adding a keyword. The chance of misuse seems quite high to me.
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.
They were declared as
Keywordonly forTokenSpecs(DeclarationAttributeWithSpecialSyntax and TypeAttribute), the attribute names are always parsed asTypeSyntaxso those keywords weren't even appear in the parsed syntax tree.Instead, make those
TokenSpecSetto accept.identifierlexemes with specific token text.