Skip to content

Add expr match equals #7577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1713,6 +1713,13 @@ class ReflectionCompilerInterface(val rootContext: core.Contexts.Context) extend

def Symbol_noSymbol(given ctx: Context): Symbol = core.Symbols.NoSymbol

def Symbol_typeRef(symbol: Symbol)(given ctx: Context): TypeOrBounds = symbol.typeRef

def Symbol_termRef(symbol: Symbol)(given ctx: Context): TypeOrBounds = symbol.termRef

def Symbol_info(symbol: Symbol)(given ctx: Context): TypeOrBounds = symbol.info


//
// FLAGS
//
Expand Down
158 changes: 158 additions & 0 deletions library/src-bootstrapped/scala/quoted/util/ExprMap.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
package scala.quoted.util

import scala.quoted._

trait ExprMap {

/** Map an expression `e` with a type `tpe` */
def map[T](e: Expr[T])(given qctx: QuoteContext, tpe: Type[T]): Expr[T]

/** Map subexpressions an expression `e` with a type `tpe` */
def mapChildren[T](e: Expr[T])(given qctx: QuoteContext, tpe: Type[T]): Expr[T] = {
import qctx.tasty.{_, given}
class MapChildren() {

def transformStatement(tree: Statement)(given ctx: Context): Statement = {
def localCtx(definition: Definition): Context = definition.symbol.localContext
tree match {
case tree: Term =>
transformTerm(tree, defn.AnyType)
case tree: Definition =>
transformDefinition(tree)
case tree: Import =>
tree
}
}

def transformDefinition(tree: Definition)(given ctx: Context): Definition = {
def localCtx(definition: Definition): Context = definition.symbol.localContext
tree match {
case tree: ValDef =>
implicit val ctx = localCtx(tree)
val rhs1 = tree.rhs.map(x => transformTerm(x, tree.tpt.tpe))
ValDef.copy(tree)(tree.name, tree.tpt, rhs1)
case tree: DefDef =>
implicit val ctx = localCtx(tree)
DefDef.copy(tree)(tree.name, tree.typeParams, tree.paramss, tree.returnTpt, tree.rhs.map(x => transformTerm(x, tree.returnTpt.tpe)))
case tree: TypeDef =>
tree
case tree: ClassDef =>
ClassDef.copy(tree)(tree.name, tree.constructor, tree.parents, tree.derived, tree.self, tree.body)
}
}

def transformTermChildren(tree: Term, tpe: Type)(given ctx: Context): Term = tree match {
case Ident(name) =>
tree
case Select(qualifier, name) =>
Select.copy(tree)(transformTerm(qualifier, qualifier.tpe.widen), name)
case This(qual) =>
tree
case Super(qual, mix) =>
tree
case tree @ Apply(fun, args) =>
val MethodType(_, tpes, _) = fun.tpe.widen
Apply.copy(tree)(transformTerm(fun, defn.AnyType), transformTerms(args, tpes))
case TypeApply(fun, args) =>
TypeApply.copy(tree)(transformTerm(fun, defn.AnyType), args)
case _: Literal =>
tree
case New(tpt) =>
New.copy(tree)(transformTypeTree(tpt))
case Typed(expr, tpt) =>
val tp = tpt.tpe match
// TODO improve code
case AppliedType(TypeRef(ThisType(TypeRef(NoPrefix(), "scala")), "<repeated>"), List(IsType(tp0))) =>
type T
val a = tp0.seal.asInstanceOf[quoted.Type[T]]
'[Seq[$a]].unseal.tpe
case tp => tp
Typed.copy(tree)(transformTerm(expr, tp), transformTypeTree(tpt))
case tree: NamedArg =>
NamedArg.copy(tree)(tree.name, transformTerm(tree.value, tpe))
case Assign(lhs, rhs) =>
Assign.copy(tree)(lhs, transformTerm(rhs, lhs.tpe.widen))
case Block(stats, expr) =>
Block.copy(tree)(transformStats(stats), transformTerm(expr, tpe))
case If(cond, thenp, elsep) =>
If.copy(tree)(
transformTerm(cond, defn.BooleanType),
transformTerm(thenp, tpe),
transformTerm(elsep, tpe))
case _: Closure =>
tree
case Match(selector, cases) =>
Match.copy(tree)(transformTerm(selector, selector.tpe), transformCaseDefs(cases, tpe))
case Return(expr) =>
// FIXME
// ctx.owner seems to be set to the wrong symbol
// Return.copy(tree)(transformTerm(expr, expr.tpe))
tree
case While(cond, body) =>
While.copy(tree)(transformTerm(cond, defn.BooleanType), transformTerm(body, defn.AnyType))
case Try(block, cases, finalizer) =>
Try.copy(tree)(transformTerm(block, tpe), transformCaseDefs(cases, defn.AnyType), finalizer.map(x => transformTerm(x, defn.AnyType)))
case Repeated(elems, elemtpt) =>
Repeated.copy(tree)(transformTerms(elems, elemtpt.tpe), elemtpt)
case Inlined(call, bindings, expansion) =>
Inlined.copy(tree)(call, transformDefinitions(bindings), transformTerm(expansion, tpe)/*()call.symbol.localContext)*/)
}

def transformTerm(tree: Term, tpe: Type)(given ctx: Context): Term =
tree match {
case _: Closure =>
tree
case _: Inlined | _: Select =>
transformTermChildren(tree, tpe)
case _ =>
tree.tpe.widen match {
case _: MethodType | _: PolyType =>
transformTermChildren(tree, tpe)
case _ =>
type X
val expr = tree.seal.asInstanceOf[Expr[X]]
val t = tpe.seal.asInstanceOf[quoted.Type[X]]
map(expr)(given qctx, t).unseal
}
}

def transformTypeTree(tree: TypeTree)(given ctx: Context): TypeTree = tree

def transformCaseDef(tree: CaseDef, tpe: Type)(given ctx: Context): CaseDef =
CaseDef.copy(tree)(tree.pattern, tree.guard.map(x => transformTerm(x, defn.BooleanType)), transformTerm(tree.rhs, tpe))

def transformTypeCaseDef(tree: TypeCaseDef)(given ctx: Context): TypeCaseDef = {
TypeCaseDef.copy(tree)(transformTypeTree(tree.pattern), transformTypeTree(tree.rhs))
}

def transformStats(trees: List[Statement])(given ctx: Context): List[Statement] =
trees mapConserve (transformStatement(_))

def transformDefinitions(trees: List[Definition])(given ctx: Context): List[Definition] =
trees mapConserve (transformDefinition(_))

def transformTerms(trees: List[Term], tpes: List[Type])(given ctx: Context): List[Term] =
var tpes2 = tpes // TODO use proper zipConserve
trees mapConserve { x =>
val tpe :: tail = tpes2
tpes2 = tail
transformTerm(x, tpe)
}

def transformTerms(trees: List[Term], tpe: Type)(given ctx: Context): List[Term] =
trees.mapConserve(x => transformTerm(x, tpe))

def transformTypeTrees(trees: List[TypeTree])(given ctx: Context): List[TypeTree] =
trees mapConserve (transformTypeTree(_))

def transformCaseDefs(trees: List[CaseDef], tpe: Type)(given ctx: Context): List[CaseDef] =
trees mapConserve (x => transformCaseDef(x, tpe))

def transformTypeCaseDefs(trees: List[TypeCaseDef])(given ctx: Context): List[TypeCaseDef] =
trees mapConserve (transformTypeCaseDef(_))

}
new MapChildren().transformTermChildren(e.unseal, tpe.unseal.tpe).seal.cast[T] // Cast will only fail if this implementation has a bug
}

}
11 changes: 11 additions & 0 deletions library/src/scala/quoted/Expr.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,17 @@ package quoted {
*/
final def getValue[U >: T](given qctx: QuoteContext, valueOf: ValueOfExpr[U]): Option[U] = valueOf(this)

/** Pattern matches `this` against `that`. Effectively performing a deep equality check.
* It does the equivalent of
* ```
* this match
* case '{...} => true // where the contens of the pattern are the contents of `that`
* case _ => false
* ```
*/
final def matches(that: Expr[Any])(given qctx: QuoteContext): Boolean =
!scala.internal.quoted.Expr.unapply[Unit, Unit](this)(given that, false, qctx).isEmpty

}

