Disallow multi-line filenames and non-decimal line numbers in #sourceLocation directive in Swift 6 mode
#71238
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
Non-decimal line numbers in a `#sourceLocation` directive are simply confusing in my opinion and should be banned.
ahoppen
requested review from
bnbarham,
CodaFi,
DougGregor,
hamishknight and
rintaro
as code owners
hamishknight
approved these changes
Jan 30, 2024
test/Parse/line-directive.swift
Outdated
Comment on lines
17
to
27
| // expected-warning@+1 {{expected starting line number for #sourceLocation directive; this is an error in Swift 6}} | ||
| #sourceLocation(file: "x.swift", line: 0xff) | ||
|
|
||
| #sourceLocation() | ||
|
|
||
| // expected-warning@+1 {{'#sourceLocation' cannot be a multiline string literal; this is an error in Swift 6}} | ||
| #sourceLocation(file: """ | ||
| x.swift | ||
| y.swift | ||
| """, line: 42) | ||
|
|
There was a problem hiding this comment.
Would it be worth adding tests for the error variants of these?
There was a problem hiding this comment.
I don’t think that’s necessary. The this is an error in Swift 6 is generated automatically by the warnUntilSwiftVersion(6) and should just work.
test/Parse/line-directive.swift
Outdated
Comment on lines
22
to
26
| // expected-warning@+1 {{'#sourceLocation' cannot be a multiline string literal; this is an error in Swift 6}} | ||
| #sourceLocation(file: """ | ||
| x.swift | ||
| y.swift | ||
| """, line: 42) |
There was a problem hiding this comment.
For e.g #sourceLocation(file: "a\nb", line: 42), seems we just take the characters literally, not sure if we ought to ban escape sequences too to avoid confusion.
There was a problem hiding this comment.
Hmm, interesting. Let’s consider that a separate issue though. It’s probably not worth fixing it in the old parser anyway.
ahoppen
force-pushed
the
ahoppen/source-location-parser-changes
branch
from
b133f5f to
e6b41b7
Compare
|
@swift-ci Please smoke test |
…ation and similar locations This should allow us to eventually simplify parsing of simple string literals in the new parse by not having to handle indentation of multiline string literals.
ahoppen
force-pushed
the
ahoppen/source-location-parser-changes
branch
from
e6b41b7 to
4a386d4
Compare
|
@swift-ci Please smoke test |
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.
#sourceLocationdirective#sourceLocationdirective are simply confusing in my opinion and should be banned.