wip

Author: nicolasstucki

compiler/src/dotty/tools/dotc/ast/TreeInfo.scala

@@ -398,7 +398,7 @@ trait TypedTreeInfo extends TreeInfo[Type] { self: Trees.Instance[Type] =>
     case New(_) | Closure(_, _, _) =>
       Pure
     case TypeApply(fn, _) =>
-      if (fn.symbol.is(Erased) || fn.symbol == defn.QuotedTypeModule_apply || fn.symbol == defn.ScopeTypeModule_apply || fn.symbol == defn.Predef_classOf) Pure else exprPurity(fn)
+      if (fn.symbol.is(Erased) || fn.symbol == defn.ScopeTypeModule_apply || fn.symbol == defn.Predef_classOf) Pure else exprPurity(fn)
     case Apply(fn, args) =>
       def isKnownPureOp(sym: Symbol) =
         sym.owner.isPrimitiveValueClass

compiler/src/dotty/tools/dotc/core/Definitions.scala

@@ -680,9 +680,6 @@ class Definitions {
     @tu lazy val QuotedExprModule_nullExpr: Symbol = QuotedExprModule.requiredMethod(nme.nullExpr)
     @tu lazy val QuotedExprModule_unitExpr: Symbol = QuotedExprModule.requiredMethod(nme.unitExpr)
 
-  // TODO remove
-  @tu lazy val QuotedTypeModule_apply: Symbol = requiredModule("scala.quoted.Type").requiredMethod("apply")
-
   @tu lazy val TastyReflectionClass: ClassSymbol = requiredClass("scala.tasty.Reflection")
 
   @tu lazy val ScopeClass: ClassSymbol = requiredClass("scala.quoted.Scope")

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

@@ -128,7 +128,7 @@ class ReifyQuotes extends MacroTransform {
      *  core and splices as arguments.
      */
     override protected def transformQuotation(body: Tree, quote: Tree)(using Context): Tree = {
-      val isType = (quote.symbol eq defn.QuotedTypeModule_apply) || (quote.symbol eq defn.ScopeTypeModule_apply)
+      val isType = quote.symbol eq defn.ScopeTypeModule_apply
       if (level > 0) {
         val body1 = nested(isQuote = true).transform(body)(using quoteContext)
         super.transformQuotation(body1, quote)
@@ -371,7 +371,7 @@ class ReifyQuotes extends MacroTransform {
         transform(tree)(using ctx.withSource(tree.source))
       else reporting.trace(i"Reifier.transform $tree at $level", show = true) {
         tree match {
-          case Apply(Select(TypeApply(fn, (body: RefTree) :: Nil), _), _) if (fn.symbol == defn.QuotedTypeModule_apply || fn.symbol == defn.ScopeTypeModule_apply) && isCaptured(body.symbol, level + 1) =>
+          case Apply(Select(TypeApply(fn, (body: RefTree) :: Nil), _), _) if fn.symbol == defn.ScopeTypeModule_apply && isCaptured(body.symbol, level + 1) =>
             // Optimization: avoid the full conversion when capturing `x`
             // in '{ x } to '{ ${x$1} } and go directly to `x$1`
             capturers(body.symbol)(body)

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

@@ -141,7 +141,7 @@ object Splicer {
         case Apply(Select(Apply(fn, quoted :: Nil), nme.apply), _) if fn.symbol == defn.InternalQuoted_exprQuote =>
           // OK
 
-        case TypeApply(fn, quoted :: Nil) if fn.symbol == defn.QuotedTypeModule_apply || fn.symbol == defn.ScopeTypeModule_apply =>
+        case TypeApply(fn, quoted :: Nil) if fn.symbol == defn.ScopeTypeModule_apply =>
           // OK
 
         case Literal(Constant(value)) =>
@@ -243,7 +243,7 @@ object Splicer {
         }
         interpretQuote(quoted1)
 
-      case Apply(Select(TypeApply(fn, quoted :: Nil), _), _) if fn.symbol == defn.QuotedTypeModule_apply || fn.symbol == defn.ScopeTypeModule_apply=>
+      case Apply(Select(TypeApply(fn, quoted :: Nil), _), _) if fn.symbol == defn.ScopeTypeModule_apply =>
         interpretTypeQuote(quoted)
       case  TypeApply(fn, quoted :: Nil) if fn.symbol == defn.ScopeTypeModule_apply =>
         interpretTypeQuote(quoted)

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

@@ -203,7 +203,7 @@ object SymUtils {
 
   /** Is symbol a quote operation? */
   def isQuote(using Context): Boolean =
-    self == defn.InternalQuoted_exprQuote || self == defn.QuotedTypeModule_apply || self == defn.ScopeTypeModule_apply
+    self == defn.InternalQuoted_exprQuote || self == defn.ScopeTypeModule_apply
 
   /** Is symbol a term splice operation? */
   def isExprSplice(using Context): Boolean =

compiler/src/dotty/tools/dotc/typer/Inliner.scala

@@ -528,7 +528,7 @@ class Inliner(call: tpd.Tree, rhsToInline: tpd.Tree)(using Context) {
       case New(_) | Closure(_, _, _) =>
         true
       case TypeApply(fn, _) =>
-        if (fn.symbol.is(Erased) || fn.symbol == defn.QuotedTypeModule_apply || fn.symbol == defn.ScopeTypeModule_apply) true else apply(fn)
+        if (fn.symbol.is(Erased) || fn.symbol == defn.ScopeTypeModule_apply) true else apply(fn)
       case Apply(fn, args) =>
         def isKnownPureOp(sym: Symbol) =
           sym.owner.isPrimitiveValueClass

compiler/src/dotty/tools/dotc/typer/QuotesAndSplices.scala

@@ -394,7 +394,7 @@ trait QuotesAndSplices {
     val exprPt = pt.dealias match
       case AppliedType(tycon, arg :: Nil) =>
         if quoted.isType && tycon.isRef(defn.ScopeTypeClass) then arg
-        else if tycon.isRef(defn.ScopeExprClass) then arg
+        else if quoted.isTerm &&  tycon.isRef(defn.ScopeExprClass) then arg
         else NoType
       case _ => NoType
 

library/src-bootstrapped/scala/quoted/Scope.scala

@@ -232,7 +232,13 @@ trait Scope extends Liftables, Unliftables { self =>
 
 
 
+// tests/neg-staging/i6992.scala failed
+// tests/run-staging/i3876.scala failed
 // tests/run-staging/i4044b.scala failed
+// tests/run-staging/i4730.scala failed
+// tests/run-staging/i5247.scala failed
+// tests/run-staging/i6754.scala failed
 // tests/run-staging/multi-staging.scala failed
+// tests/run-staging/quote-nested-4.scala failed
 // tests/run-staging/staged-streams_1.scala failed
 // tests/run-staging/staged-tuples failed

tests/run-staging/i3876-b.scala

@@ -11,7 +11,7 @@ object Test {
       f
     }
 
-    def expr(using QuoteContext) = '{$f2($x)}
+    def expr(using Scope) = '{$f2($x)}
     println(run(Expr.betaReduce(expr)))
     println(usingNewScope(Expr.betaReduce(expr).show)) // TODO improve printer
   }

tests/run-staging/i3876-c.scala

@@ -10,7 +10,7 @@ object Test {
       val f: (x: Int) => Int = x => x + x
       f
     }
-    def expr(using QuoteContext) = '{$f3($x)}
+    def expr(using Scope) = '{$f3($x)}
     println(run(Expr.betaReduce(expr)))
     println(usingNewScope(Expr.betaReduce(expr).show)) // TODO improve printer
   }

tests/run-staging/i3876.scala

@@ -9,6 +9,6 @@ object Test {
     def f(using s: Scope): s.Expr[Int => Int] = '{ (x: Int) => x + x }
 
     println(run(Expr.betaReduce('{$f($x)})))
-    println(usingNewScope(Expr.betaReduce(f)(x).show))
+    println(usingNewScope(Expr.betaReduce('{$f($x)})))
   }
 }

tests/run-staging/quote-fun-app-1.scala

@@ -12,8 +12,8 @@ object Test {
     println(f(43))
   }
 
-  def f1(using s: Scope): s.Expr[Int => Int] = '{ (n: Int) => ${Expr.betaReduce('{$f2(n)})('n)} } // FIXME infer parameter type
-  def f2(using s: Scope): s.Expr[Int => Int] = '{ (n: Int) => ${Expr.betaReduce('{$f3(n)})('n)} }
-  def f3(using s: Scope): s.Expr[Int => Int] = '{ (n: Int) => ${Expr.betaReduce('{$f4(n)})('n)} }
+  def f1(using s: Scope): s.Expr[Int => Int] = '{ (n: Int) => ${Expr.betaReduce('{$f2(n)})} } // FIXME infer parameter type
+  def f2(using s: Scope): s.Expr[Int => Int] = '{ (n: Int) => ${Expr.betaReduce('{$f3(n)})} }
+  def f3(using s: Scope): s.Expr[Int => Int] = '{ (n: Int) => ${Expr.betaReduce('{$f4(n)})} }
   def f4(using s: Scope): s.Expr[Int => Int] = '{ (n: Int) => n }
 }