Parse versions as three integer tokens #1440
Merged
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
|
@swift-ci Please test |
grynspan
reviewed
Mar 24, 2023
grynspan
reviewed
Mar 24, 2023
grynspan
reviewed
Mar 24, 2023
ahoppen
force-pushed
the
ahoppen/version-parsing
branch
from
abd7eeb to
cbf27d5
Compare
grynspan
reviewed
Mar 24, 2023
ahoppen
force-pushed
the
ahoppen/version-parsing
branch
from
cbf27d5 to
0a57b4e
Compare
|
@swift-ci Please test |
bnbarham
reviewed
Mar 24, 2023
| ) | ||
| ) | ||
| ) | ||
|
|
There was a problem hiding this comment.
Worth having custom diagnostics for these? It would be nice if the non-digit-containing token was unexpected within the version tuple rather than ending up as unexpected within the attribute when there's no space after ..
There was a problem hiding this comment.
My judgment was that the diagnostics were sufficiently good for now.
ahoppen
force-pushed
the
ahoppen/version-parsing
branch
from
0a57b4e to
10ef365
Compare
|
@swift-ci Please test |
bnbarham
approved these changes
Mar 25, 2023
grynspan
approved these changes
Mar 25, 2023
|
@swift-ci Please test Windows |
rintaro
reviewed
Mar 27, 2023
| name: "MajorMinor", | ||
| kind: .token(choices: [.token(tokenKind: "IntegerLiteralToken"), .token(tokenKind: "FloatingLiteralToken")]), | ||
| description: "In case the version consists only of the major version, an integer literal that specifies the major version. In case the version consists of major and minor version number, a floating literal in which the decimal part is interpreted as the minor version." | ||
| name: "Major", |
There was a problem hiding this comment.
Only "patch" has the name "PatchVersion" we should be consistent
Previously, internals from the lexer leaked through by representing the major and minor part of the version as a float literal. Also, we accepted non-decimal numbers (eg. hex) for version number, which we don’t want. Fixes swiftlang#1434 rdar://107152155
ahoppen
force-pushed
the
ahoppen/version-parsing
branch
from
10ef365 to
47a8dcd
Compare
|
@swift-ci Please test |
|
@swift-ci Please test Windows |
rintaro
approved these changes
Mar 28, 2023
ahoppen
added a commit
to ahoppen/swift-syntax
that referenced
this pull request
Mar 31, 2023
Parse versions as three integer tokens
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.
Previously, internals from the lexer leaked through by representing the major and minor part of the version as a float literal. Also, we accepted non-decimal numbers (eg. hex) for version number, which we don’t want.
Fixes #1434
rdar://107152155