Commit 66f8213

authored

Make typeArgs in QuotesImpl work for AnnotatedTypes (#24018)

2 parents 89e316e + 925d749 commit 66f8213Copy full SHA for 66f8213

File tree

+25

-5

lines changed

+25

-5

lines changed

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1911,6 +1911,8 @@ class QuotesImpl private (using val ctx: Context) extends Quotes, QuoteUnpickler`
`1911`	`1911`
`1912`	`1912`	`def typeArgs: List[TypeRepr] = self match`
`1913`	`1913`	`case AppliedType(_, args) => args`
	`1914`	`+ case AnnotatedType(parent, _) => parent.typeArgs`
	`1915`	`+ case FlexibleType(underlying) => underlying.typeArgs`
`1914`	`1916`	`case _ => List.empty`
`1915`	`1917`	`end extension`
`1916`	`1918`	`end TypeReprMethods`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`\| Exception occurred while executing macro expansion.`
`6`	`6`	\| java.lang.IllegalArgumentException: requirement failed: value of StringConstant cannot be `null`
`7`	`7`	`\| at scala.Predef$.require(Predef.scala:393)`
`8`		`- \| at scala.quoted.runtime.impl.QuotesImpl$reflect$StringConstant$.apply(QuotesImpl.scala:2540)`
`9`		`- \| at scala.quoted.runtime.impl.QuotesImpl$reflect$StringConstant$.apply(QuotesImpl.scala:2539)`
	`8`	`+ \| at scala.quoted.runtime.impl.QuotesImpl$reflect$StringConstant$.apply(QuotesImpl.scala:2542)`
	`9`	`+ \| at scala.quoted.runtime.impl.QuotesImpl$reflect$StringConstant$.apply(QuotesImpl.scala:2541)`
`10`	`10`	`\| at scala.quoted.ToExpr$StringToExpr.apply(ToExpr.scala:82)`
`11`	`11`	`\| at scala.quoted.ToExpr$StringToExpr.apply(ToExpr.scala:80)`
`12`	`12`	`\| at scala.quoted.Expr$.apply(Expr.scala:72)`

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`		`-class Cap extends caps.ExclusiveCapability`
	`1`	`+object e:`
	`2`	`+ def foldRL(f: Int => Int)(g: String => Int) = ???`
	`3`	`+`
	`4`	`+`
	`5`	`+val xs = e.foldRL`
	`6`	`+ : i => i + 1`
	`7`	`+ : s => s.length`
`2`	`8`
`3`		`-def test(consume x: Cap) = ???`
`4`	`9`
`5`		`-def impl(using consume x: Cap) = ???`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,11 @@`
	`1`	`+`
	`2`	`+import scala.quoted._`
	`3`	`+`
	`4`	`+object Eval:`
	`5`	`+`
	`6`	`+ inline def eval[T](x: List[T]) = ${ evalImpl[T]('x) }`
	`7`	`+ def evalImpl[A](x: Expr[List[A]])(using Quotes): Expr[Unit] =`
	`8`	`+ import quotes.reflect.*`
	`9`	`+ println(x.asTerm.tpe.widen)`
	`10`	`+ x.asTerm.tpe.widen.typeArgs.head`
	`11`	`+ '{()}`

Lines changed: 3 additions & 0 deletions

Comments

(0)