diff options
| author | Paul Phillips <paulp@improving.org> | 2011-09-22 19:34:12 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-09-22 19:34:12 +0000 |
| commit | 7e47107efa5d0eea79731d7f73a3b624b9cb1601 (patch) | |
| tree | ad2c8d0f913e0ac188a7dd2c0d0775512abfaecf /src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala | |
| parent | afe1d6fa6293465b8f97d2ca4699640fe4d09bad (diff) | |
| download | scala-7e47107efa5d0eea79731d7f73a3b624b9cb1601.tar.gz scala-7e47107efa5d0eea79731d7f73a3b624b9cb1601.tar.bz2 scala-7e47107efa5d0eea79731d7f73a3b624b9cb1601.zip | |
Removed devirtualize.
It was time. Removed unused flags and devirtualize detritus. Cleaned up
flags a bit further. Fixed the contents of phaseNewFlags in those places
where it was inaccurate. No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala')
| -rw-r--r-- | src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala b/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala index 8db759266b..809dbe7695 100644 --- a/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala +++ b/src/compiler/scala/tools/nsc/transform/ExplicitOuter.scala @@ -28,7 +28,7 @@ abstract class ExplicitOuter extends InfoTransform import Debug.TRACE /** The following flags may be set by this phase: */ - override def phaseNewFlags: Long = notPRIVATE | notPROTECTED | lateFINAL + override def phaseNewFlags: Long = notPROTECTED /** the name of the phase: */ val phaseName: String = "explicitouter" @@ -150,7 +150,7 @@ abstract class ExplicitOuter extends InfoTransform val restpe = if (clazz.isTrait) clazz.outerClass.tpe else clazz.outerClass.thisType decls1 enter (clazz.newOuterAccessor(clazz.pos) setInfo MethodType(Nil, restpe)) if (hasOuterField(clazz)) { //2 - val access = if (clazz.isEffectivelyFinal) PRIVATE | LOCAL else PROTECTED + val access = if (clazz.isEffectivelyFinal) PrivateLocal else PROTECTED decls1 enter ( clazz.newValue(clazz.pos, nme.OUTER_LOCAL) setFlag (SYNTHETIC | PARAMACCESSOR | access) |