Merged revisions 22324 via svnmerge from

https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r22324 | rytz | 2010-06-16 20:38:02 +0200 (Wed, 16 Jun 2010) | 1 line

  removed integration of placeholder syntax and named arguments. review
by odersky ........

2 files changed, 29 insertions, 3 deletions

diff --git a/test/files/neg/names-defaults-neg.check b/test/files/neg/names-defaults-neg.check
index 644aad4a89..38bacc0888 100644
--- a/test/files/neg/names-defaults-neg.check
+++ b/test/files/neg/names-defaults-neg.check
@@ -37,8 +37,8 @@ names-defaults-neg.scala:23: error: parameter specified twice: b
   test1(b = 1, b = "2")
                  ^
 names-defaults-neg.scala:26: error: {
-  val x$1: Int(3) = 3;
-  val x$2: Int(1) = 1;
+  val x$5: Int(3) = 3;
+  val x$6: Int(1) = 1;
   Test.this.test3(1, 3)
 } of type Int does not take parameters
   test3(b = 3, a = 1)(3)
@@ -104,4 +104,17 @@ names-defaults-neg.scala:82: error: type mismatch;
 Error occurred in an application involving default arguments.
   new A2[String]()
   ^
-24 errors found
+names-defaults-neg.scala:115: error: reference to var2 is ambiguous; it is both, a parameter
+name of the method and the name of a variable currently in scope.
+  delay(var2 = 40)
+             ^
+names-defaults-neg.scala:118: error: missing parameter type for expanded function ((x$1) => a = x$1)
+  val taf2: Int => Unit = testAnnFun(a = _, b = get("+"))
+                                         ^
+names-defaults-neg.scala:119: error: parameter specified twice: a
+  val taf3 = testAnnFun(b = _: String, a = get(8))
+                                         ^
+names-defaults-neg.scala:120: error: wrong number of parameters; expected = 2
+  val taf4: (Int, String) => Unit = testAnnFun(_, b = _)
+                                              ^
+28 errors found
diff --git a/test/files/neg/names-defaults-neg.scala b/test/files/neg/names-defaults-neg.scala
index 3babd56c6f..e73dc71c9b 100644
--- a/test/files/neg/names-defaults-neg.scala
+++ b/test/files/neg/names-defaults-neg.scala
@@ -106,3 +106,16 @@ case class Fact(a: Int, b: String)(c: Int*)
 case class A1(x: Int = 1, y: String = "2")
 
 class A2[T](a: T = 1)
+
+
+// anonymous functions
+object anfun {
+  var var2 = 0
+  def delay(var2: => Unit) { var2 }
+  delay(var2 = 40)
+
+  def testAnnFun(a: Int, b: String) = println(a +": "+ b)
+  val taf2: Int => Unit = testAnnFun(a = _, b = get("+"))
+  val taf3 = testAnnFun(b = _: String, a = get(8))
+  val taf4: (Int, String) => Unit = testAnnFun(_, b = _)
+}