diff options
| author | Martin Odersky <odersky@gmail.com> | 2007-01-16 20:33:20 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2007-01-16 20:33:20 +0000 |
| commit | 6093bbedc0c0cf39650c4cd931afb18feb1bcda8 (patch) | |
| tree | 3c812fab17a33c73b6ce03bb9129d0674dd1b6bf /src/compiler/scala/tools/nsc/transform/UnCurry.scala | |
| parent | 96376cd15412c66bcd30e9b397f211eec4e7bf35 (diff) | |
| download | scala-6093bbedc0c0cf39650c4cd931afb18feb1bcda8.tar.gz scala-6093bbedc0c0cf39650c4cd931afb18feb1bcda8.tar.bz2 scala-6093bbedc0c0cf39650c4cd931afb18feb1bcda8.zip | |
enabled -Xunapply.
fixed bug contrib 291.
Added Map/Set types to Predef.
Option no longer inherits from Iterable, but there's an implicit conversion.
various other small things.
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/UnCurry.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/UnCurry.scala | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala index 352dc3b75c..b3feb1ed7f 100644 --- a/src/compiler/scala/tools/nsc/transform/UnCurry.scala +++ b/src/compiler/scala/tools/nsc/transform/UnCurry.scala @@ -424,9 +424,13 @@ abstract class UnCurry extends InfoTransform with TypingTransformers { case _ => val tree1 = super.transform(tree) if (isByNameRef(tree1)) - localTyper.typed(atPos(tree1.pos)( - Apply(Select(tree1 setType functionType(List(), tree1.tpe), nme.apply), List()))) - else tree1; + return localTyper.typed { + atPos(tree1.pos) { + Apply(Select(tree1 setType functionType(List(), tree1.tpe), nme.apply), + List()) + } + } + tree1 } } setType uncurryTreeType(tree.tpe) |