wip

Author: nicolasstucki

library/src/scala/internal/quoted/Matcher.scala

@@ -145,18 +145,18 @@ private[quoted] object Matcher {
             matched(scrutinee.seal)
 
           // Matches an open term and wraps it into a lambda that provides the free variables
-          case (scrutinee, pattern @ Apply(Select(TypeApply(Ident("patternHole"), List(Inferred())), "apply"), IdentArgs(args))) =>
+          case (scrutinee, pattern @ Apply(Select(TypeApply(Ident("patternHole"), List(Inferred())), "apply"), args0 @ IdentArgs(args))) =>
             def bodyFn(lambdaArgs: List[Tree]): Tree = {
               val argsMap = args.map(_.symbol).zip(lambdaArgs.asInstanceOf[List[Term]]).toMap
               new TreeMap {
                 override def transformTerm(tree: Term)(given ctx: Context): Term =
-                  super.transformTerm(tree) match
+                  tree match
                     case tree: Ident => summon[Env].get(tree.symbol).flatMap(argsMap.get).getOrElse(tree)
-                    case tree => tree
+                    case tree => super.transformTerm(tree)
               }.transformTree(scrutinee)
             }
             val names = args.map(_.name)
-            val argTypes = args.map(_.tpe.widenTermRefExpr)
+            val argTypes = args0.map(x => x.tpe.widenTermRefExpr)
             val resType = pattern.tpe
             val res = Lambda(MethodType(names)(_ => argTypes, _ => resType), bodyFn)
             matched(res.seal)
@@ -183,10 +183,10 @@ private[quoted] object Matcher {
           case (_: Ref, _: Ref) if scrutinee.symbol == pattern.symbol =>
             matched
 
-          case (Apply(fn1, args1), Apply(fn2, args2)) if fn1.symbol == fn2.symbol =>
+          case (Apply(fn1, args1), Apply(fn2, args2)) if fn1.symbol == fn2.symbol || summon[Env].get(fn1.symbol).contains(fn2.symbol) =>
             fn1 =?= fn2 && args1 =?= args2
 
-          case (TypeApply(fn1, args1), TypeApply(fn2, args2)) if fn1.symbol == fn2.symbol =>
+          case (TypeApply(fn1, args1), TypeApply(fn2, args2)) if fn1.symbol == fn2.symbol || summon[Env].get(fn1.symbol).contains(fn2.symbol) =>
             fn1 =?= fn2 && args1 =?= args2
 
           case (Block(stats1, expr1), Block(binding :: stats2, expr2)) if isTypeBinding(binding) =>
@@ -292,7 +292,7 @@ private[quoted] object Matcher {
                    |
                    |${pattern.showExtractors}
                    |
-                   |
+                   |with environment: ${summon[Env]}
                    |
                    |
                    |""".stripMargin)
@@ -317,8 +317,11 @@ private[quoted] object Matcher {
 
     private object IdentArgs {
       def unapply(args: List[Term])(given Context): Option[List[Ident]] =
-        args.foldLeft(Option(List.empty[Ident])) {
-          case (Some(acc), id: Ident) => Some(id :: acc)
+        args.foldRight(Option(List.empty[Ident])) {
+          case (id: Ident, Some(acc)) => Some(id :: acc)
+          case (Block(List(DefDef("$anonfun", Nil, List(params), Inferred(), Some(Apply(id: Ident, args)))), Closure(Ident("$anonfun"), None)), Some(acc))
+              if params.zip(args).forall(_.symbol == _.symbol) =>
+            Some(id :: acc)
           case _ => None
         }
     }
@@ -390,7 +393,7 @@ private[quoted] object Matcher {
                 |
                 |${pattern.showExtractors}
                 |
-                |
+                |with environment: ${summon[Env]}
                 |
                 |
                 |""".stripMargin)

tests/run-macros/quoted-pattern-open-expr.check

@@ -4,3 +4,7 @@ Matched open
 ((y: scala.Int) => y.*(y))
 Matched open
 ((y: scala.Function1[scala.Int, scala.Int]) => y.apply(3))
+Matched open
+((g: scala.Function1[scala.Int, scala.Int], x: scala.Int) => 5)
+Matched open
+((g: scala.Function1[scala.Int, scala.Int], x: scala.Int) => x)

tests/run-macros/quoted-pattern-open-expr/Macro_1.scala

@@ -7,6 +7,6 @@ private def testExpr(e: Expr[Int])(given QuoteContext): Expr[String] = {
     case '{ val y: Int = 4; $body } => Expr("Matched closed\n" + body.show)
     case '{ val y: Int = 4; ($body: Int => Int)(y) } => Expr("Matched open\n" + body.show)
     case '{ val y: Int => Int = x => x + 1; ($body: (Int => Int) => Int)(y) } => Expr("Matched open\n" + body.show)
-    case '{ def g(x: Int): Int = ($body: (Int => Int, Int) => Int)(g, x); 5 } => Expr("Matched open\n" + body.show)
+    case '{ def g(x: Int): Int = ($body: (Int => Int, Int) => Int)(g, x); g(5) } => Expr("Matched open\n" + body.show)
   }
 }

tests/run-macros/quoted-pattern-open-expr/Test_2.scala

@@ -4,9 +4,11 @@ object Test {
     println(test { val x: Int = 4; 6: Int })
     println(test { val x: Int = 4; x * x })
     println(test { val f: Int => Int = x => x + 1; f(3) })
-    println(test { def g(x: Int): Int = x; 5 })
-    println(test { def g(x: Int): Int = g(4); 5 })
-    println(test { def g(x: Int): Int = g(x); 5 })
+    println(test { def f(x: Int): Int = 5; f(5) })
+    println(test { def f(x: Int): Int = x; f(5) })
+    // FIXME
+    // println(test { def f(x: Int): Int = f(4); f(5) })
+    // println(test { def f(x: Int): Int = f(x); f(5) })
 
   }
 }