Add missing environment to =##=

Author: nicolasstucki

library/src-3.x/scala/internal/quoted/Matcher.scala

@@ -37,7 +37,12 @@ object Matcher {
 
     type Env = Set[(Symbol, Symbol)]
 
-    inline def withEnv[T](env: Env)(body: given Env => T): T = body given env
+    inline def withEnv[T](env: Env)(body: => given Env => T): T = body given env
+
+    /** Check that all trees match with =#= and concatenate the results with && */
+    def (scrutinees: List[Tree]) =##= (patterns: List[Tree]) given Env: Matching =
+      if (scrutinees.size != patterns.size) notMatched
+      else foldMatchings(scrutinees.zip(patterns).map((s, p) => s =#= p): _*)
 
     /** Check that the trees match and return the contents from the pattern holes.
      *  Return None if the trees do not match otherwise return Some of a tuple containing all the contents in the holes.
@@ -69,10 +74,6 @@ object Matcher {
       def hasBindAnnotation(sym: Symbol) =
         sym.annots.exists { case Apply(Select(New(TypeIdent("patternBindHole")),"<init>"),List()) => true; case _ => true }
 
-      def (scrutinees: List[Tree]) =##= (patterns: List[Tree]): Matching =
-        if (scrutinees.size != patterns.size) notMatched
-        else foldMatchings(scrutinees.zip(patterns).map((s, p) => s =#= p): _*)
-
       /** Normalieze the tree */
       def normalize(tree: Tree): Tree = tree match {
         case Block(Nil, expr) => normalize(expr)

tests/run-macros/quote-matcher-runtime.check

@@ -312,6 +312,18 @@ Pattern: {
 }
 Result: Some(List())
 
+Scrutinee: {
+  val a: scala.Int = 45
+  val b: scala.Int = a
+  ()
+}
+Pattern: {
+  val x: scala.Int = 45
+  val y: scala.Int = x
+  ()
+}
+Result: Some(List())
+
 Scrutinee: {
   val a: scala.Int = 45
   a.+(a)

tests/run-macros/quote-matcher-runtime/quoted_2.scala

@@ -91,6 +91,7 @@ object Test {
     matches({ val a: Int = 45 }, { var a: Int = 45 })
     matches({ val a: Int = 45 }, { @patternBindHole var a: Int = patternHole })
     matches({ val a: Int = 45; a + a }, { val x: Int = 45; x + x })
+    matches({ val a: Int = 45; val b = a }, { val x: Int = 45; val y = x })
     matches({ val a: Int = 45; a + a }, { val x: Int = 45; x + patternHole[Int] })
     matches({ lazy val a: Int = 45 }, { val a: Int = 45 })
     matches({ lazy val a: Int = 45 }, { lazy val a: Int = 45 })