[Migrator] Migrate references to shorthand closure params (e.g. $0, $1) where affected by SE110 #9711
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
…1) where affected by SE110 In Swift 3: 1) a closure referring to $1 or above type checked against a function type that takes a single tuple argument with that arity 2) a closure referring only to $0 (or $0.1 etc) type checked against a function type that takes multiple arguments but neither compiles in Swift 4. This patch migrates shorthand references for 1) by prefixing "0." in front of the existing references, e.g. "$1" to "$0.1" 2) by removing the leading 0. if one existing or substituting a tuple of the correct arity if it doesn't, e.g. "$0.1" to "$1" and "$0" to "($0, $1, $2)" Resolves rdar://problem/31969538
bitjammer
reviewed
May 17, 2017
| @@ -22,9 +22,115 @@ using namespace swift; | |||
| using namespace swift::migrator; | |||
|
|
|||
| namespace { | |||
|
|
|||
There was a problem hiding this comment.
Could you add a doc comment here describing what this does and how it's used below?
bitjammer
reviewed
May 17, 2017
|
|
||
| class ShorthandFinder: public ASTWalker { | ||
| private: | ||
| llvm::DenseMap<ParamDecl*, std::vector<Expr*>> References; |
There was a problem hiding this comment.
Doc comment here explaining the key and value types, if you don't mind.
|
@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.
In Swift 3:
$1or above type checked against a function type that takes a single tuple argument with that arity$0(or$0.1etc) type checked against a function type that takes multiple argumentsbut neither compiles in Swift 4. This patch migrates shorthand references for:
$1to$0.10.if one exists or substituting a tuple of the correct arity if it doesn't, e.g.$0.1to$1and$0to($0, $1, $2)Resolves rdar://problem/31969538