wip

Author: nicolasstucki

compiler/src/dotty/tools/dotc/config/Printers.scala

@@ -65,10 +65,8 @@ object Printers {
 // tests/run-macros/quote-matching-optimize-3 failed
 // tests/pos-macros/i7853 failed
 
-
 // tests/run-staging/i6281.scala failed
 // tests/run-staging/shonan-hmm failed
-// tests/run-staging/i4044b.scala failed
 // tests/run-staging/staged-tuples failed
 // tests/run-staging/staged-streams_1.scala failed
 // tests/run-staging/quote-nested-3.scala failed

compiler/src/dotty/tools/dotc/transform/ReifyQuotes.scala

@@ -331,23 +331,37 @@ class ReifyQuotes extends MacroTransform {
      */
     private def makeHole(isTermHole: Boolean, body: Tree, splices: List[Tree], tpe: Type)(implicit ctx: Context): Hole = {
       val idx = embedded.addTree(body, NoSymbol)
-      val holeType = getHoleType(isTermHole)(tpe)
-      Hole(isTermHole, idx, splices).withType(holeType).asInstanceOf[Hole]
-    }
 
-    private def getHoleType(isTermHole: Boolean)(using ctx: Context) = new TypeMap() {
-      override def apply(tp: Type): Type = tp match
-        case tp: TypeRef if tp.typeSymbol.isSplice =>
-          apply(tp.dealias)
-        case tp @ TypeRef(pre, _) if !isTermHole && pre == NoPrefix || pre.termSymbol.isLocal =>
-          val hiBound = tp.typeSymbol.info match
-            case info @ ClassInfo(_, _, classParents, _, _) => classParents.reduce(_ & _)
-            case info => info.hiBound
-          apply(hiBound)
-        case tp @ TermRef(NoPrefix, _) =>
-          apply(tp.widenTermRefExpr)
-        case tp =>
-          mapOver(tp)
+      def getTypeHoleType(using ctx: Context) = new TypeMap() {
+        override def apply(tp: Type): Type = tp match
+          case tp: TypeRef if tp.typeSymbol.isSplice =>
+            apply(tp.dealias)
+          case tp @ TypeRef(pre, _) if pre == NoPrefix || pre.termSymbol.isLocal =>
+            val hiBound = tp.typeSymbol.info match
+              case info @ ClassInfo(_, _, classParents, _, _) => classParents.reduce(_ & _)
+              case info => info.hiBound
+            apply(hiBound)
+          case tp @ TermRef(NoPrefix, _) =>
+            apply(tp.widenTermRefExpr)
+          case tp =>
+            mapOver(tp)
+      }
+
+      def getTermHoleType(using ctx: Context) = new TypeMap() {
+        override def apply(tp: Type): Type = tp match
+          case tp @ TypeRef(NoPrefix, _) if capturers.contains(tp.symbol) =>
+            // reference to term with a type defined in outer quote
+            getTypeHoleType(tp)
+          case tp @ TermRef(NoPrefix, _) /*if capturers.contains(tp.symbol)*/ => // TODO needs the guard?
+            // widen term refs to terms defined in outer quote
+            apply(tp.widenTermRefExpr)
+          case tp =>
+            mapOver(tp)
+      }
+
+      val holeType = if isTermHole then getTermHoleType(tpe) else getTypeHoleType(tpe)
+
+      Hole(isTermHole, idx, splices).withType(holeType).asInstanceOf[Hole]
     }
 
     override def transform(tree: Tree)(implicit ctx: Context): Tree =

library/src/scala/quoted/util/Var.scala

@@ -38,14 +38,13 @@ object Var {
    */
   def apply[T: Type, U: Type](init: Expr[T])(body: Var[T] => Expr[U])(using qctx: QuoteContext): Expr[U] = '{
     var x = $init
-    // ${
-    //   body(
-    //     new Var[T] {
-    //       def get(using qctx: QuoteContext): Expr[T] = 'x
-    //       def update(e: Expr[T])(using qctx: QuoteContext): Expr[Unit] = '{ x = $e }
-    //     }
-    //   )
-    // }
-    ???
+    ${
+      body(
+        new Var[T] {
+          def get(using qctx: QuoteContext): Expr[T] = 'x
+          def update(e: Expr[T])(using qctx: QuoteContext): Expr[Unit] = '{ x = $e }
+        }
+      )
+    }
   }
 }