diff options
author | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2014-10-12 11:07:11 +0200 |
---|---|---|
committer | Dmitry Petrashko <dmitry.petrashko@gmail.com> | 2014-10-12 11:07:11 +0200 |
commit | 765960f1bdacc228d51f3841acfa2fd2317f2814 (patch) | |
tree | d020416a30d88821ac462085184443800a7dbb12 /src | |
parent | 8e9404b27bb73d16e2883ee682617011f9abc8fa (diff) | |
download | dotty-765960f1bdacc228d51f3841acfa2fd2317f2814.tar.gz dotty-765960f1bdacc228d51f3841acfa2fd2317f2814.tar.bz2 dotty-765960f1bdacc228d51f3841acfa2fd2317f2814.zip |
Rename explicitOuter to explicitOuterPhase in Phases
Diffstat (limited to 'src')
-rw-r--r-- | src/dotty/tools/dotc/core/Phases.scala | 2 | ||||
-rw-r--r-- | src/dotty/tools/dotc/transform/ExplicitOuter.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/dotty/tools/dotc/core/Phases.scala b/src/dotty/tools/dotc/core/Phases.scala index caeb18f57..7b589fec1 100644 --- a/src/dotty/tools/dotc/core/Phases.scala +++ b/src/dotty/tools/dotc/core/Phases.scala @@ -175,7 +175,7 @@ object Phases { def refchecksPhase = refChecksCache.phase def erasurePhase = erasureCache.phase def flattenPhase = flattenCache.phase - def explicitOuter = explicitOuterCache.phase + def explicitOuterPhase = explicitOuterCache.phase def gettersSettersPhase = gettersSettersCache.phase def isAfterTyper(phase: Phase): Boolean = phase.id > typerPhase.id diff --git a/src/dotty/tools/dotc/transform/ExplicitOuter.scala b/src/dotty/tools/dotc/transform/ExplicitOuter.scala index e07be8603..179f8d712 100644 --- a/src/dotty/tools/dotc/transform/ExplicitOuter.scala +++ b/src/dotty/tools/dotc/transform/ExplicitOuter.scala @@ -112,7 +112,7 @@ object ExplicitOuter { def ensureOuterAccessors(cls: ClassSymbol)(implicit ctx: Context): Unit = { //todo: implementing #165 would simplify this logic val prevPhase = ctx.phase.prev - assert(prevPhase.id <= ctx.explicitOuter.id, "can add $outer symbols only before ExplicitOuter") + assert(prevPhase.id <= ctx.explicitOuterPhase.id, "can add $outer symbols only before ExplicitOuter") assert(prevPhase.isInstanceOf[DenotTransformer], "adding outerAccessors requires being DenotTransformer") if (!hasOuter(cls)) { newOuterAccessors(cls).foreach(_.enteredAfter(prevPhase.asInstanceOf[DenotTransformer])) |