Generate mirrors for named tuples #22469
Merged
Conversation
This file contains 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
jchyb
force-pushed
the
fix-i22382-named-tuple-mirror
branch
from
1251ae6 to
9077d4f
Compare
bishabosha
reviewed
Jan 30, 2025
| @@ -398,6 +404,8 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context): | |||
| // avoid type aliases for tuples | |||
| Right(MirrorSource.GenericTuple(types)) | |||
| case _ => reduce(tp.underlying) | |||
| case tp @ AppliedType(tref: TypeRef, List(_, typeTuple)) if tref == defn.NamedTupleTypeRef => | |||
There was a problem hiding this comment.
Suggested change
| case tp @ AppliedType(tref: TypeRef, List(_, typeTuple)) if tref == defn.NamedTupleTypeRef => | |
| case tp @ AppliedType(tref: TypeRef, List(_, _)) if tref == defn.NamedTupleTypeRef => |
There was a problem hiding this comment.
I ended up changing it into defn.NamedTupleDirect(_, _) (same AppliedType internally), for readability (I don't think that unapply was there when I started making this PR)
bishabosha
reviewed
Jan 30, 2025
| @@ -398,6 +404,8 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context): | |||
| // avoid type aliases for tuples | |||
| Right(MirrorSource.GenericTuple(types)) | |||
| case _ => reduce(tp.underlying) | |||
| case tp @ AppliedType(tref: TypeRef, List(_, typeTuple)) if tref == defn.NamedTupleTypeRef => | |||
| Right(MirrorSource.NamedTuple(tp.namedTupleElementTypes(false))) | |||
There was a problem hiding this comment.
what changes with derived=true instead of false?
There was a problem hiding this comment.
derived=true allows to convert union and intersection types of NamedTuples into NamedTuple AppliedType types. We already know it's a NamedTupleDirect from the unapply above, so we don't need to do that (and setting true would not change anything here).
bishabosha
reviewed
Jan 30, 2025
| val (labels, typeElems) = nameTypePairs.unzip | ||
| val elemLabels = labels.map(label => ConstantType(Constant(label.toString))) | ||
| val mirrorRef: Type => Tree = _ => newTupleMirror(typeElems.size) | ||
| makeProductMirror(typeElems, elemLabels, "NamedTuple".toTypeName, mirrorRef) |
There was a problem hiding this comment.
Suggested change
| makeProductMirror(typeElems, elemLabels, "NamedTuple".toTypeName, mirrorRef) | |
| makeProductMirror(typeElems, elemLabels, tpnme.NamedTuple, mirrorRef) |
if this doesnt exist it should
bishabosha
reviewed
Jan 30, 2025
| @@ -501,6 +522,10 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context): | |||
| val arity = tps.size | |||
| val cls = if arity <= Definitions.MaxTupleArity then defn.TupleType(arity).nn.classSymbol else defn.PairClass | |||
| ("", NoType, cls) | |||
| case Right(MirrorSource.NamedTuple(nameTypePairs)) => | |||
| val arity = nameTypePairs.size | |||
| val cls = if arity <= Definitions.MaxTupleArity then defn.TupleType(arity).nn.classSymbol else defn.PairClass | |||
There was a problem hiding this comment.
Suggested change
| val cls = if arity <= Definitions.MaxTupleArity then defn.TupleType(arity).nn.classSymbol else defn.PairClass |
unused? (is there a side-effect?)
bishabosha
reviewed
Jan 30, 2025
| @@ -501,6 +522,10 @@ class Synthesizer(typer: Typer)(using @constructorOnly c: Context): | |||
| val arity = tps.size | |||
| val cls = if arity <= Definitions.MaxTupleArity then defn.TupleType(arity).nn.classSymbol else defn.PairClass | |||
| ("", NoType, cls) | |||
| case Right(MirrorSource.NamedTuple(nameTypePairs)) => | |||
| val arity = nameTypePairs.size | |||
jchyb
force-pushed
the
fix-i22382-named-tuple-mirror
branch
from
9077d4f to
0a6e367
Compare
bishabosha
approved these changes
Jan 31, 2025
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.
Fixes #22382
For
summon[Mirror.Of[(foo: Int, bla: String)]]we generate:We reuse scala.runtime.TupleMirror, because it pretty much does everything we want it to, and fromProduct (with supplied Product types) call on that mirror still works there.
Since NamedTuple is not technically a
Producttype, I imagine users might be a little confused why they can't put a named tuple into afromProductargument, but this is easily worked around with.toTuple