Merge pull request #342 from h7x4/master

Make project build with latest dependencies

Author: sjrd

.gitignore

@@ -4,3 +4,5 @@
 *.o
 *.a
 
+# For ease of use as cmake build directory
+/build

bootcompiler/CMakeLists.txt

@@ -4,17 +4,17 @@ project(MOZARTBOOTCOMPILER NONE)
 find_package(Java COMPONENTS Runtime REQUIRED)
 
 set(SBT_JAVA_OPTS
-    -Xms512M -Xmx1024M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256M
+    -Xms512M -Xmx1024M -Xss1M
     CACHE STRING "Options passed to the Java executable when running sbt")
 
 set(SBT "${Java_JAVA_EXECUTABLE}" ${SBT_JAVA_OPTS} -Dfile.encoding=UTF-8
   -jar "${CMAKE_CURRENT_SOURCE_DIR}/sbt-launch.jar")
 
 file(GLOB_RECURSE bootcompiler_sources src/*)
 add_custom_command(OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/bootcompiler.jar"
-  COMMAND ${SBT} oneJar
+  COMMAND ${SBT} assembly
   COMMAND ${CMAKE_COMMAND} -E copy
-    "${CMAKE_CURRENT_SOURCE_DIR}/target/scala-2.11/bootcompiler_2.11-2.0-SNAPSHOT-one-jar.jar"
+    "${CMAKE_CURRENT_SOURCE_DIR}/target/scala-2.13/bootcompiler-assembly-2.0-SNAPSHOT.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,16 +2,18 @@ name := "bootcompiler"
 
 version := "2.0-SNAPSHOT"
 
-scalaVersion := "2.11.2"
+scalaVersion := "2.13.8"
 
-scalacOptions ++= Seq("-deprecation", "-optimize")
+scalacOptions ++= Seq("-language:postfixOps", "-deprecation", "-optimize")
 
-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: _*)
+libraryDependencies += "org.scala-lang.modules" %% "scala-parser-combinators" % "2.1.1"
+libraryDependencies += "com.github.scopt" %% "scopt" % "4.1.0"
+libraryDependencies += "io.spray" %% "spray-json" % "1.3.6"
 
 // Work around a bug that prevents generating documentation
 unmanagedClasspath in Compile +=
     Attributed.blank(new java.io.File("doesnotexist"))
+
+// Added during migration to the java 9 module system
+Compile / packageBin / packageOptions +=
+  Package.ManifestAttributes("Add-Exports" -> "java.base/jdk.internal.math")

bootcompiler/project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.6
+sbt.version=1.6.2

bootcompiler/project/plugins.sbt

@@ -1 +1 @@
-addSbtPlugin("com.github.retronym" % "sbt-onejar" % "0.8")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.6")

bootcompiler/sbt

@@ -1,5 +1,5 @@
 #!/usr/bin/env sh
 
-java ${DEBUG_PARAM} -Xms512M -Xmx1536M -Xss1M -XX:+CMSClassUnloadingEnabled \
-  -XX:MaxPermSize=384M ${JAVA_OPTS} -Dfile.encoding=UTF-8 \
+java ${DEBUG_PARAM} -Xms512M -Xmx1536M -Xss1M \
+  ${JAVA_OPTS} -Dfile.encoding=UTF-8 \
   -jar `dirname $0`/sbt-launch.jar "$@"

bootcompiler/sbt.bat

@@ -1,4 +1,4 @@
 @echo off
 
 set SCRIPT_DIR=%~dp0
-java -Xms512M -Xmx1024M -Xss1M -XX:+CMSClassUnloadingEnabled -XX:MaxPermSize=256M %JAVA_OPTS% -Dfile.encoding=UTF-8 -jar "%SCRIPT_DIR%sbt-launch.jar" %*
+java -Xms512M -Xmx1024M -Xss1M %JAVA_OPTS% -Dfile.encoding=UTF-8 -jar "%SCRIPT_DIR%sbt-launch.jar" %*

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

@@ -3,10 +3,12 @@ package org.mozartoz.bootcompiler
 import java.io.{ Console => _, _ }
 
 import scala.collection.mutable.ListBuffer
-import scala.collection.immutable.PagedSeq
+import scala.util.parsing.input.PagedSeqReader
 import scala.util.parsing.combinator._
 import scala.util.parsing.input._
-import scala.util.parsing.json._
+
+import scopt.{ OParser, OParserSetup, DefaultOParserSetup }
+import spray.json._
 
 import oz._
 import parser._
@@ -38,34 +40,39 @@ case class Config(
 /** Entry point for the Mozart2 bootstrap compiler */
 object Main {
   /** Executes the Mozart2 bootstrap compiler */
-  def main(args: Array[String]) {
+  def main(args: Array[String]): Unit = {
     // Define command-line options
     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")
+
+      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
-    optParser.parse(args, Config()) map { config =>
-      // OK, we're good to go
+    optParser.parse(args, Config()).foreach({ config =>
       try {
         config.mode match {
           case Config.Mode.Module =>
@@ -80,15 +87,11 @@ object Main {
           th.printStackTrace()
           sys.exit(2)
       }
-    } getOrElse {
-      // Bad command-line arguments
-      optParser.showUsage
-      sys.exit(1)
-    }
+    })
   }
 
   /** Performs the Module mode */
-  private def mainModule(config: Config) {
+  private def mainModule(config: Config): Unit = {
     import config._
 
     val (program, _) = createProgram(moduleDefs, Some(baseDeclsFileName))
@@ -103,7 +106,7 @@ object Main {
   }
 
   /** Performs the BaseEnv mode */
-  private def mainBaseEnv(config: Config) {
+  private def mainBaseEnv(config: Config): Unit = {
     import config._
 
     val (program, bootModules) = createProgram(moduleDefs, None, true)
@@ -120,8 +123,10 @@ object Main {
   }
 
   /** Creates a new Program */
-  private def createProgram(moduleDefs: List[String],
-      baseDeclsFileName: Option[String], isBaseEnvironment: Boolean = false) = {
+  private def createProgram(
+    moduleDefs: List[String],
+    baseDeclsFileName: Option[String],
+    isBaseEnvironment: Boolean = false): (Program, Map[String, Expression]) = {
     val program = new Program(isBaseEnvironment)
     val bootModules = loadModuleDefs(program, moduleDefs)
 
@@ -140,8 +145,10 @@ object Main {
    *  @param reader input reader
    *  @return The statement AST
    */
-  private def parseStatement(reader: PagedSeqReader, file: File,
-      defines: Set[String]) =
+  private def parseStatement(
+    reader: PagedSeqReader,
+    file: File,
+    defines: Set[String]): Statement =
     new ParserWrapper().parseStatement(reader, file, defines)
 
   /** Parses an Oz expression from a reader
@@ -153,7 +160,7 @@ object Main {
    *  @return The expression AST
    */
   private def parseExpression(reader: PagedSeqReader, file: File,
-      defines: Set[String]) =
+      defines: Set[String]): Expression =
     new ParserWrapper().parseExpression(reader, file, defines)
 
   /** Utility wrapper for an [[org.mozartoz.bootcompiler.parser.OzParser]]
@@ -165,11 +172,11 @@ object Main {
     private val parser = new OzParser()
 
     def parseStatement(reader: PagedSeqReader, file: File,
-        defines: Set[String]) =
+        defines: Set[String]): Statement =
       processResult(parser.parseStatement(reader, file, defines))
 
     def parseExpression(reader: PagedSeqReader, file: File,
-        defines: Set[String]) =
+        defines: Set[String]): Expression =
       processResult(parser.parseExpression(reader, file, defines))
 
     /** Processes a parse result
@@ -200,7 +207,7 @@ object Main {
    *
    *  @param fileName name of the file to be read
    */
-  private def readerForFile(fileName: String) = {
+  private def readerForFile(fileName: String): PagedSeqReader = {
     new PagedSeqReader(PagedSeq.fromReader(
         new BufferedReader(new FileReader(fileName))))
   }
@@ -211,8 +218,6 @@ object Main {
    *  @param moduleDefs list of files that define builtin modules
    */
   private def loadModuleDefs(prog: Program, moduleDefs: List[String]) = {
-    JSON.globalNumberParser = (_.toInt)
-
     val result = new scala.collection.mutable.HashMap[String, Expression]
 
     for (moduleDef <- moduleDefs) {
@@ -235,53 +240,58 @@ object Main {
   }
 
   /** Loads one builtin module definition */
-  private def loadModuleDef(prog: Program, moduleDef: File) = {
-    class CC[T] {
-      def unapply(a: Any): Option[T] = Some(a.asInstanceOf[T])
+  private def loadModuleDef(prog: Program, moduleDef: File): List[(String, Record)] = {
+    case class JsParameter(val kind: String)
+
+    case class JsBuiltin(
+      val name: String,
+      val inlineable: Boolean,
+      val inlineOpCode: Option[Int],
+      val params: List[JsParameter]
+    )
+
+    case class JsModule(
+      val name: String,
+      val builtins: List[JsBuiltin]
+    )
+
+    object ModuleJsonProtocol extends DefaultJsonProtocol {
+      implicit val parameterJsonFormat: RootJsonFormat[JsParameter] = jsonFormat1(JsParameter)
+      implicit val builtinJsonFormat: RootJsonFormat[JsBuiltin] = jsonFormat4(JsBuiltin)
+      implicit val moduleJsonFormat: RootJsonFormat[JsModule] = jsonFormat2(JsModule)
     }
 
-    object M extends CC[Map[String, Any]]
-    object L extends CC[List[Any]]
-    object S extends CC[String]
-    object D extends CC[Double]
-    object B extends CC[Boolean]
+    import ModuleJsonProtocol._
+
+    val jsModule: JsModule =
+      readFileToString(moduleDef)
+        .parseJson
+        .convertTo[JsModule]
 
-    val modules = JSON.parseFull(readFileToString(moduleDef)).toList
+    val exportFields = new ListBuffer[RecordField]
 
     for {
-      M(module) <- modules
-      S(modName) = module("name")
-      L(builtins) = module("builtins")
+      jsBuiltin <- jsModule.builtins
     } yield {
-      val exportFields = new ListBuffer[RecordField]
-
-      for {
-        M(bi) <- builtins
-        S(biName) = bi("name")
-        B(inlineable) = bi("inlineable")
-        L(params) = bi("params")
-      } {
-        val inlineAs =
-          if (inlineable) Some(bi("inlineOpCode").asInstanceOf[Int])
-          else None
-
-        val paramKinds = for {
-          M(param) <- params
-          S(paramKind) = param("kind")
-        } yield {
-          Builtin.ParamKind.withName(paramKind)
-        }
+      val inlineAs: Option[Int] =
+        if (jsBuiltin.inlineable) jsBuiltin.inlineOpCode
+        else None
+
+      val paramKinds = for {
+        jsParam <- jsBuiltin.params
+      } yield {
+        Builtin.ParamKind.withName(jsParam.kind)
+      }
 
-        val builtin = new Builtin(
-            modName, biName, paramKinds, inlineAs)
+      val builtin = new Builtin(
+        jsModule.name, jsBuiltin.name, paramKinds, inlineAs)
 
-        prog.builtins.register(builtin)
+      prog.builtins.register(builtin)
 
-        exportFields += RecordField(
-            Constant(OzAtom(biName)), Constant(OzBuiltin(builtin)))
-      }
+      exportFields += RecordField(
+          Constant(OzAtom(builtin.name)), Constant(OzBuiltin(builtin)))
 
-      val moduleURL = "x-oz://boot/" + modName
+      val moduleURL = "x-oz://boot/" + jsModule.name
       val moduleExport = Record(Constant(OzAtom("export")), exportFields.toList)
 
       moduleURL -> moduleExport
@@ -293,7 +303,7 @@ object Main {
    *  @param prog program to compile
    *  @param fileName top-level file that is being processed
    */
-  private def compile(prog: Program, fileName: String) {
+  private def compile(prog: Program, fileName: String): Unit = {
     applyTransforms(prog)
 
     if (prog.hasErrors) {
@@ -311,7 +321,7 @@ object Main {
   }
 
   /** Applies the successive transformation phases to a program */
-  private def applyTransforms(prog: Program) {
+  private def applyTransforms(prog: Program): Unit = {
     Namer(prog)
     DesugarFunctor(prog)
     DesugarClass(prog)
@@ -328,7 +338,7 @@ object Main {
    *  @param file file to read
    *  @return the contents of the file
    */
-  private def readFileToString(file: File) = {
+  private def readFileToString(file: File): String = {
     val source = io.Source.fromFile(file)
     try source.mkString
     finally source.close()
@@ -339,7 +349,7 @@ object Main {
    *  @param file file to read
    *  @return the lines in the file
    */
-  private def readFileLines(file: File) = {
+  private def readFileLines(file: File): List[String] = {
     val source = io.Source.fromFile(file)
     try source.getLines().toList
     finally source.close()

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

@@ -19,7 +19,7 @@ object ProgramBuilder extends TreeDSL with TransformUtils {
    *  end
    *  }}}
    */
-  def buildModuleProgram(prog: Program, functor: Expression) {
+  def buildModuleProgram(prog: Program, functor: Expression): Unit = {
     prog.rawCode = {
       prog.topLevelResultSymbol === functor
     }
@@ -65,7 +65,7 @@ object ProgramBuilder extends TreeDSL with TransformUtils {
    */
   def buildBaseEnvProgram(prog: Program,
       bootModulesMap: Map[String, Expression],
-      baseFunctor0: Expression) {
+      baseFunctor0: Expression): Unit = {
 
     val baseFunctor = baseFunctor0.asInstanceOf[FunctorExpression]