From 10b8c781c2d20d2a00f70a9426951ea374e5d07e Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Mon, 16 Feb 2009 16:28:31 +0000 Subject: Began evaluation of the tests in pending, and m... Began evaluation of the tests in pending, and moved/updated/removed .scala and .check files as warranted. --- test/files/neg/badtok-3.check | 4 ++++ test/files/neg/badtok-3.scala | 2 ++ test/files/neg/bug112706A.check | 6 ++++++ test/files/neg/bug112706A.scala | 8 ++++++++ test/files/neg/parstar.check | 7 +++++++ test/files/neg/parstar.scala | 10 ++++++++++ test/files/neg/t0673.check | 4 ++++ test/files/neg/t0673/JavaClass.java | 3 +++ test/files/neg/t0673/Test.scala | 3 +++ test/files/neg/t0699.check | 10 ++++++++++ test/files/neg/t0699/A.scala | 4 ++++ test/files/neg/t0699/B.scala | 5 +++++ test/files/pos/t1439.scala | 7 +++++++ test/pending/neg/badtok-3.check | 1 - test/pending/neg/badtok-3.scala | 2 -- test/pending/neg/bug112506A.scala | 2 +- test/pending/neg/bug112706A.scala | 8 -------- test/pending/neg/bug421.scala | 9 --------- test/pending/neg/bug452.check | 6 ------ test/pending/neg/bug452.scala | 8 -------- test/pending/neg/bug558.check | 4 ---- test/pending/neg/bug558.scala | 19 ------------------- test/pending/neg/parstar.scala | 10 ---------- test/pending/neg/t0605.scala | 3 --- test/pending/neg/t0673.check | 4 ---- test/pending/neg/t0673/JavaClass.java | 3 --- test/pending/neg/t0673/Test.scala | 3 --- test/pending/neg/t0699.check | 10 ---------- test/pending/neg/t1049.scala | 5 ----- test/pending/pos/t0699/A.scala | 4 ---- test/pending/pos/t0699/B.scala | 5 ----- test/pending/pos/t1439.scala | 7 ------- 32 files changed, 74 insertions(+), 112 deletions(-) create mode 100644 test/files/neg/badtok-3.check create mode 100644 test/files/neg/badtok-3.scala create mode 100644 test/files/neg/bug112706A.check create mode 100644 test/files/neg/bug112706A.scala create mode 100644 test/files/neg/parstar.check create mode 100644 test/files/neg/parstar.scala create mode 100644 test/files/neg/t0673.check create mode 100644 test/files/neg/t0673/JavaClass.java create mode 100644 test/files/neg/t0673/Test.scala create mode 100644 test/files/neg/t0699.check create mode 100644 test/files/neg/t0699/A.scala create mode 100644 test/files/neg/t0699/B.scala create mode 100644 test/files/pos/t1439.scala delete mode 100644 test/pending/neg/badtok-3.check delete mode 100644 test/pending/neg/badtok-3.scala delete mode 100644 test/pending/neg/bug112706A.scala delete mode 100644 test/pending/neg/bug421.scala delete mode 100644 test/pending/neg/bug452.check delete mode 100644 test/pending/neg/bug452.scala delete mode 100644 test/pending/neg/bug558.check delete mode 100644 test/pending/neg/bug558.scala delete mode 100644 test/pending/neg/parstar.scala delete mode 100644 test/pending/neg/t0605.scala delete mode 100644 test/pending/neg/t0673.check delete mode 100644 test/pending/neg/t0673/JavaClass.java delete mode 100644 test/pending/neg/t0673/Test.scala delete mode 100644 test/pending/neg/t0699.check delete mode 100644 test/pending/neg/t1049.scala delete mode 100644 test/pending/pos/t0699/A.scala delete mode 100644 test/pending/pos/t0699/B.scala delete mode 100644 test/pending/pos/t1439.scala diff --git a/test/files/neg/badtok-3.check b/test/files/neg/badtok-3.check new file mode 100644 index 0000000000..ec1b0591fa --- /dev/null +++ b/test/files/neg/badtok-3.check @@ -0,0 +1,4 @@ +badtok-3.scala:2: error: input ended while parsing XML + + ^ +one error found diff --git a/test/files/neg/bug112706A.scala b/test/files/neg/bug112706A.scala new file mode 100644 index 0000000000..fb98ad300c --- /dev/null +++ b/test/files/neg/bug112706A.scala @@ -0,0 +1,8 @@ +package test; +trait Test { + def foo(p : List[Tuple2[String,String]]) = { + for (val t <- p) t._1 match { + case Tuple2(node,_) => + } + } +} \ No newline at end of file diff --git a/test/files/neg/parstar.check b/test/files/neg/parstar.check new file mode 100644 index 0000000000..108f0f4de8 --- /dev/null +++ b/test/files/neg/parstar.check @@ -0,0 +1,7 @@ +parstar.scala:8: error: *-parameter must come last + def m(a: A*, b: B ) = a.toArray + ^ +parstar.scala:9: error: *-parameter must come last + def m(a: A*, b: B*) = a.toArray + ^ +two errors found diff --git a/test/files/neg/parstar.scala b/test/files/neg/parstar.scala new file mode 100644 index 0000000000..dd8d108447 --- /dev/null +++ b/test/files/neg/parstar.scala @@ -0,0 +1,10 @@ +package test; + +object test { + class A + class B + + def m(a: A, b: B*) = b.toArray + def m(a: A*, b: B ) = a.toArray + def m(a: A*, b: B*) = a.toArray +} diff --git a/test/files/neg/t0673.check b/test/files/neg/t0673.check new file mode 100644 index 0000000000..abb37a022c --- /dev/null +++ b/test/files/neg/t0673.check @@ -0,0 +1,4 @@ +Test.scala:2: error: value InnerClass is not a member of object JavaClass + val x = JavaClass.InnerClass + ^ +one error found diff --git a/test/files/neg/t0673/JavaClass.java b/test/files/neg/t0673/JavaClass.java new file mode 100644 index 0000000000..e469e13483 --- /dev/null +++ b/test/files/neg/t0673/JavaClass.java @@ -0,0 +1,3 @@ +public class JavaClass { + public static class InnerClass {} +} diff --git a/test/files/neg/t0673/Test.scala b/test/files/neg/t0673/Test.scala new file mode 100644 index 0000000000..43b97887e4 --- /dev/null +++ b/test/files/neg/t0673/Test.scala @@ -0,0 +1,3 @@ +object Test { + val x = JavaClass.InnerClass +} diff --git a/test/files/neg/t0699.check b/test/files/neg/t0699.check new file mode 100644 index 0000000000..c944da8c10 --- /dev/null +++ b/test/files/neg/t0699.check @@ -0,0 +1,10 @@ +B.scala:2: error: illegal inheritance from sealed trait T + trait T1 extends A.T + ^ +B.scala:3: error: illegal inheritance from sealed class C + trait T2 extends A.C + ^ +B.scala:4: error: illegal inheritance from sealed class C + class C1 extends A.C + ^ +three errors found diff --git a/test/files/neg/t0699/A.scala b/test/files/neg/t0699/A.scala new file mode 100644 index 0000000000..740d8ecda3 --- /dev/null +++ b/test/files/neg/t0699/A.scala @@ -0,0 +1,4 @@ +object A { + sealed trait T + sealed class C +} \ No newline at end of file diff --git a/test/files/neg/t0699/B.scala b/test/files/neg/t0699/B.scala new file mode 100644 index 0000000000..f1f17efe8f --- /dev/null +++ b/test/files/neg/t0699/B.scala @@ -0,0 +1,5 @@ +object B { + trait T1 extends A.T + trait T2 extends A.C + class C1 extends A.C +} \ No newline at end of file diff --git a/test/files/pos/t1439.scala b/test/files/pos/t1439.scala new file mode 100644 index 0000000000..ae1fdd10b5 --- /dev/null +++ b/test/files/pos/t1439.scala @@ -0,0 +1,7 @@ +class View[C[A]] {} + +object Test { + null match { + case v: View[_] => + } +} diff --git a/test/pending/neg/badtok-3.check b/test/pending/neg/badtok-3.check deleted file mode 100644 index 25486b9a2f..0000000000 --- a/test/pending/neg/badtok-3.check +++ /dev/null @@ -1 +0,0 @@ -(something about, input ended while scanning XML literal) diff --git a/test/pending/neg/badtok-3.scala b/test/pending/neg/badtok-3.scala deleted file mode 100644 index 66bfb308e6..0000000000 --- a/test/pending/neg/badtok-3.scala +++ /dev/null @@ -1,2 +0,0 @@ -object Test { - - } - } -} \ No newline at end of file diff --git a/test/pending/neg/bug421.scala b/test/pending/neg/bug421.scala deleted file mode 100644 index bf7346f01a..0000000000 --- a/test/pending/neg/bug421.scala +++ /dev/null @@ -1,9 +0,0 @@ -object foo { - case class Bar(a:String, b:Object, c:String*); - - - Bar("foo","meets","bar") match { - case Bar("foo",_*) => error("huh?"); - } - -} diff --git a/test/pending/neg/bug452.check b/test/pending/neg/bug452.check deleted file mode 100644 index 308ec18bd4..0000000000 --- a/test/pending/neg/bug452.check +++ /dev/null @@ -1,6 +0,0 @@ -bug452.scala:3: error: type mismatch; - found : Test - required: Test.this.Foo - def this() = this(this); - ^ -one error found diff --git a/test/pending/neg/bug452.scala b/test/pending/neg/bug452.scala deleted file mode 100644 index 855406d0c4..0000000000 --- a/test/pending/neg/bug452.scala +++ /dev/null @@ -1,8 +0,0 @@ -object Test { - class Foo(x: Foo) { - def this() = this(this); - } - def main(args: Array[String]): Unit = { - new Foo(); - } -} diff --git a/test/pending/neg/bug558.check b/test/pending/neg/bug558.check deleted file mode 100644 index a51856f0e6..0000000000 --- a/test/pending/neg/bug558.check +++ /dev/null @@ -1,4 +0,0 @@ -bug558.scala:13: error: value file is not a member of NewModel.this.RootURL - final val source = top.file; - ^ -one error found diff --git a/test/pending/neg/bug558.scala b/test/pending/neg/bug558.scala deleted file mode 100644 index f88471f776..0000000000 --- a/test/pending/neg/bug558.scala +++ /dev/null @@ -1,19 +0,0 @@ -package scala.tools.nsc.models; -import scala.tools.util._; - -abstract class NewModel { - abstract class SymbolURL { - val top : RootURL; - val name : String; - val source : AbstractFile; - } - abstract class NodeURL extends SymbolURL { - val parent : SymbolURL; - final val top = parent.top; - final val source = top.file; - - } - abstract class RootURL extends SymbolURL { - final val top : RootURL = this; - } -} diff --git a/test/pending/neg/parstar.scala b/test/pending/neg/parstar.scala deleted file mode 100644 index dd8d108447..0000000000 --- a/test/pending/neg/parstar.scala +++ /dev/null @@ -1,10 +0,0 @@ -package test; - -object test { - class A - class B - - def m(a: A, b: B*) = b.toArray - def m(a: A*, b: B ) = a.toArray - def m(a: A*, b: B*) = a.toArray -} diff --git a/test/pending/neg/t0605.scala b/test/pending/neg/t0605.scala deleted file mode 100644 index af24ceda83..0000000000 --- a/test/pending/neg/t0605.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test { - println "Hello" -} diff --git a/test/pending/neg/t0673.check b/test/pending/neg/t0673.check deleted file mode 100644 index e52f65ada3..0000000000 --- a/test/pending/neg/t0673.check +++ /dev/null @@ -1,4 +0,0 @@ -Test.scala:2: error: not found: value JavaClass - val x = JavaClass.InnerClass - ^ -one error found diff --git a/test/pending/neg/t0673/JavaClass.java b/test/pending/neg/t0673/JavaClass.java deleted file mode 100644 index e469e13483..0000000000 --- a/test/pending/neg/t0673/JavaClass.java +++ /dev/null @@ -1,3 +0,0 @@ -public class JavaClass { - public static class InnerClass {} -} diff --git a/test/pending/neg/t0673/Test.scala b/test/pending/neg/t0673/Test.scala deleted file mode 100644 index 43b97887e4..0000000000 --- a/test/pending/neg/t0673/Test.scala +++ /dev/null @@ -1,3 +0,0 @@ -object Test { - val x = JavaClass.InnerClass -} diff --git a/test/pending/neg/t0699.check b/test/pending/neg/t0699.check deleted file mode 100644 index c944da8c10..0000000000 --- a/test/pending/neg/t0699.check +++ /dev/null @@ -1,10 +0,0 @@ -B.scala:2: error: illegal inheritance from sealed trait T - trait T1 extends A.T - ^ -B.scala:3: error: illegal inheritance from sealed class C - trait T2 extends A.C - ^ -B.scala:4: error: illegal inheritance from sealed class C - class C1 extends A.C - ^ -three errors found diff --git a/test/pending/neg/t1049.scala b/test/pending/neg/t1049.scala deleted file mode 100644 index 8fb0f7fb6f..0000000000 --- a/test/pending/neg/t1049.scala +++ /dev/null @@ -1,5 +0,0 @@ -object T1049 { - "abc" match { - case x: x.Whatever => - } -} diff --git a/test/pending/pos/t0699/A.scala b/test/pending/pos/t0699/A.scala deleted file mode 100644 index 740d8ecda3..0000000000 --- a/test/pending/pos/t0699/A.scala +++ /dev/null @@ -1,4 +0,0 @@ -object A { - sealed trait T - sealed class C -} \ No newline at end of file diff --git a/test/pending/pos/t0699/B.scala b/test/pending/pos/t0699/B.scala deleted file mode 100644 index f1f17efe8f..0000000000 --- a/test/pending/pos/t0699/B.scala +++ /dev/null @@ -1,5 +0,0 @@ -object B { - trait T1 extends A.T - trait T2 extends A.C - class C1 extends A.C -} \ No newline at end of file diff --git a/test/pending/pos/t1439.scala b/test/pending/pos/t1439.scala deleted file mode 100644 index ae1fdd10b5..0000000000 --- a/test/pending/pos/t1439.scala +++ /dev/null @@ -1,7 +0,0 @@ -class View[C[A]] {} - -object Test { - null match { - case v: View[_] => - } -} -- cgit v1.2.3