diff options
| author | Paul Phillips <paulp@improving.org> | 2012-05-07 18:38:13 -0700 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2012-05-23 08:43:09 -0700 |
| commit | 2ed32de2a7cee223815c7eaccb559057a3348d84 (patch) | |
| tree | ec9c7a58f10e7775aa45922ab5a861530a34869b | |
| parent | 006e12a119e6fd5fc40584d4edb4c11f4ffdf7f9 (diff) | |
| download | scala-2ed32de2a7cee223815c7eaccb559057a3348d84.tar.gz scala-2ed32de2a7cee223815c7eaccb559057a3348d84.tar.bz2 scala-2ed32de2a7cee223815c7eaccb559057a3348d84.zip | |
Make phase fmask a public val instead of a private var.
| -rw-r--r-- | src/compiler/scala/reflect/internal/Phase.scala | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/compiler/scala/reflect/internal/Phase.scala b/src/compiler/scala/reflect/internal/Phase.scala index 89d643aacf..68dc5ce783 100644 --- a/src/compiler/scala/reflect/internal/Phase.scala +++ b/src/compiler/scala/reflect/internal/Phase.scala @@ -7,9 +7,10 @@ package scala.reflect package internal abstract class Phase(val prev: Phase) { + if ((prev ne null) && (prev ne NoPhase)) + prev.nx = this type Id = Int - val id: Id = if (prev eq null) 0 else prev.id + 1 /** New flags visible after this phase has completed */ @@ -18,12 +19,13 @@ abstract class Phase(val prev: Phase) { /** New flags visible once this phase has started */ def newFlags: Long = 0l - private var fmask: Long = - if (prev eq null) Flags.InitialFlags else prev.flagMask | prev.nextFlags | newFlags + val fmask = ( + if (prev eq null) Flags.InitialFlags + else prev.flagMask | prev.nextFlags | newFlags + ) def flagMask: Long = fmask private var nx: Phase = this - if ((prev ne null) && (prev ne NoPhase)) prev.nx = this def next: Phase = nx def hasNext = next != this |