Chalie: Fix Visual Studio integration and add note about JVM stack size problems.

4 files changed, 8 insertions, 3 deletions

diff --git a/Chalice/readme.txt b/Chalice/readme.txt
index 3f36e1db..37998339 100644
--- a/Chalice/readme.txt
+++ b/Chalice/readme.txt
@@ -7,3 +7,8 @@ Running Chalice: chalice.bat <file.chalice> [-params]
 Running the tests for Chalice: see tests/readme.txt

 

 Chalice is built using Simple Build Tool (https://github.com/harrah/xsbt/wiki/Setup)

+

+Note: You might have to increase the stack size of the JVM to avoid a stack

+overflow, for instance by changing scala.bat by adding "-Xss16M" to the

+JAVA_OPTS: 

+    if "%_JAVA_OPTS%"=="" set _JAVA_OPTS=-Xmx256M -Xms32M -Xss16M

diff --git a/Chalice/src/main/scala/Chalice.scala b/Chalice/src/main/scala/Chalice.scala
index 594273cb..e49d12a5 100644
--- a/Chalice/src/main/scala/Chalice.scala
+++ b/Chalice/src/main/scala/Chalice.scala
@@ -189,7 +189,7 @@ object Chalice {
     // parse programs

     val parser = new Parser();

     val parseResults = if (files.isEmpty) {

-      println("No input file provided. Use 'chalice /help' for a list of all available command line options. Reading from stdin...")

+      if (!vsMode) println("No input file provided. Use 'chalice /help' for a list of all available command line options. Reading from stdin...")

       List(parser.parseStdin)

     } else for (file <- files) yield {

       parser.parseFile(file)

diff --git a/Chalice/src/main/scala/SmokeTest.scala b/Chalice/src/main/scala/SmokeTest.scala
index 9f23d144..f317f24c 100644
--- a/Chalice/src/main/scala/SmokeTest.scala
+++ b/Chalice/src/main/scala/SmokeTest.scala
@@ -25,7 +25,7 @@ object SmokeTest {
     var warning: Boolean = false // did this "assert false" generate a warning? (i.e. did it not generate a Boogie error?)

   }

   /** Serves as a sentinel for the first assert (which should always cause a

-   *  warning, thus SmokeAssertSentinel.warning = false

+   *  warning, thus SmokeAssertSentinel.warning = false)

    */

   object SmokeAssertSentinel extends SmokeAssert(-1, NoPosition, "", Set(), null)

 

diff --git a/Util/VS2010/Chalice/StartChalice.bat b/Util/VS2010/Chalice/StartChalice.bat
index 0e7401e4..e2de0e65 100644
--- a/Util/VS2010/Chalice/StartChalice.bat
+++ b/Util/VS2010/Chalice/StartChalice.bat
@@ -3,7 +3,7 @@ echo ---------- Starting ------------ < nul >> c:\tmp\coo.out
 time < nul >> c:\tmp\coo.out

 echo. < nul >> c:\tmp\coo.out

 

-call "c:\Program Files\Scala\bin\scala" -cp c:\boogie\Chalice\bin chalice.Chalice -nologo -vs %* 2>> c:\tmp\coo.out

+call "c:\Program Files\Scala\bin\scala" -cp c:\boogie\Chalice\target\scala-2.8.1.final\classes chalice.Chalice /boogieOpt:nologo /vs %* 2>> c:\tmp\coo.out

 

 time < nul >> c:\tmp\coo.out

 echo. < nul >> c:\tmp\coo.out