diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-06-17 05:35:36 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-06-17 05:35:36 +0000 |
commit | 58d972039573bbad67e44760d578c32e134be504 (patch) | |
tree | fd57743f36a9460d557e9e671f11609fae8245d2 /test/files/pos/bug3578.scala | |
parent | df56d4fbe2b71bd768f57c4c808ad4d22f4cafa4 (diff) | |
download | scala-58d972039573bbad67e44760d578c32e134be504.tar.gz scala-58d972039573bbad67e44760d578c32e134be504.tar.bz2 scala-58d972039573bbad67e44760d578c32e134be504.zip |
Merged revisions 22334 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r22334 | extempore | 2010-06-16 23:59:16 +0200 (Wed, 16 Jun 2010) | 4 lines
A wholesale reversion of the pattern matcher to r21939, motivated by
the appearance of #3578. Closes #3578, reopens #2800, #3050. Review by
moors. (I can't keep saying "no review" when every move I make in here
seems to break something.) ........
Diffstat (limited to 'test/files/pos/bug3578.scala')
-rw-r--r-- | test/files/pos/bug3578.scala | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/test/files/pos/bug3578.scala b/test/files/pos/bug3578.scala new file mode 100644 index 0000000000..d984118208 --- /dev/null +++ b/test/files/pos/bug3578.scala @@ -0,0 +1,30 @@ +object Test { + sealed abstract class JValue { + def ++(other: JValue) = { + def append(value1: JValue, value2: JValue): JValue = (value1, value2) match { + case (JNothing, x) => x + case (x, JNothing) => x + case (JObject(xs), x: JField) => JObject(xs ::: List(x)) + case (x: JField, JObject(xs)) => JObject(x :: xs) + case (JArray(xs), JArray(ys)) => JArray(xs ::: ys) + case (JArray(xs), v: JValue) => JArray(xs ::: List(v)) + case (v: JValue, JArray(xs)) => JArray(v :: xs) + case (f1: JField, f2: JField) => JObject(f1 :: f2 :: Nil) + case (JField(n, v1), v2: JValue) => JField(n, append(v1, v2)) + case (x, y) => JArray(x :: y :: Nil) + } + append(this, other) + } + } + + case object JNothing extends JValue + case object JNull extends JValue + case class JString(s: String) extends JValue + case class JDouble(num: Double) extends JValue + case class JInt(num: BigInt) extends JValue + case class JBool(value: Boolean) extends JValue + case class JField(name: String, value: JValue) extends JValue + case class JObject(obj: List[JField]) extends JValue + case class JArray(arr: List[JValue]) extends JValue +} + |