diff options
| author | Paul Phillips <paulp@improving.org> | 2011-04-06 04:33:46 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-04-06 04:33:46 +0000 |
| commit | 7ec024951951b22afa3b074a921e40fcebb2b361 (patch) | |
| tree | 1409c76f8aac7ed4d7737077845f0ed1970c8666 /src/compiler | |
| parent | e830a7ce9e1c90b4653c0dfed7992c28410ef6ab (diff) | |
| download | scala-7ec024951951b22afa3b074a921e40fcebb2b361.tar.gz scala-7ec024951951b22afa3b074a921e40fcebb2b361.tar.bz2 scala-7ec024951951b22afa3b074a921e40fcebb2b361.zip | |
Misc cleanups and crash avoidance, no review.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala | 2 | ||||
| -rw-r--r-- | src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala b/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala index 436eb5fb90..bfd5b175a7 100644 --- a/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala +++ b/src/compiler/scala/tools/nsc/backend/ScalaPrimitives.scala @@ -90,8 +90,6 @@ abstract class ScalaPrimitives { // Any operations final val IS = 80 // x.is[y] final val AS = 81 // x.as[y] - final val ISERASED = 85 // x.is$erased[y] - final val ASERASED = 86 // x.as$erased[y] final val HASH = 87 // x.## // AnyRef operations diff --git a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala index 83d72fc3a0..240f0c5f12 100644 --- a/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala +++ b/src/compiler/scala/tools/nsc/typechecker/SuperAccessors.scala @@ -125,7 +125,7 @@ abstract class SuperAccessors extends transform.Transform with transform.TypingT // otherwise lead to either a compiler crash or runtime failure. private lazy val isDisallowed = { import definitions._ - Set(Any_isInstanceOf, Object_isInstanceOf, Object_==, Object_!=, Object_##) + Set(Any_isInstanceOf, Object_isInstanceOf, Any_asInstanceOf, Object_asInstanceOf, Object_==, Object_!=, Object_##) } override def transform(tree: Tree): Tree = { |