diff options
author | mihaylov <mihaylov@epfl.ch> | 2005-10-03 22:10:15 +0000 |
---|---|---|
committer | mihaylov <mihaylov@epfl.ch> | 2005-10-03 22:10:15 +0000 |
commit | a4796d889dbeb01ec015ed0fe768fccf7454b4c5 (patch) | |
tree | 180e67c3b69dce66d0b463f22bf1a50f87eaf6a4 /test/files/run/mixins.scala | |
parent | 5c8e9c28ec464dc4f5a42beaa421369f61b4403c (diff) | |
download | scala-a4796d889dbeb01ec015ed0fe768fccf7454b4c5.tar.gz scala-a4796d889dbeb01ec015ed0fe768fccf7454b4c5.tar.bz2 scala-a4796d889dbeb01ec015ed0fe768fccf7454b4c5.zip |
Made platform-independant
Diffstat (limited to 'test/files/run/mixins.scala')
-rw-r--r-- | test/files/run/mixins.scala | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/test/files/run/mixins.scala b/test/files/run/mixins.scala index 4fa23d3610..caab28fe26 100644 --- a/test/files/run/mixins.scala +++ b/test/files/run/mixins.scala @@ -2,8 +2,6 @@ // Test 1: "super" coming from mixins -import java.lang.System.out.println; - object Test1 { class A { def f = "A::f"; @@ -21,9 +19,9 @@ object Test1 { override def f = super[M1].f; } - def main(args: Array[String]): Unit = { + def test(): Unit = { val c = new C; - println(c.f); + Console.println(c.f); } } @@ -46,9 +44,9 @@ object Test2 { override def f = super[M1].f + " " + super[M2].f + " " + super[M3].f } - def main(args: Array[String]): Unit = { + def test(): Unit = { val h = new Host; - println(h.f) + Console.println(h.f) } } @@ -57,19 +55,19 @@ object Test2 { object Test3 { class A(x: Unit, y: Unit) { - println("A"); + Console.println("A"); } class B(x: Unit) { - println("B"); + Console.println("B"); } - class C with A({ println("one"); }, { println("two"); }) - with B({ println("three"); }) { - println("C"); + class C with A({ Console.println("one"); }, { Console.println("two"); }) + with B({ Console.println("three"); }) { + Console.println("C"); } - def main(args: Array[String]) = { + def test() = { val c = new C(); } } @@ -78,8 +76,8 @@ object Test3 { object Test { def main(args: Array[String]): Unit = { - Test1.main(args); - Test2.main(args); - Test3.main(args); + Test1.test(); + Test2.test(); + Test3.test(); } } |