summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2003-03-03 19:16:35 +0000
committerMartin Odersky <odersky@gmail.com>2003-03-03 19:16:35 +0000
commitde976b2afa724f45dcd85dc3c52ed558f55783e1 (patch)
treec7eb9df88408c45550a8d7974366b4cce78a05da
parentfe9d7cc9ec4e55d42a09b149d60d6cf2f8be09af (diff)
downloadscala-de976b2afa724f45dcd85dc3c52ed558f55783e1.tar.gz
scala-de976b2afa724f45dcd85dc3c52ed558f55783e1.tar.bz2
scala-de976b2afa724f45dcd85dc3c52ed558f55783e1.zip
*** empty log message ***
-rw-r--r--sources/scala/Function.tmpl2
-rw-r--r--sources/scalac/transformer/LambdaLift.java9
2 files changed, 2 insertions, 9 deletions
diff --git a/sources/scala/Function.tmpl b/sources/scala/Function.tmpl
index 343db5a808..9f51e24e98 100644
--- a/sources/scala/Function.tmpl
+++ b/sources/scala/Function.tmpl
@@ -12,7 +12,7 @@
package scala;
-/** @meta class [#type-params#];
+/** @meta class [#type-params#] extends scala.Object;
*/
abstract public class Function[#n#] {
/** @meta constr;
diff --git a/sources/scalac/transformer/LambdaLift.java b/sources/scalac/transformer/LambdaLift.java
index 6e893c835a..51d49ef8e8 100644
--- a/sources/scalac/transformer/LambdaLift.java
+++ b/sources/scalac/transformer/LambdaLift.java
@@ -215,13 +215,6 @@ public class LambdaLift extends OwnerTransformer
tree, mods, name,
transform(rhs, currentOwner));
- case ValDef(int mods, Name name, Tree tpe, Tree rhs):
- // ignore value definition as owner.
- // reason: it might be in a refinement
- return copy.ValDef(
- tree, mods, name, transform(tpe),
- transform(rhs, currentOwner));
-
case Ident(Name name):
if (sym.isLocal()) {
if (sym.isMethod()) {
@@ -372,7 +365,7 @@ public class LambdaLift extends OwnerTransformer
Symbol sym = tree.symbol();
Name name1 = sym.name;
Tree tpe1 = transform(tpe);
- Tree rhs1 = transform(rhs, currentOwner);
+ Tree rhs1 = transform(rhs, sym);
if ((sym.flags & CAPTURED) != 0) {
assert sym.isLocal();
Type unboxedType = sym.typeAt(descr.nextPhase);