Skip to content

Commit c3d4f2c

Browse files
nicolasstuckinicolasstucki
committed
Add reflect TypeLambda.paramVariances
Fixes #16734
1 parent ca7c29f commit c3d4f2c

File tree

6 files changed

+134
-0
lines changed

6 files changed

+134
-0
lines changed

‎compiler/src/scala/quoted/runtime/impl/QuotesImpl.scala

+2
Original file line numberDiff line numberDiff line change
@@ -2212,6 +2212,8 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler
22122212
extension (self: TypeLambda)
22132213
def param(idx: Int): TypeRepr = self.newParamRef(idx)
22142214
def paramBounds: List[TypeBounds] = self.paramInfos
2215+
def paramVariances: List[Flags] =
2216+
self.typeParams.map(_.paramVariance)
22152217
end extension
22162218
end TypeLambdaMethods
22172219

‎library/src/scala/quoted/Quotes.scala

+8
Original file line numberDiff line numberDiff line change
@@ -3235,8 +3235,16 @@ trait Quotes { self: runtime.QuoteUnpickler & runtime.QuoteMatching =>
32353235
/** Extension methods of `TypeLambda` */
32363236
trait TypeLambdaMethods:
32373237
extension (self: TypeLambda)
3238+
/** Reference to the i-th parameter */
3239+
/** Type bounds of the i-th parameter */
32383240
def param(idx: Int) : TypeRepr
32393241
def paramBounds: List[TypeBounds]
3242+
/** Variance flags for the i-th parameter
3243+
*
3244+
* Variance flags can be one of `Flags.{Covariant, Contravariant, EmptyFlags}`.
3245+
*/
3246+
@experimental
3247+
def paramVariances: List[Flags]
32403248
end extension
32413249
end TypeLambdaMethods
32423250

‎tests/run-custom-args/tasty-inspector/stdlibExperimentalDefinitions.scala

+1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ val experimentalDefinitionInLibrary = Set(
6666
// Should be stabilized in 3.4.0
6767
"scala.quoted.Quotes.reflectModule.defnModule.FunctionClass",
6868
"scala.quoted.Quotes.reflectModule.FlagsModule.AbsOverride",
69+
"scala.quoted.Quotes.reflectModule.TypeLambdaMethods.declaredVariances",
6970
// Can be stabilized in 3.4.0 (unsure) or later
7071
"scala.quoted.Quotes.reflectModule.CompilationInfoModule.XmacroSettings",
7172
"scala.quoted.Quotes.reflectModule.FlagsModule.JavaAnnotation",

‎tests/run-macros/i16734.check

+67
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
[F >: scala.Nothing <: [A >: scala.Nothing <: scala.Any] => scala.Any] => K1Inv[F]
2+
F
3+
A
4+
5+
[F >: scala.Nothing <: [A >: scala.Nothing <: scala.Any] => scala.Any] => K1Cov[F]
6+
F
7+
+A
8+
9+
[F >: scala.Nothing <: [A >: scala.Nothing <: scala.Any] => scala.Any] => K1Con[F]
10+
F
11+
-A
12+
13+
[F >: scala.Nothing <: [A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any] => scala.Any] => K2InvInv[F]
14+
F
15+
A, B
16+
17+
[F >: scala.Nothing <: [A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any] => scala.Any] => K2InvCov[F]
18+
F
19+
A, +B
20+
21+
[F >: scala.Nothing <: [A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any] => scala.Any] => K2InvCon[F]
22+
F
23+
A, -B
24+
25+
[F >: scala.Nothing <: [A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any] => scala.Any] => K2CovInv[F]
26+
F
27+
+A, B
28+
29+
[F >: scala.Nothing <: [A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any] => scala.Any] => K2CovCov[F]
30+
F
31+
+A, +B
32+
33+
[F >: scala.Nothing <: [A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any] => scala.Any] => K2CovCon[F]
34+
F
35+
+A, -B
36+
37+
[F >: scala.Nothing <: [A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any] => scala.Any] => K2ConInv[F]
38+
F
39+
-A, B
40+
41+
[F >: scala.Nothing <: [A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any] => scala.Any] => K2ConCov[F]
42+
F
43+
-A, +B
44+
45+
[F >: scala.Nothing <: [A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any] => scala.Any] => K2ConCon[F]
46+
F
47+
-A, -B
48+
49+
[G >: scala.Nothing <: [A >: scala.Nothing <: scala.Any, B >: scala.Nothing <: scala.Any, C >: scala.Nothing <: scala.Any, D >: scala.Nothing <: [X1 >: scala.Nothing <: scala.Any, Y1 >: scala.Nothing <: scala.Any, Z1 >: scala.Nothing <: scala.Any] => scala.Any, E >: scala.Nothing <: [X2 >: scala.Nothing <: scala.Any, Y2 >: scala.Nothing <: scala.Any, Z2 >: scala.Nothing <: scala.Any] => scala.Any, F >: scala.Nothing <: [X3 >: scala.Nothing <: scala.Any, Y3 >: scala.Nothing <: scala.Any, Z3 >: scala.Nothing <: scala.Any] => scala.Any] => scala.Any] => KFunky[G]
50+
G
51+
A, +B, -C, D, +E, -F
52+
X1, +Y1, -Z1
53+
X2, +Y2, -Z2
54+
X3, +Y3, -Z3
55+
56+
[A >: scala.Nothing <: scala.Any, F >: scala.Nothing <: [B >: scala.Nothing <: scala.Any] => scala.Any] => F[A]
57+
A, +F
58+
B
59+
60+
[A >: scala.Nothing <: scala.Any, F >: scala.Nothing <: [B >: scala.Nothing <: scala.Any] => scala.Any] => F[A]
61+
+A, +F
62+
+B
63+
64+
[A >: scala.Nothing <: scala.Any, F >: scala.Nothing <: [B >: scala.Nothing <: scala.Any] => scala.Any] => F[A]
65+
-A, +F
66+
-B
67+

‎tests/run-macros/i16734/Macro_1.scala

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
import scala.quoted.*
2+
3+
inline def variances[A <: AnyKind]: String =
4+
${variancesImpl[A]}
5+
6+
def variancesImpl[A <: AnyKind: Type](using Quotes): Expr[String] =
7+
import quotes.reflect.*
8+
def loop(tpe: TypeRepr): List[String] =
9+
tpe match
10+
case tpe: TypeLambda =>
11+
tpe.paramNames.zip(tpe.declaredVariances).map { (name, variance) =>
12+
if variance == Flags.Covariant then "+" + name
13+
else if variance == Flags.Contravariant then "-" + name
14+
else name
15+
}.mkString(", ") :: tpe.paramTypes.flatMap(loop)
16+
case tpe: TypeBounds =>
17+
loop(tpe.low) ++ loop(tpe.hi)
18+
case _ =>
19+
Nil
20+
val res = (Type.show[A] :: loop(TypeRepr.of[A])).mkString("", "\n", "\n")
21+
Expr(res)

‎tests/run-macros/i16734/Test_2.scala

+35
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
trait K1Inv[F[A]]
2+
trait K1Cov[F[+A]]
3+
trait K1Con[F[-A]]
4+
5+
trait K2InvInv[F[A, B]]
6+
trait K2InvCov[F[A, +B]]
7+
trait K2InvCon[F[A, -B]]
8+
trait K2CovInv[F[+A, B]]
9+
trait K2CovCov[F[+A, +B]]
10+
trait K2CovCon[F[+A, -B]]
11+
trait K2ConInv[F[-A, B]]
12+
trait K2ConCov[F[-A, +B]]
13+
trait K2ConCon[F[-A, -B]]
14+
15+
16+
trait KFunky[G[A, +B, -C, D[X1, +Y1, -Z1], +E[X2, +Y2, -Z2], -F[X3, +Y3, -Z3]]]
17+
18+
19+
@main def Test =
20+
println(variances[K1Inv])
21+
println(variances[K1Cov])
22+
println(variances[K1Con])
23+
println(variances[K2InvInv])
24+
println(variances[K2InvCov])
25+
println(variances[K2InvCon])
26+
println(variances[K2CovInv])
27+
println(variances[K2CovCov])
28+
println(variances[K2CovCon])
29+
println(variances[K2ConInv])
30+
println(variances[K2ConCov])
31+
println(variances[K2ConCon])
32+
println(variances[KFunky])
33+
println(variances[[A, F[B]] =>> F[A]])
34+
println(variances[[A, F[+B]] =>> F[A]])
35+
println(variances[[A, F[-B]] =>> F[A]])

0 commit comments

Comments
 (0)