[Swiftify] Handle anonymous parameters #81384
Merged
+72
−6
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 smoke test |
_SwiftifyImport would expand with syntax errors if applied to a function with anonymous parameters, because it would try to refer to parameters using the name `_`. Detect these cases and create names for unnamed parameters. rdar://150955944
73cfb77 to
0a37a5d
Compare
|
@swift-ci please smoke test |
DougGregor
approved these changes
May 9, 2025
Comment on lines
+430
to
+432
| let param = e.with(\.type, (argTypes[i] ?? e.type)!) | ||
| let name = param.secondName ?? param.firstName | ||
| if name.trimmed.text == "_" { |
There was a problem hiding this comment.
Why the redundant logic to extract the parameter name and check for _?
There was a problem hiding this comment.
Ah this is needed for general swift syntax, e.g. if you have func foo(bar: T). If you just blindly do .with(\.secondName, getParamName(param, i)), then you end up with func foo(bar bar: T)). Which I guess is not actually a problem, just redundant. But I also don't think we can end up with that syntax from an imported C function, so that's fine.
There was a problem hiding this comment.
Wait no that redundancy is actually an error:
| `- note: in expansion of macro '_SwiftifyImport' on global function 'ptrNamed(ptr:_:)' here
6 | func ptrNamed(ptr: UnsafePointer<CInt>, _ len: CInt) {
7 | }
+--- macro expansion @_SwiftifyImport -------------------------------
|1 | @_alwaysEmitIntoClient
|2 | func ptrNamed(ptr ptr: UnsafeBufferPointer<CInt>) {
| | `- error: extraneous duplicate parameter name; 'ptr' already has an argument label
|3 | return unsafe ptrNamed(ptr: ptr.baseAddress!, CInt(exactly: ptr.count)!)
|4 | }
+--------------------------------------------------------------------
I don't know of any way a C function can import to that syntax, but it doesn't hurt to handle it correctly.
hnrklssn
added a commit
to hnrklssn/swift
that referenced
this pull request
May 9, 2025
_SwiftifyImport would expand with syntax errors if applied to a function with anonymous parameters, because it would try to refer to parameters using the name `_`. Detect these cases and create names for unnamed parameters. rdar://150955944 (cherry picked from commit 8e27947)
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.
_SwiftifyImport would expand with syntax errors if applied to a function with anonymous parameters, because it would try to refer to parameters using the name
_. Detect these cases and create names for unnamed parameters.rdar://150955944