diff options
Diffstat (limited to 'test')
41 files changed, 28 insertions, 44 deletions
diff --git a/test/files/run/Course-2002-10-msil.check b/test/disabled/run/Course-2002-10-msil.check index bbd9414370..bbd9414370 100644 --- a/test/files/run/Course-2002-10-msil.check +++ b/test/disabled/run/Course-2002-10-msil.check diff --git a/test/files/run/Course-2002-10.check b/test/disabled/run/Course-2002-10.check index 207b671f05..207b671f05 100644 --- a/test/files/run/Course-2002-10.check +++ b/test/disabled/run/Course-2002-10.check diff --git a/test/files/run/Course-2002-10.scala b/test/disabled/run/Course-2002-10.scala index e978bc8258..e978bc8258 100644 --- a/test/files/run/Course-2002-10.scala +++ b/test/disabled/run/Course-2002-10.scala diff --git a/test/files/run/Course-2002-13.check b/test/disabled/run/Course-2002-13.check index 7664f70576..7664f70576 100644 --- a/test/files/run/Course-2002-13.check +++ b/test/disabled/run/Course-2002-13.check diff --git a/test/files/run/Course-2002-13.scala b/test/disabled/run/Course-2002-13.scala index c016d41a90..c016d41a90 100644 --- a/test/files/run/Course-2002-13.scala +++ b/test/disabled/run/Course-2002-13.scala diff --git a/test/files/run/streamWithFilter.check b/test/disabled/run/streamWithFilter.check index 6b0e91a147..6b0e91a147 100644 --- a/test/files/run/streamWithFilter.check +++ b/test/disabled/run/streamWithFilter.check diff --git a/test/files/run/streamWithFilter.scala b/test/disabled/run/streamWithFilter.scala index cb919d4f55..cb919d4f55 100644 --- a/test/files/run/streamWithFilter.scala +++ b/test/disabled/run/streamWithFilter.scala diff --git a/test/files/buildmanager/t2652/t2652.check b/test/files/buildmanager/t2652/t2652.check index 77a27a727f..0e685c1f94 100644 --- a/test/files/buildmanager/t2652/t2652.check +++ b/test/files/buildmanager/t2652/t2652.check @@ -3,7 +3,7 @@ compiling Set(A.scala, B.scala) Changes: Map() builder > A.scala compiling Set(A.scala) -Changes: Map(class A -> List(Changed(Definition(A.x))[method x changed from [T](t: T)T to [T](t: T)T flags: <method>])) +Changes: Map(class A -> List(Added(Definition(A.x$mBc$sp)), Added(Definition(A.x$mCc$sp)), Added(Definition(A.x$mDc$sp)), Added(Definition(A.x$mFc$sp)), Added(Definition(A.x$mIc$sp)), Added(Definition(A.x$mLc$sp)), Added(Definition(A.x$mSc$sp)), Added(Definition(A.x$mVc$sp)), Added(Definition(A.x$mZc$sp)), Changed(Definition(A.x))[method x changed from [T](t: T)T to [T](t: T)T flags: <method>])) invalidate B.scala because it references changed definition [Changed(Definition(A.x))[method x changed from [T](t: T)T to [T](t: T)T flags: <method>]] compiling Set(B.scala) Changes: Map(object B -> List()) diff --git a/test/files/neg/bug1392.check b/test/files/neg/bug1392.check deleted file mode 100644 index e4c9630435..0000000000 --- a/test/files/neg/bug1392.check +++ /dev/null @@ -1,4 +0,0 @@ -bug1392.scala:1: error: object Int is not a value -object X extends Application { Int } - ^ -one error found diff --git a/test/files/neg/bug1392.scala b/test/files/neg/bug1392.scala deleted file mode 100644 index 54a4b9e908..0000000000 --- a/test/files/neg/bug1392.scala +++ /dev/null @@ -1 +0,0 @@ -object X extends Application { Int } diff --git a/test/files/neg/bug3123.check b/test/files/neg/bug3123.check deleted file mode 100644 index 8f5319c9a3..0000000000 --- a/test/files/neg/bug3123.check +++ /dev/null @@ -1,4 +0,0 @@ -bug3123.scala:3: error: object Int is not a value - t match { case Int => true } - ^ -one error found diff --git a/test/files/neg/bug3123.scala b/test/files/neg/bug3123.scala deleted file mode 100644 index 667a1da918..0000000000 --- a/test/files/neg/bug3123.scala +++ /dev/null @@ -1,5 +0,0 @@ -object NotAValue { - def test[T](t : T) { - t match { case Int => true } - } -} diff --git a/test/files/pos/spec-Function1.flags b/test/files/pos/spec-Function1.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-Function1.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-List.flags b/test/files/pos/spec-List.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-List.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-annotations.flags b/test/files/pos/spec-annotations.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-annotations.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-arrays.flags b/test/files/pos/spec-arrays.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-arrays.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-cyclic.flags b/test/files/pos/spec-cyclic.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-cyclic.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-example1.flags b/test/files/pos/spec-example1.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-example1.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-fields.flags b/test/files/pos/spec-fields.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-fields.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-foo.flags b/test/files/pos/spec-foo.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-foo.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-funs.flags b/test/files/pos/spec-funs.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-funs.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-lists.flags b/test/files/pos/spec-lists.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-lists.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-localdefs.flags b/test/files/pos/spec-localdefs.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-localdefs.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-maps.flags b/test/files/pos/spec-maps.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-maps.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-params.flags b/test/files/pos/spec-params.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-params.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-partially.flags b/test/files/pos/spec-partially.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-partially.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-polymeth.flags b/test/files/pos/spec-polymeth.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-polymeth.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-sealed.flags b/test/files/pos/spec-sealed.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-sealed.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-short.flags b/test/files/pos/spec-short.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-short.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-simple.flags b/test/files/pos/spec-simple.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-simple.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-super.flags b/test/files/pos/spec-super.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-super.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-tailcall.flags b/test/files/pos/spec-tailcall.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-tailcall.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/pos/spec-thistype.flags b/test/files/pos/spec-thistype.flags deleted file mode 100644 index 973517e1c9..0000000000 --- a/test/files/pos/spec-thistype.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize diff --git a/test/files/run/names-defaults.scala b/test/files/run/names-defaults.scala index 8557047875..3442ecafc3 100644 --- a/test/files/run/names-defaults.scala +++ b/test/files/run/names-defaults.scala @@ -304,6 +304,27 @@ object Test extends Application { } + // #3207 + trait P3207[T] { + class Inner(val f: T => Unit = (x: T) => println(x)) + } + + object Test3207_1 { + val p = new P3207[Int] {} + val q = new p.Inner() { + def g = 0 + } + } + + object Test3207_2 { + val p = new P3207[Int] { + val inner = new Inner() { + def g = 0 + } + } + } + + // DEFINITIONS def test1(a: Int, b: String) = println(a +": "+ b) def test2(u: Int, v: Int)(k: String, l: Int) = println(l +": "+ k +", "+ (u + v)) diff --git a/test/files/run/programmatic-main.check b/test/files/run/programmatic-main.check index 82118f8ece..3429195265 100644 --- a/test/files/run/programmatic-main.check +++ b/test/files/run/programmatic-main.check @@ -10,6 +10,7 @@ liftcode selectivecps uncurry tailcalls +specialize explicitouter erasure lazyvals diff --git a/test/files/run/spec-absfun.flags b/test/files/run/spec-absfun.flags deleted file mode 100644 index 3a910a936c..0000000000 --- a/test/files/run/spec-absfun.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize
\ No newline at end of file diff --git a/test/files/run/spec-absfun.scala b/test/files/run/spec-absfun.scala index ab16e8febc..2b780548f5 100644 --- a/test/files/run/spec-absfun.scala +++ b/test/files/run/spec-absfun.scala @@ -37,7 +37,7 @@ class Pair[A](_first: A, _second: A) { def second = _second } -class SpecializedPair[@specialized("Int") A](_first: A, _second: A) { +class SpecializedPair[@specialized(Int) A](_first: A, _second: A) { def first = _first def second = _second } diff --git a/test/files/run/spec-matrix.flags b/test/files/run/spec-matrix.flags deleted file mode 100644 index 3a910a936c..0000000000 --- a/test/files/run/spec-matrix.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize
\ No newline at end of file diff --git a/test/files/run/spec-matrix.scala b/test/files/run/spec-matrix.scala index 212a800672..81e3eaf212 100644 --- a/test/files/run/spec-matrix.scala +++ b/test/files/run/spec-matrix.scala @@ -43,7 +43,7 @@ object Test { } - def multManifest[@specialized("Int") T](m: Matrix[T], n: Matrix[T])(implicit cm: ClassManifest[T], num: Numeric[T]) { + def multManifest[@specialized(Int) T](m: Matrix[T], n: Matrix[T])(implicit cm: ClassManifest[T], num: Numeric[T]) { val p = new Matrix[T](m.rows, n.cols) import num._ diff --git a/test/files/run/spec-patmatch.flags b/test/files/run/spec-patmatch.flags deleted file mode 100644 index 3a910a936c..0000000000 --- a/test/files/run/spec-patmatch.flags +++ /dev/null @@ -1 +0,0 @@ --Yspecialize
\ No newline at end of file diff --git a/test/partest b/test/partest index 124c4d605e..87c7961689 100755 --- a/test/partest +++ b/test/partest @@ -75,11 +75,11 @@ if $cygwin; then fi # Reminder: substitution ${JAVA_OPTS:=-Xmx256M -Xms16M} DO NOT work on Solaris -[ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xms512M -Xmx1536M -Xss1M -XX:MaxPermSize=128M" +[ -n "$JAVA_OPTS" ] || JAVA_OPTS="-Xms64M -Xmx1024M -Xss768K -XX:MaxPermSize=96M" [ -n "$SCALAC_OPTS" ] || SCALAC_OPTS="" -export SCALAC_OPTS -export JAVA_OPTS +# export SCALAC_OPTS +# export JAVA_OPTS export JAVACMD ${JAVACMD:=java} $JAVA_OPTS \ |