From 18da40ae4bbcdde226e8ba2ba13a56b32eb80bf2 Mon Sep 17 00:00:00 2001 From: Geoffrey Washburn Date: Tue, 10 Jun 2008 07:18:47 +0000 Subject: 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. --- test/files/script/t1015.scala | 26 ++++++++++++++++++++++++++ test/files/script/t1017.scala | 29 +++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100755 test/files/script/t1015.scala create mode 100755 test/files/script/t1017.scala (limited to 'test/files') diff --git a/test/files/script/t1015.scala b/test/files/script/t1015.scala new file mode 100755 index 0000000000..52d67bd6cc --- /dev/null +++ b/test/files/script/t1015.scala @@ -0,0 +1,26 @@ +#!/bin/sh +# fact - A simple Scala script that prints out the factorial of +# the argument specified on the command line. + +cygwin=false; +case "`uname`" in + CYGWIN*) cygwin=true ;; +esac + +SOURCE="$0"; +if $cygwin; then + if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then + format=mixed + else + format=windows + fi + SOURCE=`cygpath --$format "$SOURCE"`; +fi + +exec scala -nocompdaemon "$SOURCE" "$@" +!# + +case class Test(one : Int, two : Int) +object Test{ + def apply(one : Int): Test = Test(one, 2); +} diff --git a/test/files/script/t1017.scala b/test/files/script/t1017.scala new file mode 100755 index 0000000000..d1b43ea923 --- /dev/null +++ b/test/files/script/t1017.scala @@ -0,0 +1,29 @@ +#!/bin/sh +# fact - A simple Scala script that prints out the factorial of +# the argument specified on the command line. + +cygwin=false; +case "`uname`" in + CYGWIN*) cygwin=true ;; +esac + +SOURCE="$0"; +if $cygwin; then + if [ "$OS" = "Windows_NT" ] && cygpath -m .>/dev/null 2>/dev/null ; then + format=mixed + else + format=windows + fi + SOURCE=`cygpath --$format "$SOURCE"`; +fi + +exec scala -nocompdaemon "$SOURCE" "$@" +!# + +def foo = { + bar +} + +var x = 1 + +def bar = 1 -- cgit v1.2.3