summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-01-28 15:49:25 +0000
committerPaul Phillips <paulp@improving.org>2011-01-28 15:49:25 +0000
commit834c065736573b11a1b51111edb032b2d3ca9b14 (patch)
treeddd13b65f422a59b4fee9467542e6c8cf482c28f /test
parentfb718ccd5c1264b2816a3bed3138ced0fb2156f1 (diff)
downloadscala-834c065736573b11a1b51111edb032b2d3ca9b14.tar.gz
scala-834c065736573b11a1b51111edb032b2d3ca9b14.tar.bz2
scala-834c065736573b11a1b51111edb032b2d3ca9b14.zip
A raw tree was making its way into an error mes...
A raw tree was making its way into an error message. Removed. Closes #4196, no review.
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/bug4196.check4
-rw-r--r--test/files/neg/bug4196.scala6
-rw-r--r--test/files/neg/bug961.check2
-rw-r--r--test/files/neg/names-defaults-neg.check6
4 files changed, 12 insertions, 6 deletions
diff --git a/test/files/neg/bug4196.check b/test/files/neg/bug4196.check
new file mode 100644
index 0000000000..0905d2e6a7
--- /dev/null
+++ b/test/files/neg/bug4196.check
@@ -0,0 +1,4 @@
+bug4196.scala:5: error: Some[String] does not take parameters
+ }.apply("first param") ("spurious param")
+ ^
+one error found
diff --git a/test/files/neg/bug4196.scala b/test/files/neg/bug4196.scala
new file mode 100644
index 0000000000..06e1f28d54
--- /dev/null
+++ b/test/files/neg/bug4196.scala
@@ -0,0 +1,6 @@
+object Weird {
+ { (s: String) =>
+ val foo = Some(s); // to illustrate that vals are printed in the error
+ foo
+ }.apply("first param") ("spurious param")
+} \ No newline at end of file
diff --git a/test/files/neg/bug961.check b/test/files/neg/bug961.check
index 439ed98675..0231a3ea66 100644
--- a/test/files/neg/bug961.check
+++ b/test/files/neg/bug961.check
@@ -1,4 +1,4 @@
-bug961.scala:11: error: Temp.this.B of type object Temp.B does not take parameters
+bug961.scala:11: error: object Temp.B does not take parameters
B() match {
^
one error found
diff --git a/test/files/neg/names-defaults-neg.check b/test/files/neg/names-defaults-neg.check
index 4882c01e4c..3b3dd53b2e 100644
--- a/test/files/neg/names-defaults-neg.check
+++ b/test/files/neg/names-defaults-neg.check
@@ -36,11 +36,7 @@ names-defaults-neg.scala:22: error: parameter specified twice: a
names-defaults-neg.scala:23: error: parameter specified twice: b
test1(b = 1, b = "2")
^
-names-defaults-neg.scala:26: error: {
- val x$5: Int(3) = 3;
- val x$6: Int(1) = 1;
- Test.this.test3(1, 3)
-} of type Int does not take parameters
+names-defaults-neg.scala:26: error: Int does not take parameters
test3(b = 3, a = 1)(3)
^
names-defaults-neg.scala:35: error: ambiguous reference to overloaded definition,