diff options
| author | Martin Odersky <odersky@gmail.com> | 2011-11-23 15:09:02 +0000 |
|---|---|---|
| committer | Martin Odersky <odersky@gmail.com> | 2011-11-23 15:09:02 +0000 |
| commit | bbde90f3dc0abec73024acb50c8a363458183f55 (patch) | |
| tree | 819e85b10a72d01008a0ead6f94063bd7a2f439e /src | |
| parent | 579e999fbf59f540e2d6287fafa7f149ea2b0989 (diff) | |
| download | scala-bbde90f3dc0abec73024acb50c8a363458183f55.tar.gz scala-bbde90f3dc0abec73024acb50c8a363458183f55.tar.bz2 scala-bbde90f3dc0abec73024acb50c8a363458183f55.zip | |
Slightly revised version for the new starr.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/reflect/internal/StdNames.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/UnCurry.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/reflect/internal/StdNames.scala b/src/compiler/scala/reflect/internal/StdNames.scala index cd31183d73..8afe276514 100644 --- a/src/compiler/scala/reflect/internal/StdNames.scala +++ b/src/compiler/scala/reflect/internal/StdNames.scala @@ -241,7 +241,7 @@ trait StdNames extends /*reflect.generic.StdNames with*/ NameManglers { self: Sy val applyDynamic: NameType = "applyDynamic" val isArray: NameType = "isArray" val isDefinedAt: NameType = "isDefinedAt" - val isDefinedAtCurrent: NameType = "isDefinedAtCurrent" + val _isDefinedAt: NameType = "_isDefinedAt" val isEmpty: NameType = "isEmpty" val isInstanceOf_ : NameType = "isInstanceOf" val java: NameType = "java" diff --git a/src/compiler/scala/tools/nsc/transform/UnCurry.scala b/src/compiler/scala/tools/nsc/transform/UnCurry.scala index f8cca67da7..91ac00d946 100644 --- a/src/compiler/scala/tools/nsc/transform/UnCurry.scala +++ b/src/compiler/scala/tools/nsc/transform/UnCurry.scala @@ -280,7 +280,7 @@ abstract class UnCurry extends InfoTransform } def isDefinedAtMethodDef() = { val isDefinedAtName = { - if (anonClass.info.member(nme.isDefinedAtCurrent) != NoSymbol) nme.isDefinedAtCurrent + if (anonClass.info.member(nme._isDefinedAt) != NoSymbol) nme._isDefinedAt else nme.isDefinedAt } val m = anonClass.newMethod(fun.pos, isDefinedAtName) setFlag FINAL |