summaryrefslogtreecommitdiff
path: root/test/files/run/Course-2002-03.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2003-03-31 08:29:52 +0000
committerMartin Odersky <odersky@gmail.com>2003-03-31 08:29:52 +0000
commitefd06d74f1621351c70456478b07a4ace6a9a211 (patch)
tree01ac7505ed4f33582974d4519dc3e33d601614d2 /test/files/run/Course-2002-03.scala
parent85c73ba918913361f925c23469c012096a93fb54 (diff)
downloadscala-efd06d74f1621351c70456478b07a4ace6a9a211.tar.gz
scala-efd06d74f1621351c70456478b07a4ace6a9a211.tar.bz2
scala-efd06d74f1621351c70456478b07a4ace6a9a211.zip
*** empty log message ***
Diffstat (limited to 'test/files/run/Course-2002-03.scala')
-rw-r--r--test/files/run/Course-2002-03.scala28
1 files changed, 14 insertions, 14 deletions
diff --git a/test/files/run/Course-2002-03.scala b/test/files/run/Course-2002-03.scala
index a4efd7ffa6..a2678544e4 100644
--- a/test/files/run/Course-2002-03.scala
+++ b/test/files/run/Course-2002-03.scala
@@ -3,7 +3,7 @@
//############################################################################
// $Id$
-module M0 {
+object M0 {
class Rational(x: Int, y: Int) {
def numer = x;
def denom = y;
@@ -28,7 +28,7 @@ module M0 {
//############################################################################
-module M1 {
+object M1 {
class Rational(x: Int, y: Int) {
def numer = x;
def denom = y;
@@ -55,7 +55,7 @@ module M1 {
//############################################################################
-module M2 {
+object M2 {
class Rational(x: Int, y: Int) {
private def gcd(a: Int, b: Int): Int = if (b == 0) a else gcd(b, a % b);
private val g = gcd(x, y);
@@ -92,7 +92,7 @@ module M2 {
//############################################################################
-module M3 {
+object M3 {
class Rational(x: Int, y: Int) {
private def gcd(a: Int, b: Int): Int = if (b == 0) a else gcd(b, a % b);
def numer = x / gcd(x, y);
@@ -114,7 +114,7 @@ module M3 {
//############################################################################
-module M4 {
+object M4 {
class Rational(x: Int, y: Int) {
private def gcd(a: Int, b: Int): Int = if (b == 0) a else gcd(b, a % b);
private val g = gcd(x, y);
@@ -147,7 +147,7 @@ module M4 {
//############################################################################
-module M5 {
+object M5 {
trait IntSet {
def incl(x: Int): IntSet;
def contains(x: Int): Boolean;
@@ -179,7 +179,7 @@ module M5 {
//############################################################################
-module M6 {
+object M6 {
trait Boolean {
def ifThenElse[a](def t: a)(def e: a): a;
@@ -195,15 +195,15 @@ module M6 {
def <= (x: Boolean): Boolean = ifThenElse[Boolean](x)(new True());
def >= (x: Boolean): Boolean = ifThenElse[Boolean](new True())(x.!);
}
- class True() extends Boolean { // !!! class -> module
+ class True() extends Boolean { // !!! class -> object
def ifThenElse[a](def t: a)(def e: a): a = t }
- class False() extends Boolean { // !!! class -> module
+ class False() extends Boolean { // !!! class -> object
def ifThenElse[a](def t: a)(def e: a): a = e }
}
//############################################################################
-module M7 {
+object M7 {
trait Nat {
def isZero(): Boolean;
def predecessor: Nat;
@@ -215,7 +215,7 @@ module M7 {
//############################################################################
-module M8 {
+object M8 {
trait IntSet {
def incl(x: Int): IntSet;
@@ -244,7 +244,7 @@ module M8 {
}
}
- class Empty extends IntSet { // !!! class Empty() -> module Empty
+ class Empty extends IntSet { // !!! class Empty() -> object Empty
def contains(x: Int): Boolean = false;
def incl(x: Int): IntSet = new NonEmpty(x, new Empty, new Empty);
def map(f: Int => Int): IntSet = this;
@@ -337,7 +337,7 @@ module M8 {
//############################################################################
-module M9 {
+object M9 {
class Rational(x: Int, y: Int) {
private def gcd(a: Int, b: Int): Int = if (b == 0) a else gcd(b, a % b);
private val g = gcd(x, y);
@@ -373,7 +373,7 @@ module M9 {
//############################################################################
-module Test {
+object Test {
def main(args: Array[String]): Unit = {
M0;
M1;