jextract: [SwiftType] optional, array, dictionary, and set into nominal type#649
Merged
ktoso merged 11 commits intoswiftlang:mainfrom Mar 30, 2026
Merged
jextract: [SwiftType] optional, array, dictionary, and set into nominal type#649ktoso merged 11 commits intoswiftlang:mainfrom
optional, array, dictionary, and set into nominal type#649ktoso merged 11 commits intoswiftlang:mainfrom
Conversation
ktoso
reviewed
Mar 27, 2026
Collaborator
ktoso
left a comment
ktoso
left a comment
There was a problem hiding this comment.
I like the idea but want to give this one a proper look but I'm away from computer today meh. Maybe I'll manage tonight, thank you!
ktoso
reviewed
Mar 29, 2026
|
|
||
| import SwiftSyntax | ||
|
|
||
| enum SwiftKnownType: Equatable { |
Collaborator
There was a problem hiding this comment.
This enum is a bit weird, we're 1:1 mapping things almost hmmm
Contributor
Author
There was a problem hiding this comment.
These two types are essentially similar, the only difference is whether they represent the decl site or the use site.
I haven't quite found a better way to reduce duplication.
Collaborator
There was a problem hiding this comment.
Yeah, let's run with it thanks
Collaborator
|
Sorry I'l finish reviewing tomorrow |
# Conflicts: # Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaTranslation.swift
ktoso
reviewed
Mar 30, 2026
Sources/JExtractSwiftLib/FFM/FFMSwift2JavaGenerator+JavaTranslation.swift
Outdated
Show resolved
Hide resolved
ktoso
reviewed
Mar 30, 2026
| case _ where swiftType.isUnsignedInteger: | ||
| } | ||
|
|
||
| switch swiftType.asNominalType?.asKnownType { |
Collaborator
There was a problem hiding this comment.
OKey yeah I think this is a nice improvement
ktoso
approved these changes
Mar 30, 2026
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Problem
Currently,
SwiftTypedefinesoptional,array,dictionary, andsetas distinct cases.However, these types are sometimes represented nominally (e.g.,
Optional<Int>).This fragmentation forces us to implement logic for both
.nominaland the specific cases (like.optional), leading to redundant code.More importantly, it creates a risk of logic desynchronization; in fact, I've encountered issues where logic was updated for one case but overlooked for the other.
Solution
This PR unifies these special types into the
.nominalcase.To preserve the original syntactic representation (such as
Int?or[Int]), I have introducedSwiftNominalType.SugarName.This allows us to handle these types as nominal while still maintaining their original "sugared" form in the grammar.