summaryrefslogtreecommitdiff
path: root/test/files/pos/mixins.scala
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2008-06-10 08:46:06 +0000
committermichelou <michelou@epfl.ch>2008-06-10 08:46:06 +0000
commita4baf28d203959457d82762e27ffbb7104dc0a07 (patch)
tree7b249d126396b87cd937da6cd564000b8a6051de /test/files/pos/mixins.scala
parent113c79559555dd408ea76da5f462025536cbd7d6 (diff)
downloadscala-a4baf28d203959457d82762e27ffbb7104dc0a07.tar.gz
scala-a4baf28d203959457d82762e27ffbb7104dc0a07.tar.bz2
scala-a4baf28d203959457d82762e27ffbb7104dc0a07.zip
int -> Int, etc..
Diffstat (limited to 'test/files/pos/mixins.scala')
-rw-r--r--test/files/pos/mixins.scala14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/files/pos/mixins.scala b/test/files/pos/mixins.scala
index 2b403a25e8..846d6a41bc 100644
--- a/test/files/pos/mixins.scala
+++ b/test/files/pos/mixins.scala
@@ -1,21 +1,21 @@
-package mixins;
+package mixins
abstract class Super {
- def foo: int;
+ def foo: Int
}
trait Mixin extends Super {
- abstract override def foo = super.foo;
+ abstract override def foo = super.foo
}
trait MixinSub extends Super with Mixin {
- abstract override def foo: int = super.foo;
+ abstract override def foo: Int = super.foo
}
trait MixinSubSub extends MixinSub {
- abstract override def foo = super.foo;
+ abstract override def foo = super.foo
}
class Sub extends Super {
- def foo: int = 1
+ def foo: Int = 1
}
class Base extends Sub with MixinSubSub {
- override def foo = super.foo;
+ override def foo = super.foo
}
trait Mixin1 extends Sub with MixinSubSub {}
class Base1 extends Mixin1 {}