object Expr {
Expand Down
6 changes: 6 additions & 0 deletions library/src/scala/tasty/reflect/CompilerInterface.scala
Original file line number Diff line number Diff line change
Expand Up @@ -1255,6 +1255,12 @@ trait CompilerInterface {

def Symbol_noSymbol(given ctx: Context): Symbol

def Symbol_typeRef(symbol: Symbol)(given ctx: Context): TypeOrBounds

def Symbol_termRef(symbol: Symbol)(given ctx: Context): TypeOrBounds

def Symbol_info(symbol: Symbol)(given ctx: Context): TypeOrBounds

//
// FLAGS
//
Expand Down
10 changes: 10 additions & 0 deletions library/src/scala/tasty/reflect/SymbolOps.scala
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,16 @@ trait SymbolOps extends Core { selfSymbolOps: FlagsOps =>
/** The symbol of the companion module */
def companionModule(given ctx: Context): Symbol =
internal.Symbol_companionModule(self)

def typeRef(given ctx: Context): TypeOrBounds =
internal.Symbol_typeRef(self)

def termRef(given ctx: Context): TypeOrBounds =
internal.Symbol_termRef(self)

def info(given ctx: Context): TypeOrBounds =
internal.Symbol_info(self)

}

}
26 changes: 26 additions & 0 deletions tests/run-macros/expr-map-1.check
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
oof
oofoof
ylppa
kcolb
kcolb
neht
esle
lav
vals
fed
defs
fed
rab
yrt
yllanif
hctac
elihw
wen
depyt
depyt
grAdeman
qual
adbmal
ravsgra
hctam
def
18 changes: 18 additions & 0 deletions tests/run-macros/expr-map-1/Macro_1.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
import scala.quoted._
import scala.quoted.matching._

inline def rewrite[T](x: => Any): Any = ${ stringRewriter('x) }

private def stringRewriter(e: Expr[Any])(given QuoteContext): Expr[Any] =
StringRewriter.map(e)

private object StringRewriter extends util.ExprMap {

def map[T](e: Expr[T])(given QuoteContext, Type[T]): Expr[T] = e match
case Const(s: String) =>
Expr(s.reverse) match
case '{ $x: T } => x
case _ => e // e had a singlton String type
case _ => mapChildren(e)

}
122 changes: 122 additions & 0 deletions tests/run-macros/expr-map-1/Test_2.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,122 @@
object Test {

def main(args: Array[String]): Unit = {
println(rewrite("foo"))
println(rewrite("foo" + "foo"))

rewrite {
println("apply")
}

rewrite {
println("block")
println("block")
}

val b: Boolean = true
rewrite {
if b then println("then")
else println("else")
}

rewrite {
if !b then println("then")
else println("else")
}

rewrite {
val s: String = "val"
println(s)
}

rewrite {
val s: "vals" = "vals"
println(s) // prints "foo" not "oof"
}

rewrite {
def s: String = "def"
println(s)
}

rewrite {
def s: "defs" = "defs"
println(s) // prints "foo" not "oof"
}

rewrite {
def s(x: String): String = x
println(s("def"))
}

rewrite {
var s: String = "var"
s = "bar"
println(s)
}

rewrite {
try println("try")
finally println("finally")
}

rewrite {
try throw new Exception()
catch case x: Exception => println("catch")
}

rewrite {
var x = true
while (x) {
println("while")
x = false
}
}

rewrite {
val t = new Tuple1("new")
println(t._1)
}

rewrite {
println("typed": String)
println("typed": Any)
}

rewrite {
val f = new Foo(foo = "namedArg")
println(f.foo)
}

rewrite {
println("qual".reverse)
}

rewrite {
val f = () => "lambda"
println(f())
}

rewrite {
def f(args: String*): String = args.mkString
println(f("var", "args"))
}

rewrite {
"match" match {
case "match" => println("match")
case x => println("x")
}
}

// FIXME should print fed
rewrite {
def s: String = return "def"
println(s)
}

}

}

class Foo(val foo: String)
Loading