summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormichelou <michelou@epfl.ch>2003-08-18 15:27:04 +0000
committermichelou <michelou@epfl.ch>2003-08-18 15:27:04 +0000
commitc4e1967d6c99021400b8fa906f51f0bcba984fd4 (patch)
tree85cf43879e87345e5b6408315f87a3d1a0904e3d
parent0e4375781964953b65150c8749cc5bc89cf6b7f3 (diff)
downloadscala-c4e1967d6c99021400b8fa906f51f0bcba984fd4.tar.gz
scala-c4e1967d6c99021400b8fa906f51f0bcba984fd4.tar.bz2
scala-c4e1967d6c99021400b8fa906f51f0bcba984fd4.zip
*** empty log message ***
-rw-r--r--test/files/run/overloads.check1
-rw-r--r--test/files/run/overloads.scala4
2 files changed, 2 insertions, 3 deletions
diff --git a/test/files/run/overloads.check b/test/files/run/overloads.check
index 056c5b51d2..01dc6e4b0a 100644
--- a/test/files/run/overloads.check
+++ b/test/files/run/overloads.check
@@ -9,7 +9,6 @@ ok: Ops.-- = 0
ok: Ops.--('a') = a
ok: Ops.--(97) = 97
ok: Funcs.foo = 0
-ok: Funcs.foo() = 1
ok: Funcs.foo('a') = 2
ok: Funcs.foo(97) = 3
ok: M1.f(3) = 11
diff --git a/test/files/run/overloads.scala b/test/files/run/overloads.scala
index 6a797c0bc4..f060f55e16 100644
--- a/test/files/run/overloads.scala
+++ b/test/files/run/overloads.scala
@@ -17,7 +17,7 @@ object Ops {
object Funcs {
def foo = 0;
- def foo() = 1;
+// def foo() = 1;
def foo(c: Char) = 2;
def foo(i: Int) = 3;
}
@@ -69,7 +69,7 @@ object overloads {
check("Ops.--(97)", Ops.--(97), 97);
check("Funcs.foo", Funcs.foo, 0);
- check("Funcs.foo()", Funcs.foo(), 1);
+// check("Funcs.foo()", Funcs.foo(), 1);
check("Funcs.foo('a')", Funcs.foo('a'), 2);
check("Funcs.foo(97)", Funcs.foo(97), 3);