Fixing #1015 and #1017 when run inside of a scr...

Fixing #1015 and #1017 when run inside of a script.

#1015 still won't work in the interpreter.
#1017 still won't work in the interperter or methods.

1 files changed, 4 insertions, 3 deletions

diff --git a/src/compiler/scala/tools/nsc/ScriptRunner.scala b/src/compiler/scala/tools/nsc/ScriptRunner.scala
index d8ea282122..36b8dde168 100644
--- a/src/compiler/scala/tools/nsc/ScriptRunner.scala
+++ b/src/compiler/scala/tools/nsc/ScriptRunner.scala
@@ -165,13 +165,14 @@ object ScriptRunner {
     (packageDecl +
      "object " + objName + " {\n" +
      "  def main(argv: Array[String]): Unit = {\n" +
-     "  val args = argv;\n")
+     "  val args = argv;\n" +
+     "  new AnyRef {\n")
   }
 
   /** Code that is added to the end of a script file to make
    *  it a complete Scala compilation unit.
    */
-  val endCode = "\n} }\n"
+  val endCode = "\n} \n} }\n"
 
 
   /** Wrap a script file into a runnable object named
@@ -195,7 +196,7 @@ object ScriptRunner {
           bsf.length)
 //          f.length.asInstanceOf[Int])
     }
-    val end = new BatchSourceFile("<script trailer>", "\n} }\n".toCharArray)
+    val end = new BatchSourceFile("<script trailer>", endCode.toCharArray)
 
     new CompoundSourceFile(preamble, middle, end)
   }