diff options
author | Martin Odersky <odersky@gmail.com> | 2005-12-14 15:53:49 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2005-12-14 15:53:49 +0000 |
commit | 0a27645cd58bde3b7df320338727ecf8b21f5964 (patch) | |
tree | bc15cea75d9eedce2bb85cb9555574ed785fabd8 /test-nsc | |
parent | bf6dcc4e923a6e10598679108ae635d739419519 (diff) | |
download | scala-0a27645cd58bde3b7df320338727ecf8b21f5964.tar.gz scala-0a27645cd58bde3b7df320338727ecf8b21f5964.tar.bz2 scala-0a27645cd58bde3b7df320338727ecf8b21f5964.zip |
Diffstat (limited to 'test-nsc')
-rwxr-xr-x | test-nsc/files/pos/expressions-current.scala | 5 | ||||
-rwxr-xr-x | test-nsc/files/pos/traits.scala | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/test-nsc/files/pos/expressions-current.scala b/test-nsc/files/pos/expressions-current.scala index f3def81931..b343dbf68b 100755 --- a/test-nsc/files/pos/expressions-current.scala +++ b/test-nsc/files/pos/expressions-current.scala @@ -39,10 +39,9 @@ abstract class Lang2 extends Lang { class Show2(result: Ref[String]): visitor extends Visitor2 { def caseNum(n: int) = result.elem = n.toString(); def casePlus(l: Exp, r: Exp) = - result.elem = ( + result.elem = "(" + { l.visit(this); result.elem } + - "+" + { r.visit(this); result.elem }+ ")" - ) + "+" + { r.visit(this); result.elem }+ ")"; } } diff --git a/test-nsc/files/pos/traits.scala b/test-nsc/files/pos/traits.scala index 605395c5a6..5fdf4b342e 100755 --- a/test-nsc/files/pos/traits.scala +++ b/test-nsc/files/pos/traits.scala @@ -19,11 +19,10 @@ object Test { } trait BorderedColoredShape extends Shape with Bordered with Colored { override def equals(other: Any) = other match { - case that: BorderedColoredShape => ( + case that: BorderedColoredShape => super.equals(that) && super[Bordered].equals(that) && super[Colored].equals(that) - ) case _ => false } } |