Merge pull request #3241 from dotty-staging/private-this-var

Replace `private var` by `private[this] var` where possible

Author: smarter

compiler/sjs/backend/sjs/JSCodeGen.scala

@@ -72,7 +72,7 @@ class JSCodeGen()(implicit ctx: Context) {
   /* See genSuperCall()
    * TODO Can we avoid this unscoped var?
    */
-  private var isModuleInitialized: Boolean = false
+  private[this] var isModuleInitialized: Boolean = false
 
   private def currentClassType = encodeClassType(currentClassSym)
 

compiler/sjs/backend/sjs/ScopedVar.scala

@@ -5,7 +5,7 @@ import language.implicitConversions
 class ScopedVar[A](init: A) {
   import ScopedVar.Assignment
 
-  private var value = init
+  private[this] var value = init
 
   def this()(implicit ev: Null <:< A) = this(ev(null))
 

compiler/src/dotty/tools/backend/jvm/GenBCode.scala

@@ -77,9 +77,9 @@ class GenBCodePipeline(val entryPoints: List[Symbol], val int: DottyBackendInter
 
 //  class BCodePhase() {
 
-    private var bytecodeWriter  : BytecodeWriter   = null
-    private var mirrorCodeGen   : JMirrorBuilder   = null
-    private var beanInfoCodeGen : JBeanInfoBuilder = null
+    private[this] var bytecodeWriter  : BytecodeWriter   = null
+    private[this] var mirrorCodeGen   : JMirrorBuilder   = null
+    private[this] var beanInfoCodeGen : JBeanInfoBuilder = null
 
     /* ---------------- q1 ---------------- */
 

compiler/src/dotty/tools/dotc/Bench.scala

@@ -10,7 +10,7 @@ import reporting.Reporter
  */
 object Bench extends Driver {
 
-  @sharable private var numRuns = 1
+  @sharable private[this] var numRuns = 1
 
   private def ntimes(n: Int)(op: => Reporter): Reporter =
     (emptyReporter /: (0 until n)) ((_, _) => op)

compiler/src/dotty/tools/dotc/ast/Trees.scala

@@ -33,7 +33,7 @@ object Trees {
   /** Property key for trees with documentation strings attached */
   val DocComment = new Property.Key[Comment]
 
-  @sharable private var nextId = 0 // for debugging
+  @sharable private[this] var nextId = 0 // for debugging
 
   type LazyTree = AnyRef     /* really: Tree | Lazy[Tree] */
   type LazyTreeList = AnyRef /* really: List[Tree] | Lazy[List[Tree]] */

compiler/src/dotty/tools/dotc/ast/untpd.scala

@@ -209,7 +209,7 @@ object untpd extends Trees.Instance[Untyped] with UntypedTreeInfo {
    */
   abstract class DerivedTypeTree extends TypeTree {
 
-    private var myWatched: Tree = EmptyTree
+    private[this] var myWatched: Tree = EmptyTree
 
     /** The watched tree; used only for printing */
     def watched: Tree = myWatched

compiler/src/dotty/tools/dotc/config/JavaPlatform.scala

@@ -11,7 +11,7 @@ import transform.ExplicitOuter, transform.SymUtils._
 
 class JavaPlatform extends Platform {
 
-  private var currentClassPath: Option[ClassPath] = None
+  private[this] var currentClassPath: Option[ClassPath] = None
 
   def classPath(implicit ctx: Context): ClassPath = {
     if (currentClassPath.isEmpty)

compiler/src/dotty/tools/dotc/config/OutputDirs.scala

@@ -12,12 +12,12 @@ import io._
  */
 class OutputDirs {
   /** Pairs of source directory - destination directory. */
-  private var outputDirs: List[(AbstractFile, AbstractFile)] = Nil
+  private[this] var outputDirs: List[(AbstractFile, AbstractFile)] = Nil
 
   /** If this is not None, the output location where all
    *  classes should go.
    */
-  private var singleOutDir: Option[AbstractFile] = None
+  private[this] var singleOutDir: Option[AbstractFile] = None
 
   /** Add a destination directory for sources found under srcdir.
    *  Both directories should exits.

compiler/src/dotty/tools/dotc/config/Settings.scala

@@ -25,8 +25,8 @@ object Settings {
   val DirectoryTag = ClassTag(classOf[Directory])
 
   class SettingsState(initialValues: Seq[Any]) {
-    private var values = ArrayBuffer(initialValues: _*)
-    private var _wasRead: Boolean = false
+    private[this] var values = ArrayBuffer(initialValues: _*)
+    private[this] var _wasRead: Boolean = false
 
     override def toString = s"SettingsState(values: ${values.toList})"
 
@@ -68,7 +68,7 @@ object Settings {
     depends: List[(Setting[_], Any)] = Nil,
     propertyClass: Option[Class[_]] = None)(private[Settings] val idx: Int) {
 
-    private var changed: Boolean = false
+    private[this] var changed: Boolean = false
 
     def withAbbreviation(abbrv: String): Setting[T] =
       copy(aliases = aliases :+ abbrv)(idx)

compiler/src/dotty/tools/dotc/core/Annotations.scala

@@ -38,7 +38,7 @@ object Annotations {
     override def symbol(implicit ctx: Context): Symbol
     def complete(implicit ctx: Context): Tree
 
-    private var myTree: Tree = null
+    private[this] var myTree: Tree = null
     def tree(implicit ctx: Context) = {
       if (myTree == null) myTree = complete(ctx)
       myTree
@@ -62,8 +62,8 @@ object Annotations {
   }
 
   case class LazyBodyAnnotation(private var bodyExpr: Context => Tree) extends BodyAnnotation {
-    private var evaluated = false
-    private var myBody: Tree = _
+    private[this] var evaluated = false
+    private[this] var myBody: Tree = _
     def tree(implicit ctx: Context) = {
       if (evaluated) assert(myBody != null)
       else {