From e5b3a8a6b49dd4ab333781e3e7ce595ba14b06eb Mon Sep 17 00:00:00 2001 From: Martin Odersky Date: Tue, 13 Feb 2007 22:06:58 +0000 Subject: changed tuple syntax to (...) --- test/files/neg/patmatexhaust.scala | 8 ++++---- test/files/run/patmatnew.scala | 12 ++++++------ test/files/run/tuples.scala | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) (limited to 'test') diff --git a/test/files/neg/patmatexhaust.scala b/test/files/neg/patmatexhaust.scala index 7370868363..e1b52a61ef 100644 --- a/test/files/neg/patmatexhaust.scala +++ b/test/files/neg/patmatexhaust.scala @@ -21,10 +21,10 @@ class TestSealedExhaustive { // compile only case Kult(_) => // exhaustive } def ma3(x:Mult) = {x,x} match { // not exhaustive - case {Kult(_), Qult()} => // Kult missing - //case {Kult(_), Kult(_)} => - case {Qult(), Kult(_)} => // Qult missing - //case {Qult(), Qult()} => + case Pair(Kult(_), Qult()) => // Kult missing + //case Pair(Kult(_), Kult(_)) => + case Pair(Qult(), Kult(_)) => // Qult missing + //case Pair(Qult(), Qult()) => } sealed class Deep diff --git a/test/files/run/patmatnew.scala b/test/files/run/patmatnew.scala index 9dc73a86de..e77e10abeb 100644 --- a/test/files/run/patmatnew.scala +++ b/test/files/run/patmatnew.scala @@ -100,9 +100,9 @@ object Test { // these are exhaustive matches // should not generate any warnings def f[A](z:{Option[A],Option[A]}) = z match { - case {None,Some(x)} => 1 - case {Some(x),None } => 2 - case {Some(x),Some(y)} => 3 + case Pair(None,Some(x)) => 1 + case Pair(Some(x),None ) => 2 + case Pair(Some(x),Some(y)) => 3 case _ => 4 } @@ -119,9 +119,9 @@ object Test { } def h[A](x:{Option[A],Option[A]}) = x match { - case {None,_:Some[_]} => 1 - case {_:Some[_],None } => 2 - case {_:Some[_],_:Some[_]} => 3 + case Pair(None,_:Some[_]) => 1 + case Pair(_:Some[_],None ) => 2 + case Pair(_:Some[_],_:Some[_]) => 3 case _ => 4 } diff --git a/test/files/run/tuples.scala b/test/files/run/tuples.scala index c6dcda4af8..3d0dcf7ac0 100644 --- a/test/files/run/tuples.scala +++ b/test/files/run/tuples.scala @@ -1,8 +1,8 @@ object Test extends Application { - var xyz: {int, String, boolean} = _ - xyz = { 1, "abc", true } + var xyz: Triple(int, String, boolean) = _ + xyz = Triple(1, "abc", true) Console.println(xyz) xyz match { - case { 1, "abc", true } => Console.println("OK") + case Triple(1, "abc", true) => Console.println("OK") } } -- cgit v1.2.3