From a2e7db77f96fd7356c07619751d2c3e46aea9db9 Mon Sep 17 00:00:00 2001
From: Etienne Kneuss <ekneuss@gmail.com>
Date: Thu, 13 Dec 2012 13:37:34 +0100
Subject: [PATCH] Break the inner-compiler in different ways so that it works
with sbt test.
---
src/main/scala/leon/Settings.scala | 3 +++
src/main/scala/leon/plugin/ExtractionPhase.scala | 3 ++-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/main/scala/leon/Settings.scala b/src/main/scala/leon/Settings.scala
index f9de5e4b1..5a56cbb71 100644
--- a/src/main/scala/leon/Settings.scala
+++ b/src/main/scala/leon/Settings.scala
@@ -22,5 +22,8 @@ case class Settings(
val synthesis: Boolean = false,
val xlang: Boolean = false,
val verify: Boolean = true,
+ // This is a list of directories that is passed as class-path of the inner-compiler.
+ // It needs to contain at least a directory containing scala-library.jar, and
+ // one for the leon runtime library.
val classPath: List[String] = Settings.defaultClassPath()
)
diff --git a/src/main/scala/leon/plugin/ExtractionPhase.scala b/src/main/scala/leon/plugin/ExtractionPhase.scala
index 2b9c197c4..1c788def1 100644
--- a/src/main/scala/leon/plugin/ExtractionPhase.scala
+++ b/src/main/scala/leon/plugin/ExtractionPhase.scala
@@ -13,7 +13,8 @@ object ExtractionPhase extends LeonPhase[List[String], Program] {
val settings = new NSCSettings
- settings.extdirs.value = ctx.settings.classPath.mkString(":")
+ //settings.extdirs.value = ctx.settings.classPath.mkString(":")
+ settings.usejavacp.value = true
val compilerOpts = args.filterNot(_.startsWith("--"))
--
GitLab