summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@epfl.ch>2010-06-16 18:38:02 +0000
committerLukas Rytz <lukas.rytz@epfl.ch>2010-06-16 18:38:02 +0000
commitfd9ddea91f21ede82cb9083c24e91c3b47da178b (patch)
tree2d8251f2c9ebf34d0d2e7386264675207104ab61 /src
parent59dc9f40bda5a1958f9187714f68568b039e0bcb (diff)
downloadscala-fd9ddea91f21ede82cb9083c24e91c3b47da178b.tar.gz
scala-fd9ddea91f21ede82cb9083c24e91c3b47da178b.tar.bz2
scala-fd9ddea91f21ede82cb9083c24e91c3b47da178b.zip
removed integration of placeholder syntax and n...
removed integration of placeholder syntax and named arguments. review by odersky
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/ast/parser/Parsers.scala17
1 files changed, 1 insertions, 16 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
index 0bfee7cdd8..e28f07e840 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -1363,25 +1363,10 @@ self =>
}
}
- // if arg has the form "x$1 => a = x$1" it's treated as "a = x$1" with x$1
- // in placeholderParams. This allows e.g. "val f: Int => Int = foo(a = 1, b = _)"
- def convertArg(arg: Tree): Tree = arg match {
- case Function(
- List(vd @ ValDef(mods, pname1, ptype1, EmptyTree)),
- Assign(Ident(aname), rhs)) if (mods hasFlag Flags.SYNTHETIC) =>
- rhs match {
- case Ident(`pname1`) | Typed(Ident(`pname1`), _) =>
- placeholderParams = vd :: placeholderParams
- atPos(arg.pos) { AssignOrNamedArg(Ident(aname), Ident(pname1)) }
- case _ => arg
- }
- case _ => arg
- }
-
if (in.token == LBRACE)
List(blockExpr())
else
- surround(LPAREN, RPAREN)(if (in.token == RPAREN) List() else (args() map convertArg), List())
+ surround(LPAREN, RPAREN)(if (in.token == RPAREN) List() else args(), List())
}
/** BlockExpr ::= `{' (CaseClauses | Block) `}'