Wip

scala · Aug 5, 2021 · 484ad44 · 484ad44
1 parent dc7be10
commit 484ad44
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/compiler/src/dotty/tools/dotc/ast/tpd.scala b/compiler/src/dotty/tools/dotc/ast/tpd.scala
@@ -373,6 +373,9 @@ object tpd extends Trees.Instance[Type] with TypedTreeInfo {
   def Throw(expr: Tree)(using Context): Tree =
     ref(defn.throwMethod).appliedTo(expr)
 
+  def Hole(isTerm: Boolean, idx: Int, args: List[Tree], content: Tree, tpt: Tree)(using Context): Hole =
+    ta.assignType(untpd.Hole(isTerm, idx, args, content, tpt), tpt)
+
   // ------ Making references ------------------------------------------------------
 
   def prefixIsElidable(tp: NamedType)(using Context): Boolean = {

diff --git a/compiler/src/dotty/tools/dotc/transform/Splicing.scala b/compiler/src/dotty/tools/dotc/transform/Splicing.scala
@@ -120,7 +120,7 @@ class Splicing extends MacroTransform {
             case Some (hole) => cpy.Hole(hole)(content = EmptyTree)
             case None =>
               holeIdx += 1
-              val hole = Hole(false, holeIdx, Nil, ref(qual), TypeTree(tp)).withType(tp).asInstanceOf[Hole]
+              val hole = tpd.Hole(false, holeIdx, Nil, ref(qual), TypeTree(tp))
               typeHoles.put(qual.symbol, hole)
               hole
           cpy.TypeDef(tree)(rhs = hole)
@@ -162,7 +162,7 @@ class Splicing extends MacroTransform {
         val fnType = defn.FunctionType(bindings.size, isContextual = false).appliedTo(bindingsTypes :+ newTree.tpe)
         val closure = Block(ddef :: Nil, Closure(Nil, ref(meth), TypeTree(fnType)))
         holeIdx += 1
-        Hole(true, holeIdx, refs, closure, TypeTree(tpe)).withType(tpe)
+        tpd.Hole(true, holeIdx, refs, closure, TypeTree(tpe))
 
       override def transform(tree: tpd.Tree)(using Context): tpd.Tree =
         tree match

diff --git a/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala b/compiler/src/dotty/tools/dotc/typer/TypeAssigner.scala
@@ -525,6 +525,10 @@ trait TypeAssigner {
 
   def assignType(tree: untpd.PackageDef, pid: Tree)(using Context): PackageDef =
     tree.withType(pid.symbol.termRef)
+
+  def assignType(tree: untpd.Hole, tpt: Tree)(using Context): Hole =
+    tree.withType(tpt.tpe)
+
 }