Made gadt map better encapsulated.

Author: odersky

src/dotty/tools/dotc/core/Contexts.scala

@@ -601,7 +601,12 @@ object Contexts {
     implicit val ctx: Context = initctx
   }
 
-  class GADTMap(var bounds: SimpleMap[Symbol, TypeBounds])
+  class GADTMap(initBounds: SimpleMap[Symbol, TypeBounds]) {
+    private var myBounds = initBounds
+    def setBounds(sym: Symbol, b: TypeBounds): Unit =
+      myBounds = myBounds.updated(sym, b)
+    def bounds = myBounds
+  }
 
   /** Initial size of superId table */
   private final val InitialSuperIdsSize = 4096

src/dotty/tools/dotc/core/TypeComparer.scala

@@ -919,7 +919,7 @@ class TypeComparer(initctx: Context) extends DotClass {
 
   def narrowGADTBounds(tr: NamedType, bounds: TypeBounds): Boolean =
     isSubType(bounds.lo, bounds.hi) &&
-    { ctx.gadt.bounds = ctx.gadt.bounds.updated(tr.symbol, bounds); true }
+    { ctx.gadt.setBounds(tr.symbol, bounds); true }
 
   // Tests around `matches`
 

src/dotty/tools/dotc/typer/Typer.scala

@@ -675,7 +675,7 @@ class Typer extends Namer with TypeAssigner with Applications with Implicits wit
         val c = ctx.fresh.setFreshGADTBounds
         for (sym <- gadtSyms)
           if (!c.gadt.bounds.contains(sym))
-            c.gadt.bounds = c.gadt.bounds.updated(sym, TypeBounds.empty)
+            c.gadt.setBounds(sym, TypeBounds.empty)
         c
       }
     val pat1 = typedPattern(tree.pat, selType)(gadtCtx)