Merge pull request #11 from ShapelessCat/m2

Upgrade to 3.0.0-M2

Author: nicolasstucki

.gitignore

@@ -25,3 +25,9 @@ classes/
 .idea
 .idea_modules
 /.worksheet/
+
+# metals
+.metals
+
+# vscode
+.vscode

src/main/g8/build.sbt

@@ -1,4 +1,4 @@
-val dottyVersion = "3.0.0-M1"
+val dottyVersion = "3.0.0-M2"
 
 lazy val root = project
   .in(file("."))

src/main/g8/project/build.properties

@@ -1 +1 @@
-sbt.version=1.3.13
+sbt.version=1.4.4

src/main/g8/src/main/scala/Main.scala

@@ -1,7 +1,7 @@
 
 // Import Expr and some extension methods
 import scala.quoted._
-import scala.quoted.staging.{run, withQuoteContext, Toolbox}
+import scala.quoted.staging.{run, withQuotes, Toolbox}
 
 object Main {
 
@@ -24,21 +24,21 @@ object Main {
 
   def stagedPower(n: Int): Double => Double = {
     // Code representing the labmda where the recursion is unrolled based on the value of n
-    def code(using QuoteContext) = '{ (x: Double) => \${ powerCode(n, 'x) } }
+    def code(using Quotes) = '{ (x: Double) => \${ powerCode(n, 'x) } }
 
     println(s"staged power for n=" + n + ":")
-    println(withQuoteContext(code.show))
+    println(withQuotes(code.show))
 
     // Evaluate the contents of the code and return it's value
     run(code)
   }
 
-  def powerCode(n: Int, x: Expr[Double])(using ctx: QuoteContext): Expr[Double] =
-    if (n == 0) Expr(1.0) // Expr() lifts 1.0 to '{1.0}
-    else if (n == 1) x // optimization to not generate x * 1
-    else if (n < 0) throw new Exception("Negative powers not implemented. Left as a small exercise. Dont be shy, try it out.")
-    else if (n == 2) '{ \$x * \$x } // optimization to not generate { val y = x; y * y }
-    else if (n % 2 == 1)  '{ \$x * \${ powerCode(n - 1, x) } }
-    else '{ val y = \$x * \$x; \${ powerCode(n / 2, 'y) } }
+  def powerCode(n: Int, x: Expr[Double])(using Quotes): Expr[Double] =
+    if (n == 0)          Expr(1.0) // Expr() lifts 1.0 to '{1.0}
+    else if (n == 1)     x // optimization to not generate x * 1
+    else if (n < 0)      throw new Exception("Negative powers not implemented. Left as a small exercise. Dont be shy, try it out.")
+    else if (n == 2)     '{ \$x * \$x } // optimization to not generate { val y = x; y * y }
+    else if (n % 2 == 1) '{ \$x * \${ powerCode(n - 1, x) } }
+    else                 '{ val y = \$x * \$x; \${ powerCode(n / 2, 'y) } }
 
 }

src/main/g8/src/test/scala/Test1.scala

@@ -1,6 +1,6 @@
 
 import scala.quoted._
-import scala.quoted.staging.{run, withQuoteContext, Toolbox}
+import scala.quoted.staging.{run, withQuotes, Toolbox}
 
 import org.junit.Test
 import org.junit.Assert._
@@ -10,10 +10,10 @@ class Test1 {
   // Needed to run or show quotes
   given Toolbox = Toolbox.make(getClass.getClassLoader)
 
-  private def code(using QuoteContext) = '{ identity("foo") }
+  private def code(using Quotes) = '{ identity("foo") }
 
   @Test def t1(): Unit = {
-    assertEquals("scala.Predef.identity[java.lang.String](\"foo\")", withQuoteContext(code.show))
+    assertEquals("scala.Predef.identity[java.lang.String](\"foo\")", withQuotes(code.show))
     assertEquals("foo", run(code))
   }
 }