wip

Author: nicolasstucki

compiler/src/dotty/tools/dotc/core/tasty/TreePickler.scala

@@ -472,16 +472,6 @@ class TreePickler(pickler: TastyPickler) {
         case Bind(name, body) =>
           registerDef(tree.symbol)
           writeByte(BIND)
-          println()
-          println(tree)
-          println(tree.isTerm)
-          println(name)
-          println(body)
-          println(tree.uniqueId)
-          println(tree.symbol)
-          println(tree.symbol.info)
-          println()
-          println()
           withLength {
             pickleName(name); pickleType(tree.symbol.info); pickleTree(body)
           }

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

@@ -8,7 +8,7 @@ import scala.tasty._
 
 object Matcher {
 
-  private final val debug = false
+  private final val debug = true
 
   /** Pattern matches an the scrutineeExpr aquainsnt the patternExpr and returns a tuple
    *  with the matched holes if successful.
@@ -45,6 +45,17 @@ object Matcher {
      */
     def treeMatches(scrutinee: Tree, pattern: Tree)(implicit env: Set[(Symbol, Symbol)]): Option[Tuple] = {
 
+      println("++++++++++++++++++++++++++++++++++++++++=")
+      println("++++++++++++++++++++++++++++++++++++++++=")
+      println(scrutinee.show)
+      println(scrutinee.showExtractors)
+      println()
+      println(pattern.show)
+      println(pattern.showExtractors)
+      println()
+      println()
+      println()
+
       /** Check that both are `val` or both are `lazy val` or both are `var` **/
       def checkValFlags(): Boolean = {
         import Flags._
@@ -117,7 +128,14 @@ object Matcher {
           foldMatchings(treeMatches(fn1, fn2), treesMatch(args1, args2))
 
         case (Block(stats1, expr1), Block(stats2, expr2)) =>
-          foldMatchings(treesMatch(stats1, stats2), treeMatches(expr1, expr2))
+          def rec(scrutinees: List[Tree], patterns: List[Tree], acc: Option[Tuple]): Option[Tuple] = (scrutinees, patterns) match {
+            case (x :: xs, y :: ys) =>
+              rec(xs, ys, foldMatchings(acc, treeMatches(x, y)))
+            case (Nil, Nil) =>
+              foldMatchings(acc, treeMatches(expr1, expr2))
+            case _ => None
+          }
+          rec(stats1, stats2, Some(()))
 
         case (If(cond1, thenp1, elsep1), If(cond2, thenp2, elsep2)) =>
           foldMatchings(treeMatches(cond1, cond2), treeMatches(thenp1, thenp2), treeMatches(elsep1, elsep2))
@@ -219,7 +237,8 @@ object Matcher {
                  |
                  |${pattern.showExtractors}
                  |
-                 |
+                 |with environment
+                 |${env}
                  |
                  |
                  |""".stripMargin)