diff options
author | michelou <michelou@epfl.ch> | 2008-06-10 08:46:06 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2008-06-10 08:46:06 +0000 |
commit | a4baf28d203959457d82762e27ffbb7104dc0a07 (patch) | |
tree | 7b249d126396b87cd937da6cd564000b8a6051de /test/files/pos/gosh.scala | |
parent | 113c79559555dd408ea76da5f462025536cbd7d6 (diff) | |
download | scala-a4baf28d203959457d82762e27ffbb7104dc0a07.tar.gz scala-a4baf28d203959457d82762e27ffbb7104dc0a07.tar.bz2 scala-a4baf28d203959457d82762e27ffbb7104dc0a07.zip |
int -> Int, etc..
Diffstat (limited to 'test/files/pos/gosh.scala')
-rw-r--r-- | test/files/pos/gosh.scala | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/test/files/pos/gosh.scala b/test/files/pos/gosh.scala index c4cd3df80b..183ce9df1d 100644 --- a/test/files/pos/gosh.scala +++ b/test/files/pos/gosh.scala @@ -1,44 +1,44 @@ object ShapeTest extends Application { - class Point(x : int, y : int) { - override def toString() = "[" + x + "," + y + "]" - } + class Point(x: Int, y: Int) { + override def toString() = "[" + x + "," + y + "]" + } - abstract class Shape { - def draw() : unit - } + abstract class Shape { + def draw(): Unit + } - class Line(s : Point, e : Point) extends Shape { - def draw() : unit = { Console.println("draw line " + s + "," + e) } - } + class Line(s: Point, e: Point) extends Shape { + def draw() { Console.println("draw line " + s + "," + e) } + } - abstract class Foo { - type T <: Object + abstract class Foo { + type T <: Object - def show(o : T) : unit - def print() : unit = {Console.println("in Foo")} - } + def show(o: T): Unit + def print() { Console.println("in Foo") } + } - abstract class ShapeFoo extends Foo { - type T <: Shape - def show(o : T) : unit = { o.draw() } - override def print() : unit = {Console.println("in ShapeFoo")} - } + abstract class ShapeFoo extends Foo { + type T <: Shape + def show(o: T) { o.draw() } + override def print() { Console.println("in ShapeFoo") } + } - class LineFoo extends ShapeFoo { - type T = Line - override def print() : unit = {Console.println("in LineFoo")} - } + class LineFoo extends ShapeFoo { + type T = Line + override def print() { Console.println("in LineFoo") } + } - val p1 = new Point(1,4) - val p2 = new Point(12, 28) + val p1 = new Point(1,4) + val p2 = new Point(12, 28) - val l1 = new Line(p1, p2) + val l1 = new Line(p1, p2) - val l = new ShapeFoo{ // ** // - type T = Line // ** // - override def print() : unit = {Console.println("in LineFoo")} // ** // - } - l.show(l1) // ** // + val l = new ShapeFoo { // ** // + type T = Line // ** // + override def print() { Console.println("in LineFoo") } // ** // + } + l.show(l1) // ** // } |