diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-05-20 09:20:19 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2009-05-20 09:20:19 +0000 |
commit | 457f6dfc11a1ad205b75f5196c20ff31ff6386e3 (patch) | |
tree | 32e18dfbd4298439e75fdf150c5e7d807a53b87a /test/files | |
parent | 3f1d10d1051cca941c305ea0701c3981eae28c27 (diff) | |
download | scala-457f6dfc11a1ad205b75f5196c20ff31ff6386e3.tar.gz scala-457f6dfc11a1ad205b75f5196c20ff31ff6386e3.tar.bz2 scala-457f6dfc11a1ad205b75f5196c20ff31ff6386e3.zip |
Updated neg check files to the new output of r1...
Updated neg check files to the new output of r17773
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/neg/abstract.check | 4 | ||||
-rw-r--r-- | test/files/neg/bug1112.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug112706A.check | 4 | ||||
-rw-r--r-- | test/files/neg/bug1523.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug520.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug550.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug563.check | 4 | ||||
-rw-r--r-- | test/files/neg/bug576.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug649.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug691.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug696.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug765.check | 4 | ||||
-rw-r--r-- | test/files/neg/bug766.check | 4 | ||||
-rw-r--r-- | test/files/neg/bug783.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug876.check | 2 | ||||
-rw-r--r-- | test/files/neg/bug961.check | 6 | ||||
-rw-r--r-- | test/files/neg/bug997.check | 4 | ||||
-rw-r--r-- | test/files/neg/divergent-implicit.check | 2 | ||||
-rw-r--r-- | test/files/neg/gadts1.check | 2 | ||||
-rw-r--r-- | test/files/neg/sabin2.check | 2 | ||||
-rw-r--r-- | test/files/neg/t0117.check | 2 | ||||
-rw-r--r-- | test/files/neg/t0226.check | 2 | ||||
-rw-r--r-- | test/files/neg/unreachablechar.check | 2 | ||||
-rw-r--r-- | test/files/neg/viewtest.check | 10 |
24 files changed, 49 insertions, 23 deletions
diff --git a/test/files/neg/abstract.check b/test/files/neg/abstract.check index b73539112a..811708ccff 100644 --- a/test/files/neg/abstract.check +++ b/test/files/neg/abstract.check @@ -2,10 +2,10 @@ abstract.scala:6: error: type mismatch; found : A required: A.this.T def foo2: T = bar().baz(); - ^ + ^ abstract.scala:9: error: type mismatch; found : A required: A.this.T def foo5: T = baz().baz(); - ^ + ^ two errors found diff --git a/test/files/neg/bug1112.check b/test/files/neg/bug1112.check index 779aa90bab..8daca9b4dc 100644 --- a/test/files/neg/bug1112.check +++ b/test/files/neg/bug1112.check @@ -1,4 +1,4 @@ bug1112.scala:12: error: wrong number of arguments for method call: (Int)(=> () => Unit)Unit call(0,() => System.out.println("here we are")) - ^ + ^ one error found diff --git a/test/files/neg/bug112706A.check b/test/files/neg/bug112706A.check index 8fb5bfc390..f84dbcd051 100644 --- a/test/files/neg/bug112706A.check +++ b/test/files/neg/bug112706A.check @@ -1,6 +1,10 @@ +bug112706A.scala:4: warning: for (val x <- ... ) has been deprecated; use for (x <- ... ) instead + for (val t <- p) t._1 match { + ^ bug112706A.scala:5: error: constructor cannot be instantiated to expected type; found : (T1, T2) required: java.lang.String case Tuple2(node,_) => ^ +one warning found one error found diff --git a/test/files/neg/bug1523.check b/test/files/neg/bug1523.check index a28ffcb902..6031985640 100644 --- a/test/files/neg/bug1523.check +++ b/test/files/neg/bug1523.check @@ -1,4 +1,4 @@ bug1523.scala:4: error: wrong number of arguments for method bug: (Any)Any def go() = bug("a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a", "a") - ^ + ^ one error found diff --git a/test/files/neg/bug520.check b/test/files/neg/bug520.check index 6768ebb5fc..258f8112e3 100644 --- a/test/files/neg/bug520.check +++ b/test/files/neg/bug520.check @@ -1,4 +1,4 @@ bug520.scala:8: error: overloaded method verifyKeyword needs result type verifyKeyword("", source, pos); - ^ + ^ one error found diff --git a/test/files/neg/bug550.check b/test/files/neg/bug550.check index 10b2a38586..1cdb7931ca 100644 --- a/test/files/neg/bug550.check +++ b/test/files/neg/bug550.check @@ -3,5 +3,5 @@ bug550.scala:6: error: type List takes type parameters ^ bug550.scala:8: error: no implicit argument matching parameter type Monoid[a] was found. sum(List(1,2,3)) - ^ + ^ two errors found diff --git a/test/files/neg/bug563.check b/test/files/neg/bug563.check index c10f504635..b88c949883 100644 --- a/test/files/neg/bug563.check +++ b/test/files/neg/bug563.check @@ -1,4 +1,8 @@ +bug563.scala:5: warning: for (val x <- ... ) has been deprecated; use for (x <- ... ) instead + for (val n <- sn) + ^ bug563.scala:6: error: missing parameter type map(n,ptr => new Cell(ptr.elem)); ^ +one warning found one error found diff --git a/test/files/neg/bug576.check b/test/files/neg/bug576.check index 72d5d258d2..b496ccafd4 100644 --- a/test/files/neg/bug576.check +++ b/test/files/neg/bug576.check @@ -1,4 +1,4 @@ bug576.scala:14: error: overloaded method insert needs result type if (true) sibling.insert(node); - ^ + ^ one error found diff --git a/test/files/neg/bug649.check b/test/files/neg/bug649.check index dd5b6a10b1..2a1533d2dc 100644 --- a/test/files/neg/bug649.check +++ b/test/files/neg/bug649.check @@ -1,4 +1,4 @@ bug649.scala:3: error: overloaded method foo needs result type def foo[A] = foo[A] - ^ + ^ one error found diff --git a/test/files/neg/bug691.check b/test/files/neg/bug691.check index f811fc3559..47ac8c3888 100644 --- a/test/files/neg/bug691.check +++ b/test/files/neg/bug691.check @@ -1,4 +1,4 @@ bug691.scala:27: error: ambiguous parent class qualifier trait TiC extends super[Arrow].Ti2 with super[AssignArrow].Ti1; - ^ + ^ one error found diff --git a/test/files/neg/bug696.check b/test/files/neg/bug696.check index 623c95f62c..1ca740c211 100644 --- a/test/files/neg/bug696.check +++ b/test/files/neg/bug696.check @@ -1,5 +1,5 @@ bug696.scala:4: error: diverging implicit expansion for type TypeUtil0.Type[Any] starting with method WithType in object TypeUtil0 as[Any](null); - ^ + ^ one error found diff --git a/test/files/neg/bug765.check b/test/files/neg/bug765.check index 02bd111ef7..f022c72f94 100644 --- a/test/files/neg/bug765.check +++ b/test/files/neg/bug765.check @@ -1,4 +1,8 @@ +bug765.scala:2: warning: for (val x <- ... ) has been deprecated; use for (x <- ... ) instead + for (val e <- List()) { //required + ^ bug765.scala:3: error: not found: type Bar123 val bar = new Bar123 ^ +one warning found one error found diff --git a/test/files/neg/bug766.check b/test/files/neg/bug766.check index d259db6835..3900f782ca 100644 --- a/test/files/neg/bug766.check +++ b/test/files/neg/bug766.check @@ -1,4 +1,8 @@ +bug766.scala:4: warning: for (val x <- ... ) has been deprecated; use for (x <- ... ) instead + for (val n <- Nil; val m <- Nil) { + ^ bug766.scala:5: error: not found: value badIdentifier val p = badIdentifier ^ +one warning found one error found diff --git a/test/files/neg/bug783.check b/test/files/neg/bug783.check index 19e3ead2a9..bf82edc843 100644 --- a/test/files/neg/bug783.check +++ b/test/files/neg/bug783.check @@ -2,5 +2,5 @@ bug783.scala:12: error: type mismatch; found : Contexts.this.Global#Template required: Contexts.this.global.Template globalInit0.Template(10, 20); - ^ + ^ one error found diff --git a/test/files/neg/bug876.check b/test/files/neg/bug876.check index a9aecbaadc..5ad3f48379 100644 --- a/test/files/neg/bug876.check +++ b/test/files/neg/bug876.check @@ -1,4 +1,4 @@ bug876.scala:25: error: wrong number of arguments for method apply: (AssertionError.A)manager.B in trait MapTemplate assert(manager.map(A2) == List(manager.map(A2, A1))) - ^ + ^ one error found diff --git a/test/files/neg/bug961.check b/test/files/neg/bug961.check index 33bb0559b1..8b407d1d0c 100644 --- a/test/files/neg/bug961.check +++ b/test/files/neg/bug961.check @@ -1,9 +1,9 @@ bug961.scala:4: warning: case classes without a parameter list have been deprecated; use either case objects or case classes with `()' as parameter list. - private case class B_inner extends A
+ private case class B_inner extends A ^ bug961.scala:11: error: Temp.this.B of type object Temp.B does not take parameters - B() match {
- ^ + B() match { + ^ one warning found one error found diff --git a/test/files/neg/bug997.check b/test/files/neg/bug997.check index e3c86c96a4..44e383228d 100644 --- a/test/files/neg/bug997.check +++ b/test/files/neg/bug997.check @@ -1,12 +1,12 @@ bug997.scala:7: error: wrong number of arguments for object Foo "x" match { case Foo(a) => Console.println(a) } - ^ + ^ bug997.scala:7: error: not found: value a "x" match { case Foo(a) => Console.println(a) } ^ bug997.scala:13: error: wrong number of arguments for object Foo "x" match { case Foo(a, b, c) => Console.println((a,b,c)) } - ^ + ^ bug997.scala:13: error: not found: value a "x" match { case Foo(a, b, c) => Console.println((a,b,c)) } ^ diff --git a/test/files/neg/divergent-implicit.check b/test/files/neg/divergent-implicit.check index f9f04685ec..07af8510d9 100644 --- a/test/files/neg/divergent-implicit.check +++ b/test/files/neg/divergent-implicit.check @@ -6,7 +6,7 @@ divergent-implicit.scala:4: error: type mismatch; divergent-implicit.scala:5: error: diverging implicit expansion for type (Int) => String starting with method cast in object Test1 val x2: String = cast[Int, String](1) - ^ + ^ divergent-implicit.scala:14: error: diverging implicit expansion for type (Test2.Baz) => Test2.Bar starting with method baz2bar in object Test2 val x: Bar = new Foo diff --git a/test/files/neg/gadts1.check b/test/files/neg/gadts1.check index 01d1412448..4c91a3bcf8 100644 --- a/test/files/neg/gadts1.check +++ b/test/files/neg/gadts1.check @@ -2,5 +2,5 @@ gadts1.scala:15: error: type mismatch; found : Test.Double required: a case NumTerm(n) => c.x = Double(1.0) - ^ + ^ one error found diff --git a/test/files/neg/sabin2.check b/test/files/neg/sabin2.check index 92578bc23e..8a09361069 100644 --- a/test/files/neg/sabin2.check +++ b/test/files/neg/sabin2.check @@ -2,5 +2,5 @@ sabin2.scala:22: error: type mismatch; found : Test.Base#T required: _7.T where val _7: Test.Base a.set(b.get()) // Error - ^ + ^ one error found diff --git a/test/files/neg/t0117.check b/test/files/neg/t0117.check index 53b5bd9baa..fd6af54e77 100644 --- a/test/files/neg/t0117.check +++ b/test/files/neg/t0117.check @@ -1,4 +1,4 @@ t0117.scala:2: error: implementation restriction: traits may not select fields or methods from to super[C] where C is a class trait B extends A { println(super[A].a) } - ^ + ^ one error found diff --git a/test/files/neg/t0226.check b/test/files/neg/t0226.check index 1d9f7077ef..0935a3b14e 100644 --- a/test/files/neg/t0226.check +++ b/test/files/neg/t0226.check @@ -6,5 +6,5 @@ t0226.scala:5: error: not found: type A1 ^ t0226.scala:8: error: no implicit argument matching parameter type Test.this.Foo[((List[Char], Int), (object Nil, Int))] was found. foo(((List('b'), 3), (Nil, 4))) - ^ + ^ three errors found diff --git a/test/files/neg/unreachablechar.check b/test/files/neg/unreachablechar.check index 7442e1178a..58ce1a7e91 100644 --- a/test/files/neg/unreachablechar.check +++ b/test/files/neg/unreachablechar.check @@ -1,4 +1,4 @@ unreachablechar.scala:5: error: unreachable code case 'f' => println("not stuff?"); - ^ + ^ one error found diff --git a/test/files/neg/viewtest.check b/test/files/neg/viewtest.check index 5415ba4f92..9ae41b7728 100644 --- a/test/files/neg/viewtest.check +++ b/test/files/neg/viewtest.check @@ -1,3 +1,12 @@ +viewtest.scala:96: warning: for (val x <- ... ) has been deprecated; use for (x <- ... ) instead + for (val s <- args) { + ^ +viewtest.scala:103: warning: for (val x <- ... ) has been deprecated; use for (x <- ... ) instead + for (val s <- args) { + ^ +viewtest.scala:110: warning: for (val x <- ... ) has been deprecated; use for (x <- ... ) instead + for (val s <- args) { + ^ viewtest.scala:43: error: type mismatch; found : List[a(in method compareTo)] required: List[a(in method view3)] @@ -9,4 +18,5 @@ viewtest.scala:104: error: ambiguous implicit values: match expected type (test.Str) => test.Ordered[test.Str] t = t insert Str(s) ^ +three warnings found two errors found |