Skip to content
This repository has been archived by the owner on Sep 25, 2020. It is now read-only.

Commit

Permalink
re-enable Scala tools support (reverts 5592324)
Browse files Browse the repository at this point in the history
  • Loading branch information
larsrh committed Jul 31, 2017
1 parent 95b4ee3 commit ca6964b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,8 @@ lazy val pideExtraSettings = Seq(
libraryDependencies ++= Seq(
"org.tukaani" % "xz" % "1.6",
"com.jcraft" % "jsch" % "0.1.54",
"com.jcraft" % "jzlib" % "1.1.3"
"com.jcraft" % "jzlib" % "1.1.3",
("org.scala-lang" % "scala-compiler" % scalaVersion.value).exclude("org.scala-lang", "scala-library")
)
)

Expand Down
12 changes: 6 additions & 6 deletions modules/pide/2016-1/src/main/scala/System/isabelle_tool.scala
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Isabelle system tools: external executables or internal Scala functions.
package isabelle

import java.net.URLClassLoader
//import scala.reflect.runtime.universe
//import scala.tools.reflect.{ToolBox,ToolBoxError}
import scala.reflect.runtime.universe
import scala.tools.reflect.{ToolBox,ToolBoxError}


object Isabelle_Tool
Expand All @@ -18,7 +18,7 @@ object Isabelle_Tool

abstract class Body extends Function[List[String], Unit]

/*private def compile(path: Path): Body =
private def compile(path: Path): Body =
{
def err(msg: String): Nothing =
cat_error(msg, "The error(s) above occurred in Isabelle/Scala tool " + path)
Expand Down Expand Up @@ -48,7 +48,7 @@ object Isabelle_Tool
else
err(e.toString)
}
}*/
}


/* external tools */
Expand Down Expand Up @@ -83,8 +83,8 @@ object Isabelle_Tool

private def find_external(name: String): Option[List[String] => Unit] =
dirs.collectFirst({
//case dir if is_external(dir, name + ".scala") =>
// compile(dir + Path.basic(name + ".scala"))
case dir if is_external(dir, name + ".scala") =>
compile(dir + Path.basic(name + ".scala"))
case dir if is_external(dir, name) =>
(args: List[String]) =>
{
Expand Down

0 comments on commit ca6964b

Please sign in to comment.