Merge pull request #6689 from dotty-staging/homogenize-run-and-splice

Homogenize $ and run notation

Author: nicolasstucki

compiler/test-resources/repl-macros/i6007

@@ -4,5 +4,5 @@ scala> val v = '{ (if true then Some(1) else None).map(v => v+1) }
 val v: quoted.Expr[Option[Int]] = Expr(<pickled tasty>)
 scala> 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> v.run
+scala> scala.quoted.run(v)
 val res1: Option[Int] = Some(2)

library/src-2.x/scala/quoted/Expr.scala

@@ -8,6 +8,7 @@ package quoted {
      *
      *  May throw a FreeVariableError on expressions that came from a macro.
      */
+    @deprecated("Use scala.quoted.run", "")
     final def run(implicit toolbox: Toolbox): T = toolbox.run(this)
 
   }

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

@@ -8,6 +8,7 @@ package quoted {
      *
      *  May throw a FreeVariableError on expressions that came from a macro.
      */
+    @deprecated("Use scala.quoted.run", "")
     final def run(implicit toolbox: Toolbox): T = toolbox.run(this)
 
   }

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

@@ -2,6 +2,20 @@ package scala
 
 package object quoted {
 
+  /** Evaluate the contents of this expression and return the result.
+   *
+   *  Usage:
+   *  ```
+   *  val e: T = run {
+   *   expr
+   *  }
+   *  ```
+   *  where `expr: Expr[T]`
+    *
+   *  May throw a FreeVariableError on expressions that came from a macro.
+   */
+  def run[T](expr: Expr[T]) given (toolbox: Toolbox): T = toolbox.run(expr)
+
   object autolift {
     implicit def autoToExpr[T: Liftable](x: T): Expr[T] = x.toExpr
   }

tests/run-with-compiler-custom-args/staged-streams_1.scala

@@ -678,25 +678,25 @@ object Test {
 
   def main(args: Array[String]): Unit = {
     implicit val toolbox: scala.quoted.Toolbox = scala.quoted.Toolbox.make(getClass.getClassLoader)
-    println(test1().run)
+    println(run(test1()))
     println
-    println(test2().run)
+    println(run(test2()))
     println
-    println(test3().run)
+    println(run(test3()))
     println
-    println(test4().run)
+    println(run(test4()))
     println
-    println(test5().run)
+    println(run(test5()))
     println
-    println(test6().run)
+    println(run(test6()))
     println
-    println(test7().run)
+    println(run(test7()))
     println
-    println(test8().run)
+    println(run(test8()))
     println
-    println(test9().run)
+    println(run(test9()))
     println
-    println(test10().run)
+    println(run(test10()))
   }
 }
 

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

@@ -9,7 +9,7 @@ object Test {
       def f(x: Int): Int = x + x
       f
     }
-    println(f2(x).run)
+    println(run(f2(x)))
     println(f2(x).show)
   }
 }

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

@@ -9,7 +9,7 @@ object Test {
       val f: (x: Int) => Int = x => x + x
       f
     }
-    println(f3(x).run)
+    println(run(f3(x)))
     println(f3(x).show) // TODO improve printer
   }
 }

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

@@ -8,7 +8,7 @@ object Test {
     val f4: Expr[Int => Int] = '{
       inlineLambda
     }
-    println(f4(x).run)
+    println(run(f4(x)))
     println(f4(x).show)
   }
 

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

@@ -8,7 +8,7 @@ object Test {
     val f4: Expr[Int => Int] = '{
       inlineLambda
     }
-    println(f4(x).run)
+    println(run(f4(x)))
     println(f4(x).show)
   }
 

tests/run-with-compiler/i3876.scala

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