Merge pull request #222 from sjrd/upgrade-scala-stuff

Upgrade the Scala ecosystem of the bootcompiler.

Author: eregon

bootcompiler/.gitignore

@@ -4,3 +4,8 @@ lib_managed/
 src_managed/
 project/boot/
 .cache
+
+# Eclipse
+/.classpath
+/.project
+/.settings/

bootcompiler/CMakeLists.txt

@@ -12,9 +12,9 @@ set(SBT "${Java_JAVA_EXECUTABLE}" ${SBT_JAVA_OPTS} -Dfile.encoding=UTF-8
 
 file(GLOB_RECURSE bootcompiler_sources src/*)
 add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/bootcompiler.jar"
-  COMMAND ${SBT} one-jar
+  COMMAND ${SBT} oneJar
   COMMAND ${CMAKE_COMMAND} -E copy
-    "${CMAKE_CURRENT_SOURCE_DIR}/target/scala-2.9.1/bootcompiler_2.9.1-2.0-SNAPSHOT-one-jar.jar"
+    "${CMAKE_CURRENT_SOURCE_DIR}/target/scala-2.11/bootcompiler_2.11-2.0-SNAPSHOT-one-jar.jar"
     "${CMAKE_CURRENT_BINARY_DIR}/bootcompiler.jar"
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
   DEPENDS "sbt-launch.jar" "build.sbt" "project/plugins.sbt" ${bootcompiler_sources}

bootcompiler/build.sbt

@@ -2,11 +2,13 @@ name := "bootcompiler"
 
 version := "2.0-SNAPSHOT"
 
-scalaVersion := "2.9.1"
+scalaVersion := "2.11.2"
 
 scalacOptions ++= Seq("-deprecation", "-optimize")
 
-libraryDependencies += "com.github.scopt" %% "scopt" % "2.1.0"
+libraryDependencies += "org.scala-lang.modules" %% "scala-parser-combinators" % "1.0.2"
+
+libraryDependencies += "com.github.scopt" %% "scopt" % "3.2.0"
 
 seq(com.github.retronym.SbtOneJar.oneJarSettings: _*)
 

bootcompiler/project/build.properties

@@ -0,0 +1 @@
+sbt.version=0.13.6

bootcompiler/sbt-launch.jar

@@ -40,28 +40,27 @@ object Main {
   /** Executes the Mozart2 bootstrap compiler */
   def main(args: Array[String]) {
     // Define command-line options
-    val optParser = new scopt.immutable.OptionParser[Config]("scopt", "2.x") {
-      def options = Seq(
-        flag("baseenv", "switch to base environment mode") {
-          c => c.copy(mode = Config.Mode.BaseEnv)
-        },
-        opt("o", "output", "output file") {
-          (v, c) => c.copy(outputStream =
-            () => new BufferedOutputStream(new FileOutputStream(v)))
-        },
-        opt("m", "module", "module definition file or directory") {
-          (v, c) => c.copy(moduleDefs = v :: c.moduleDefs)
-        },
-        opt("b", "base", "path to the base declarations file") {
-          (v, c) => c.copy(baseDeclsFileName = v)
-        },
-        opt("D", "define", "add a symbol to the conditional defines") {
-          (v, c) => c.copy(defines = c.defines + v)
-        },
-        arg("<file>", "input file") {
-          (v, c) => c.copy(fileName = v)
-        }
-      )
+    val optParser = new scopt.OptionParser[Config]("bootcompiler") {
+      head("bootcompiler", "2.0.x")
+      opt[Unit]("baseenv") action {
+        (_, c) => c.copy(mode = Config.Mode.BaseEnv)
+      } text("switch to base environment mode")
+      opt[String]('o', "output") action {
+        (v, c) => c.copy(outputStream =
+          () => new BufferedOutputStream(new FileOutputStream(v)))
+      } text("output file")
+      opt[String]('m', "module") action {
+        (v, c) => c.copy(moduleDefs = v :: c.moduleDefs)
+      } text("module definition file or directory")
+      opt[String]('b', "base") action {
+        (v, c) => c.copy(baseDeclsFileName = v)
+      } text("path to the base declarations file")
+      opt[String]('D', "define") action {
+        (v, c) => c.copy(defines = c.defines + v)
+      } text("add a symbol to the conditional defines")
+      arg[String]("<file>") action {
+        (v, c) => c.copy(fileName = v)
+      } text("input file")
     }
 
     // Parse the options

bootcompiler/src/main/scala/org/mozartoz/bootcompiler/Main.scala

@@ -1,6 +1,8 @@
 package org.mozartoz.bootcompiler
 package ast
 
+import scala.reflect.ClassTag
+
 import oz._
 import symtab._
 import transform._
@@ -236,25 +238,27 @@ trait TreeDSL {
     LOCAL (temp) IN expression(temp)
   }
 
-  def statementWithValIn[A >: Variable <: Expression](value: Expression)(
-      statement: A => Statement)(implicit m: Manifest[A]) = {
-    if (m.erasure.isInstance(value)) {
-      statement(value.asInstanceOf[A])
-    } else {
-      statementWithTemp { temp =>
-        (temp === value) ~ statement(temp)
-      }
+  def statementWithValIn[A >: Variable <: Expression : ClassTag](value: Expression)(
+      statement: A => Statement) = {
+    value match {
+      case value: A =>
+        statement(value)
+      case _ =>
+        statementWithTemp { temp =>
+          (temp === value) ~ statement(temp)
+        }
     }
   }
 
-  def expressionWithValIn[A >: Variable <: Expression](value: Expression)(
-      expression: A => Expression)(implicit m: Manifest[A]) = {
-    if (m.erasure.isInstance(value)) {
-      expression(value.asInstanceOf[A])
-    } else {
-      expressionWithTemp { temp =>
-        (temp === value) ~> expression(temp)
-      }
+  def expressionWithValIn[A >: Variable <: Expression : ClassTag](value: Expression)(
+      expression: A => Expression) = {
+    value match {
+      case value: A =>
+        expression(value)
+      case _ =>
+        expressionWithTemp { temp =>
+          (temp === value) ~> expression(temp)
+        }
     }
   }
 }

bootcompiler/src/main/scala/org/mozartoz/bootcompiler/ast/TreeDSL.scala

@@ -104,7 +104,7 @@ object DesugarFunctor extends Transformer with TreeDSL {
 
     val importedDecls = extractAllImportedDecls(imports)
 
-    val (definedDecls, defineStat) = define match {
+    val (definedDecls, defineStat) = (define: @unchecked) match {
       case Some(LocalStatement(decls, stat)) => (decls, stat)
       case None => (Nil, SkipStatement())
     }

bootcompiler/src/main/scala/org/mozartoz/bootcompiler/transform/DesugarFunctor.scala

@@ -62,7 +62,7 @@ abstract class Transformer extends (Program => Unit) {
   }
 
   /** Transforms a Statement */
-  def transformStat(statement: Statement): Statement = statement match {
+  def transformStat(statement: Statement): Statement = (statement: @unchecked) match {
     case CompoundStatement(stats) =>
       treeCopy.CompoundStatement(statement, stats map transformStat)
 
@@ -130,7 +130,7 @@ abstract class Transformer extends (Program => Unit) {
   }
 
   /** Transforms an expression */
-  def transformExpr(expression: Expression): Expression = expression match {
+  def transformExpr(expression: Expression): Expression = (expression: @unchecked) match {
     case StatAndExpression(statement, expr) =>
       treeCopy.StatAndExpression(expression, transformStat(statement),
           transformExpr(expr))