summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2009-10-27 13:01:17 +0000
committerMartin Odersky <odersky@gmail.com>2009-10-27 13:01:17 +0000
commitd4c63b2af19fb48730b3c3eeb55a3e702893d113 (patch)
tree3772c1e940edcc8127f5ac8c8ad40288845a037e /test
parent38c3ca67563a68e8f30fd84282b1b9c4cebadeaa (diff)
downloadscala-d4c63b2af19fb48730b3c3eeb55a3e702893d113.tar.gz
scala-d4c63b2af19fb48730b3c3eeb55a3e702893d113.tar.bz2
scala-d4c63b2af19fb48730b3c3eeb55a3e702893d113.zip
Fixed #2494, plus some reorganization of swing ...
Fixed #2494, plus some reorganization of swing imports
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/t2494.check4
-rwxr-xr-xtest/files/neg/t2494.scala1
-rw-r--r--test/files/run/names-defaults.scala2
3 files changed, 6 insertions, 1 deletions
diff --git a/test/files/neg/t2494.check b/test/files/neg/t2494.check
new file mode 100644
index 0000000000..6d43011e24
--- /dev/null
+++ b/test/files/neg/t2494.check
@@ -0,0 +1,4 @@
+t2494.scala:1: error: recursive value a needs type
+object A { val a = { println("a = " + a); a = 1} }
+ ^
+one error found
diff --git a/test/files/neg/t2494.scala b/test/files/neg/t2494.scala
new file mode 100755
index 0000000000..71e6bc4bbf
--- /dev/null
+++ b/test/files/neg/t2494.scala
@@ -0,0 +1 @@
+object A { val a = { println("a = " + a); a = 1} }
diff --git a/test/files/run/names-defaults.scala b/test/files/run/names-defaults.scala
index 1f92436628..008939cc9d 100644
--- a/test/files/run/names-defaults.scala
+++ b/test/files/run/names-defaults.scala
@@ -183,7 +183,7 @@ object Test extends Application {
println(argName) // should be 4
test5 { argName = 5 }
println(argName) // should be 5
- val a = test1(a = 10, b = "2") // local values a and b exist, but not ambiuous since they're val's
+ val a: Unit = test1(a = 10, b = "2") // local values a and b exist, but not ambiuous since they're val's
// dependent types and copy method