Rename withNewQuoteContext to withQuoteContext

Author: nicolasstucki

compiler/test-resources/repl-macros/i6007

@@ -2,7 +2,7 @@ scala> implicit def toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(ge
 def toolbox: quoted.Toolbox
 scala> val v = '{ (if true then Some(1) else None).map(v => v+1) }
 val v: quoted.Expr[Option[Int]] = Expr(<pickled tasty>)
-scala> scala.quoted.withNewQuoteContext(v.show)
+scala> scala.quoted.withQuoteContext(v.show)
 val res0: String = (if (true) scala.Some.apply[scala.Int](1) else scala.None).map[scala.Int](((v: scala.Int) => v.+(1)))
 scala> scala.quoted.run(v)
 val res1: Option[Int] = Some(2)

docs/docs/reference/metaprogramming/staging.md

@@ -61,14 +61,14 @@ to be executed at a later stage. To run that code, there is another method
 in class `Expr` called `run`. Note that `$` and `run` both map from `Expr[T]`
 to `T` but only `$` is subject to the PCP, whereas `run` is just a normal method.
 Run provides a `QuoteContext` that can be used to show the expression in the scope of `run`.
-On the other hand `withNewQuoteContext` provides a `QuoteContext` without evauating the expression.
+On the other hand `withQuoteContext` provides a `QuoteContext` without evauating the expression.
 
 ```scala
 package scala.quoted
 
 def run[T](expr: given QuoteContext => Expr[T]) given (toolbox: Toolbox): T = ...
 
-def withNewQuoteContext[T](thunk: given QuoteContext => T) given (toolbox: Toolbox): T = ...
+def withQuoteContext[T](thunk: given QuoteContext => T) given (toolbox: Toolbox): T = ...
 ```
 
 ## Example

library/src-3.x/scala/quoted/package.scala

@@ -24,15 +24,15 @@ package object quoted {
    *
    *  Usage:
    *  ```
-   *  val e: T = withNewQuoteContext { // (given qctx: QuoteContext) =>
+   *  val e: T = withQuoteContext { // (given qctx: QuoteContext) =>
    *    thunk
    *  }
    *  ```
    *  where `thunk: T`
    *
    *  This method shoul not be called in a context where there is already has a QuoteContext.
    */
-  def withNewQuoteContext[T](thunk: given QuoteContext => T) given (toolbox: Toolbox): T = {
+  def withQuoteContext[T](thunk: given QuoteContext => T) given (toolbox: Toolbox): T = {
     var result: T = NoResult.asInstanceOf[T]
     def dummyRun given QuoteContext: Expr[Unit] = {
       result = thunk

tests/run-with-compiler/i3823-b.scala

@@ -1,7 +1,7 @@
 import scala.quoted._
 object Test {
   implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
-  def main(args: Array[String]): Unit = withNewQuoteContext {
+  def main(args: Array[String]): Unit = withQuoteContext {
     def f[T](x: Expr[T])(implicit t: Type[T]) = '{
       val z: $t = $x
     }

tests/run-with-compiler/i3823-c.scala

@@ -1,7 +1,7 @@
 import scala.quoted._
 object Test {
   implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
-  def main(args: Array[String]): Unit = withNewQuoteContext {
+  def main(args: Array[String]): Unit = withQuoteContext {
     def f[T](x: Expr[T])(implicit t: Type[T]) = '{
       val z = $x
     }

tests/run-with-compiler/i3823.scala

@@ -1,7 +1,7 @@
 import scala.quoted._
 object Test {
   implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
-  def main(args: Array[String]): Unit = withNewQuoteContext {
+  def main(args: Array[String]): Unit = withQuoteContext {
     def f[T: Type](x: Expr[T])(t: Type[T]) = '{
       val z: $t = $x
     }

tests/run-with-compiler/i3847-b.scala

@@ -14,7 +14,7 @@ object Arrays {
 
 object Test {
   implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
-  def main(args: Array[String]): Unit = withNewQuoteContext {
+  def main(args: Array[String]): Unit = withQuoteContext {
     import Arrays._
     implicit val ct: Expr[ClassTag[Int]] = '{ClassTag.Int}
     val arr: Expr[Array[List[Int]]] = Array[List[Int]](List(1, 2, 3)).toExpr

tests/run-with-compiler/i3847.scala

@@ -14,7 +14,7 @@ object Arrays {
 
 object Test {
   implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(this.getClass.getClassLoader)
-  def main(args: Array[String]): Unit = withNewQuoteContext {
+  def main(args: Array[String]): Unit = withQuoteContext {
     import Arrays._
     implicit val ct: Expr[ClassTag[Int]] = '{ClassTag.Int}
     val arr: Expr[Array[Int]] = Array[Int](1, 2, 3).toExpr

tests/run-with-compiler/i3876-b.scala

@@ -11,6 +11,6 @@ object Test {
     }
 
     println(run(f2(x)))
-    println(withNewQuoteContext(f2(x).show))
+    println(withQuoteContext(f2(x).show))
   }
 }

tests/run-with-compiler/i3876-c.scala

@@ -11,6 +11,6 @@ object Test {
     }
 
     println(run(f3(x)))
-    println(withNewQuoteContext(f3(x).show)) // TODO improve printer
+    println(withQuoteContext(f3(x).show)) // TODO improve printer
   }
 }

tests/run-with-compiler/i3876-d.scala

@@ -9,7 +9,7 @@ object Test {
       inlineLambda
     }
     println(run(f4(x)))
-    println(withNewQuoteContext(f4(x).show))
+    println(withQuoteContext(f4(x).show))
   }
 
   inline def inlineLambda <: Int => Int = x => x + x

tests/run-with-compiler/i3876-e.scala

@@ -9,7 +9,7 @@ object Test {
       inlineLambda
     }
     println(run(f4(x)))
-    println(withNewQuoteContext(f4(x).show))
+    println(withQuoteContext(f4(x).show))
   }
 
   inline def inlineLambda <: Int => Int = x => x + x

tests/run-with-compiler/i3876.scala

@@ -8,6 +8,6 @@ object Test {
     val f: Expr[Int => Int] = '{ (x: Int) => x + x }
 
     println(run(f(x)))
-    println(withNewQuoteContext(f(x).show))
+    println(withQuoteContext(f(x).show))
   }
 }

tests/run-with-compiler/i3946.scala

@@ -3,7 +3,7 @@ object Test {
   def main(args: Array[String]): Unit = {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
     val u: Expr[Unit] = '{}
-    println(withNewQuoteContext(u.show))
+    println(withQuoteContext(u.show))
     println(run(u))
   }
 }

tests/run-with-compiler/i4044a.scala

@@ -5,7 +5,7 @@ class Foo {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
     val e: Expr[Int] = '{3}
     val q = '{ ${ '{ $e } } }
-    println(withNewQuoteContext(q.show))
+    println(withQuoteContext(q.show))
   }
 }
 

tests/run-with-compiler/i4044b.scala

@@ -22,6 +22,6 @@ object Test {
   def main(args: Array[String]): Unit = {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
     val q = VarRef('{4})(varRef => '{ ${varRef.update('{3})}; ${varRef.expr} })
-    println(withNewQuoteContext(q.show))
+    println(withQuoteContext(q.show))
   }
 }

tests/run-with-compiler/i4044c.scala

@@ -4,7 +4,7 @@ class Foo {
   def foo: Unit = {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
     val q = '{ ${ '{ ${ '{ 5 } } } } }
-    println(withNewQuoteContext(q.show))
+    println(withQuoteContext(q.show))
   }
 }
 

tests/run-with-compiler/i4044e.scala

@@ -7,7 +7,7 @@ class Foo {
     val f: Expr[Int] = '{5}
     val t: Type[Int] = '[Int]
     val q = '{ ${ '{ ($e + $f).asInstanceOf[$t] } } }
-    println(withNewQuoteContext(q.show))
+    println(withQuoteContext(q.show))
   }
 }
 

tests/run-with-compiler/i4044f.scala

@@ -14,7 +14,7 @@ class Foo {
         foo('{e1 + $u}, '{f1})
       }
     }
-    println(withNewQuoteContext(q.show))
+    println(withQuoteContext(q.show))
   }
 }
 

tests/run-with-compiler/i4350.scala

@@ -7,7 +7,7 @@ class Foo[T: Type] {
 
 object Test {
   implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
-  def main(args: Array[String]): Unit = withNewQuoteContext {
+  def main(args: Array[String]): Unit = withQuoteContext {
     println((new Foo[Object]).q.show)
     println((new Foo[String]).q.show)
   }

tests/run-with-compiler/i5144.scala

@@ -8,7 +8,7 @@ object Test {
     def f(x: Int): Int = ${eval1('f)}
   }
 
-  def main(args: Array[String]): Unit = withNewQuoteContext {
+  def main(args: Array[String]): Unit = withQuoteContext {
     val p = peval1()
     println(p.show)
   }

tests/run-with-compiler/i5152.scala

@@ -8,7 +8,7 @@ object Test {
     lazy val f: Int => Int = ${eval1('{(y: Int) => f(y)})}
   }
 
-  def main(args: Array[String]): Unit = withNewQuoteContext {
+  def main(args: Array[String]): Unit = withQuoteContext {
     val p = peval1()
     println(p.show)
   }

tests/run-with-compiler/i5161.scala

@@ -26,6 +26,6 @@ object Test {
     val test = Add(Int2(1), Int2(1))
     val res = evalTest(test)
     println("run : " + run(res))
-    println("show : " + withNewQuoteContext(res.show))
+    println("show : " + withQuoteContext(res.show))
   }
 }

tests/run-with-compiler/i5161b.scala

@@ -9,9 +9,9 @@ object Test {
       if (x.isInstanceOf[Some[_]]) Option(1)
       else None
     }
-    println("show0 : " + withNewQuoteContext(res.show))
+    println("show0 : " + withQuoteContext(res.show))
     println("run1 : " + run(res))
     println("run2 : " + run(res))
-    println("show3 : " + withNewQuoteContext(res.show))
+    println("show3 : " + withQuoteContext(res.show))
   }
 }

tests/run-with-compiler/i5247.scala

@@ -1,7 +1,7 @@
 import scala.quoted._
 object Test {
   implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
-  def main(args: Array[String]): Unit = withNewQuoteContext {
+  def main(args: Array[String]): Unit = withQuoteContext {
     println(foo[Object].show)
     println(bar[Object].show)
   }

tests/run-with-compiler/i5965.scala

@@ -8,15 +8,15 @@ object Test {
   def main(args: Array[String]): Unit = {
     '[List]
     val list = bound('{List(1, 2, 3)})
-    println(withNewQuoteContext(list.show))
+    println(withQuoteContext(list.show))
     println(run(list))
 
     val opt = bound('{Option(4)})
-    println(withNewQuoteContext(opt.show))
+    println(withQuoteContext(opt.show))
     println(run(opt))
 
     val map = bound('{Map(4 -> 1)})
-    println(withNewQuoteContext(map.show))
+    println(withQuoteContext(map.show))
     println(run(map))
   }
 

tests/run-with-compiler/i5965b.scala

@@ -9,15 +9,15 @@ object Test {
 
     '[List]
     val list = bound('{List(1, 2, 3)})
-    println(withNewQuoteContext(list.show))
+    println(withQuoteContext(list.show))
     println(run(list))
 
     val opt = bound('{Option(4)})
-    println(withNewQuoteContext(opt.show))
+    println(withQuoteContext(opt.show))
     println(run(opt))
 
     val map = bound('{Map(4 -> 1)})
-    println(withNewQuoteContext(map.show))
+    println(withQuoteContext(map.show))
     println(run(map))
   }
 

tests/run-with-compiler/i5997.scala

@@ -1,7 +1,7 @@
 import scala.quoted._
 object Test {
   implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
-  def main(args: Array[String]): Unit = withNewQuoteContext {
+  def main(args: Array[String]): Unit = withQuoteContext {
     val v = '{ (if true then Some(1) else None).map(v => v+1) }
     println(v.show)
   }

tests/run-with-compiler/quote-function-applied-to.scala

@@ -3,7 +3,7 @@ import scala.quoted._
 object Test {
   def main(args: Array[String]): Unit = {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
-    def show(expr: Expr[_]): String = withNewQuoteContext(expr.show)
+    def show(expr: Expr[_]): String = withQuoteContext(expr.show)
     println(show(('{ () => x(0) }).apply()))
     println(show(('{ (x1: Int) => x1 }).apply('{x(1)})))
     println(show(('{ (x1: Int, x2: Int) => x1 + x2 }).apply('{x(1)}, '{x(2)})))

tests/run-with-compiler/quote-macro-in-splice/quoted_2.scala

@@ -3,7 +3,7 @@ import Macros._
 
 object Test {
   implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
-  def main(args: Array[String]): Unit = withNewQuoteContext {
+  def main(args: Array[String]): Unit = withQuoteContext {
     val x = '{
       val y = 1
       ${

tests/run-with-compiler/quote-nested-1.scala

@@ -4,6 +4,6 @@ object Test {
   def main(args: Array[String]): Unit = {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
     val q = '{ '{3} }
-    println(withNewQuoteContext(q.show))
+    println(withQuoteContext(q.show))
   }
 }

tests/run-with-compiler/quote-nested-2.scala

@@ -9,6 +9,6 @@ object Test {
       '{${a}}
     }
 
-    println(withNewQuoteContext(q.show))
+    println(withQuoteContext(q.show))
   }
 }

tests/run-with-compiler/quote-nested-3.scala

@@ -14,6 +14,6 @@ object Test {
       x
     }
 
-    println(withNewQuoteContext(q.show))
+    println(withQuoteContext(q.show))
   }
 }

tests/run-with-compiler/quote-nested-4.scala

@@ -9,6 +9,6 @@ object Test {
       t
     }
 
-    println(withNewQuoteContext(q.show))
+    println(withQuoteContext(q.show))
   }
 }

tests/run-with-compiler/quote-nested-5.scala

@@ -12,6 +12,6 @@ object Test {
 
     }
 
-    println(withNewQuoteContext(q.show))
+    println(withQuoteContext(q.show))
   }
 }

tests/run-with-compiler/quote-owners.scala

@@ -5,7 +5,7 @@ object Test {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
     val q = f
     println(run(q))
-    println(withNewQuoteContext(q.show))
+    println(withQuoteContext(q.show))
   }
 
   def f: Expr[Int] = '{

tests/run-with-compiler/quote-run-2.scala

@@ -3,7 +3,7 @@ import scala.quoted._
 
 object Test {
   implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
-  def main(args: Array[String]): Unit = withNewQuoteContext {
+  def main(args: Array[String]): Unit = withQuoteContext {
     def powerCode(n: Int, x: Expr[Double]): Expr[Double] =
       if (n == 0) '{1.0}
       else if (n == 1) x

tests/run-with-compiler/quote-run-constants.scala

@@ -23,7 +23,7 @@ object Test {
 
     println("======")
 
-    withNewQuoteContext {
+    withQuoteContext {
       def show[T](expr: Expr[T]): Unit = println(expr.show)
 
       show(true)

tests/run-with-compiler/quote-run-staged-interpreter.scala

@@ -34,7 +34,7 @@ object Test {
     val res1 = '{ (x: Int) => ${compile(exp, Map("x" -> 'x), false)} }
 
 
-    println(withNewQuoteContext(res1.show))
+    println(withQuoteContext(res1.show))
 
     val fn = run {
       res1
@@ -46,13 +46,13 @@ object Test {
     println("---")
 
     val res2 = compile(letExp, Map(), false)
-    println(withNewQuoteContext(res2.show))
+    println(withQuoteContext(res2.show))
     println(run(res2))
 
     println("---")
 
     val res3 = compile(letExp, Map(), true)
-    println(withNewQuoteContext(res3.show))
+    println(withQuoteContext(res3.show))
     println(run(res3))
   }
 }