Merge pull request #1 from lampepfl/fix-eof-bug

Fix EOF bug and upgrade

Author: nicolasstucki

src/main/g8/build.sbt

@@ -1,4 +1,4 @@
-val dottyVersion = "0.8.0-RC1"
+val dottyVersion = "0.9.0-RC1"
 
 lazy val root = project
   .in(file("."))
@@ -9,8 +9,8 @@ lazy val root = project
     scalaVersion := dottyVersion,
 
     libraryDependencies ++= Seq(
-      "ch.epfl.lamp" % "dotty_0.8" % dottyVersion,
-      "ch.epfl.lamp" % "dotty_0.8" % dottyVersion % "test->runtime",
+      "ch.epfl.lamp" % "dotty_0.9" % dottyVersion,
+      "ch.epfl.lamp" % "dotty_0.9" % dottyVersion % "test->runtime",
       "com.novocode" % "junit-interface" % "0.11" % "test"
     )
   )

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

@@ -9,23 +9,23 @@ object Main {
 
   def main(args: Array[String]): Unit = {
     val square = stagedPower(2)
-    println(s"3^2 = " + square(3))
-    println(s"4.1^2 = " + square(4.1))
+    println("3^2 = " + square(3))
+    println("4.1^2 = " + square(4.1))
     println()
     val cube = stagedPower(3)
-    println(s"2.4^3 = " + cube(2.4))
+    println("2.4^3 = " + cube(2.4))
     println()
 
     val toTheFourth = stagedPower(4)
-    println(s"3^4 = " + toTheFourth(3))
+    println("3^4 = " + toTheFourth(3))
     println()
   }
 
   def stagedPower(n: Int): Double => Double = {
     // Code representing the labmda where the recursion is unrolled based on the value of n
     val code = '{ (x: Double) => ~powerCode(n, '(x)) }
 
-    println(s"staged power for n=$n:")
+    println(s"staged power for n=" + n + ":")
     println(code.show)
 
     // Evaluate the contents of the code and return it's value
@@ -35,6 +35,7 @@ object Main {
   def powerCode(n: Int, x: Expr[Double]): Expr[Double] =
     if (n == 0) 1.0.toExpr // toExpr 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

@@ -8,6 +8,6 @@ import org.junit.Assert._
 class Test1 {
   @Test def t1(): Unit = {
     val code = '(println("foo"))
-    assertEquals("println(\"foo\")", code.show)
+    assertEquals("scala.Predef.println(\"foo\")", code.show)
   }
 }