[Variadic Generics] distinctly diagnose more types of pack expansion errors #64447
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
sophiapoirier
requested review from
hborla,
slavapestov,
xedin and
AnthonyLatsis
as code owners
slavapestov
reviewed
Mar 17, 2023
include/swift/Basic/SourceLoc.h
Outdated
| @@ -157,7 +157,7 @@ class SourceRange { | |||
| /// A half-open character-based source range. | |||
| class CharSourceRange { | |||
| SourceLoc Start; | |||
| unsigned ByteLength; | |||
| unsigned ByteLength{}; | |||
| @@ -5310,8 +5310,8 @@ ERROR(vararg_not_allowed,none, | |||
| "variadic parameter cannot appear outside of a function parameter list", | |||
| ()) | |||
| ERROR(expansion_not_allowed,none, | |||
| "pack expansion %0 cannot appear outside of a function parameter list, " | |||
| "function result, tuple element or generic argument list", (Type)) | |||
| "pack expansion repeat each %0 can only appear in a function parameter list, " | |||
There was a problem hiding this comment.
Instead of writing 'repeat each' in the diagnostic, which looks funny: repeat each 'T', can you create a PackExpansionType and pass it as %0 to the diagnostic? Then it will say 'repeat each T'
sophiapoirier
force-pushed
the
pack_expansion_error_clarity
branch
from
a0e20e3 to
64461f0
Compare
slavapestov
reviewed
Mar 20, 2023
| // expected-error@+1 {{pack expansion 'Int' must contain at least one pack reference}} | ||
| func invalidPackRefRepeatInt(_: repeat Int) {} | ||
|
|
||
| // expected-error@+1 {{pack reference 'T' requires expansion using keyword 'repeat'}} | ||
| func packRefOutsideExpansion<each T>(_: each T) {} |
There was a problem hiding this comment.
A few more to test:
func packRefOutsideExpansion<each T>(_: Array<each T>) {}
func packRefOutsideExpansion<each T>(_: Array<(each T) -> ()>) {}
func packRefOutsideExpansion<each T>(_: (each T)) {}
func packRefOutsideExpansion<each T>(_: each T.Type) {}
…errors + add fixits
sophiapoirier
force-pushed
the
pack_expansion_error_clarity
branch
from
17656ed to
19e671b
Compare
|
@swift-ci please smoke test |
hborla
approved these changes
Mar 21, 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.
No description provided.