summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2009-06-03 18:33:36 +0000
committerLukas Rytz <lukas.rytz@epfl.ch>2009-06-03 18:33:36 +0000
commitf09e35944abb3dfa172948c8971edf77a654740d (patch)
tree89bb96ac33ed736d311b16a5c57f885c027430b8 /test/files
parent56b22f27d03cd964d2bbb9f72e0c2b5bc9d8f4cf (diff)
downloadscala-f09e35944abb3dfa172948c8971edf77a654740d.tar.gz
scala-f09e35944abb3dfa172948c8971edf77a654740d.tar.bz2
scala-f09e35944abb3dfa172948c8971edf77a654740d.zip
removed code for parsing old pickle format.
Diffstat (limited to 'test/files')
-rw-r--r--test/files/neg/names-defaults-neg.check7
-rw-r--r--test/files/neg/names-defaults-neg.scala3
-rw-r--r--test/files/run/names-defaults.check3
-rw-r--r--test/files/run/names-defaults.scala15
4 files changed, 26 insertions, 2 deletions
diff --git a/test/files/neg/names-defaults-neg.check b/test/files/neg/names-defaults-neg.check
index c7f7b80ade..d4331ab63f 100644
--- a/test/files/neg/names-defaults-neg.check
+++ b/test/files/neg/names-defaults-neg.check
@@ -97,4 +97,9 @@ names-defaults-neg.scala:99: error: using named or default arguments in a self c
names-defaults-neg.scala:105: error: using named or default arguments in a self constructor call is not allowed
this(sep + b + sep)
^
-25 errors found
+names-defaults-neg.scala:112: error: type mismatch;
+ found : java.lang.Object
+ required: java.lang.String
+class B5 extends A5 { override def foo(a: Object = new Object) = 1 }
+ ^
+26 errors found \ No newline at end of file
diff --git a/test/files/neg/names-defaults-neg.scala b/test/files/neg/names-defaults-neg.scala
index 26663fe60d..29db82924c 100644
--- a/test/files/neg/names-defaults-neg.scala
+++ b/test/files/neg/names-defaults-neg.scala
@@ -107,3 +107,6 @@ class A3(x: String, y: Int = 11) {
}
case class Fact(a: Int, b: String)(c: Int*)
+
+class A5 { def foo(a: Object = "dlkf") = 0 }
+class B5 extends A5 { override def foo(a: Object = new Object) = 1 }
diff --git a/test/files/run/names-defaults.check b/test/files/run/names-defaults.check
index 643615368d..3fed6e601a 100644
--- a/test/files/run/names-defaults.check
+++ b/test/files/run/names-defaults.check
@@ -91,4 +91,5 @@ Fact2(10,blabla)
test5
2
test5
-3 \ No newline at end of file
+3
+slkdfj1 \ No newline at end of file
diff --git a/test/files/run/names-defaults.scala b/test/files/run/names-defaults.scala
index 38ba317029..482c4f2f7b 100644
--- a/test/files/run/names-defaults.scala
+++ b/test/files/run/names-defaults.scala
@@ -175,6 +175,12 @@ object Test extends Application {
println(argName) // should be 3
+ // dependent types and copy method
+ val a11 = new A2
+ val b11 = a11.B2(new a11.C2)(1)
+ println(b11.copy()())
+
+
// DEFINITIONS
def test1(a: Int, b: String) = println(a +": "+ b)
def test2(u: Int, v: Int)(k: String, l: Int) = println(l +": "+ k +", "+ (u + v))
@@ -229,3 +235,12 @@ class MN extends M {
case class Factory(x: Int = 1, y: String)(z: String = y)
case class Fact2[T, +U](x: T = "ju", y: U = 1)(z: T = 2)
+
+
+// dependent types and copy method
+class A2 {
+ case class B2(x: C2)(y: Int) extends A2 {
+ override def toString = "slkdfj" + y
+ }
+ class C2
+}