From 979180ca5f30752d94d64b083b6dbca57dab0c4b Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Wed, 14 Feb 2007 13:37:19 +0000 Subject: more changes to make tuples (...) --- test/files/neg/bug835.check | 4 ++-- test/files/neg/bug876.check | 2 +- test/files/neg/patmatexhaust.check | 4 ++-- test/files/neg/patmatexhaust.scala | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'test/files/neg') diff --git a/test/files/neg/bug835.check b/test/files/neg/bug835.check index 16b311ff4c..83db589280 100644 --- a/test/files/neg/bug835.check +++ b/test/files/neg/bug835.check @@ -1,4 +1,4 @@ -bug835.scala:2: error: `)' expected +bug835.scala:2: error: _*-argument may not appear after other arguments matching a *-parameter Console.println(List(List(1, 2, 3) : _*, List(4, 5, 6) : _*)) - ^ + ^ one error found diff --git a/test/files/neg/bug876.check b/test/files/neg/bug876.check index 54c27fc96a..e7d5d5d78f 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.this.A)manager.B +bug876.scala:25: error: wrong number of arguments for method apply: (AssertionError.this.A)manager.B in trait Map assert(manager.map(A2) == List(manager.map(A2, A1))) ^ one error found diff --git a/test/files/neg/patmatexhaust.check b/test/files/neg/patmatexhaust.check index 6a0eda5861..19e79b2928 100644 --- a/test/files/neg/patmatexhaust.check +++ b/test/files/neg/patmatexhaust.check @@ -5,10 +5,10 @@ patmatexhaust.scala:12: warning: does not cover case {class Bar} def ma2(x:Foo) = x match { ^ patmatexhaust.scala:24: warning: does not cover case {class Kult} - case {Kult(_), Qult()} => // Kult missing + case (Kult(_), Qult()) => // Kult missing ^ patmatexhaust.scala:26: warning: does not cover case {class Qult} - case {Qult(), Kult(_)} => // Qult missing + case (Qult(), Kult(_)) => // Qult missing ^ patmatexhaust.scala:44: warning: does not cover cases {object Gu,class Gp} def ma4(x:Deep) = x match { // missing cases: Gu, Gp diff --git a/test/files/neg/patmatexhaust.scala b/test/files/neg/patmatexhaust.scala index e1b52a61ef..204bf2f170 100644 --- a/test/files/neg/patmatexhaust.scala +++ b/test/files/neg/patmatexhaust.scala @@ -20,10 +20,10 @@ class TestSealedExhaustive { // compile only def ma33(x:Kult) = x match { // exhaustive case Kult(_) => // exhaustive } - def ma3(x:Mult) = {x,x} match { // not exhaustive - case Pair(Kult(_), Qult()) => // Kult missing + def ma3(x:Mult) = (x,x) match { // not exhaustive + case (Kult(_), Qult()) => // Kult missing //case Pair(Kult(_), Kult(_)) => - case Pair(Qult(), Kult(_)) => // Qult missing + case (Qult(), Kult(_)) => // Qult missing //case Pair(Qult(), Qult()) => } -- cgit v1.2.3