Merge pull request #354 from dotty-staging/fix/capturedvars

Fix/capturedvars

Author: odersky

src/dotty/tools/dotc/transform/CapturedVars.scala

@@ -59,16 +59,12 @@ class CapturedVars extends MiniPhase with IdentityDenotTransformer { thisTransfo
       refMap.getOrElse(cls, refMap(defn.ObjectClass))
     }
 
-    def capturedType(vble: Symbol)(implicit ctx: Context): Type = {
-      val oldInfo = vble.denot(ctx.withPhase(thisTransform)).info
-      refCls(oldInfo.classSymbol, vble.isVolatile).typeRef
-    }
-
     override def prepareForValDef(vdef: ValDef)(implicit ctx: Context) = {
       val sym = vdef.symbol
       if (captured contains sym) {
         val newd = sym.denot(ctx.withPhase(thisTransform)).copySymDenotation(
-          info = refCls(sym.info.classSymbol, sym.hasAnnotation(defn.VolatileAnnot)).typeRef)
+          info = refCls(sym.info.classSymbol, sym.hasAnnotation(defn.VolatileAnnot)).typeRef,
+          initFlags = sym.flags &~ Mutable)
         newd.removeAnnotation(defn.VolatileAnnot)
         newd.installAfter(thisTransform)
       }

src/dotty/tools/dotc/util/SourceFile.scala

@@ -99,12 +99,7 @@ case class SourceFile(file: AbstractFile, content: Array[Char]) {
    *  Lines are numbered from 0
    */
   def offsetToLine(offset: Int): Int = {
-    val lines = lineIndices
-    def findLine(lo: Int, hi: Int, mid: Int): Int =
-      if (offset < lines(mid)) findLine(lo, mid - 1, (lo + mid - 1) / 2)
-      else if (offset >= lines(mid + 1)) findLine(mid + 1, hi, (mid + 1 + hi) / 2)
-      else mid
-    lastLine = findLine(0, lines.length, lastLine)
+    lastLine = Util.bestFit(lineIndices, offset, lastLine)
     lastLine
   }
 

src/dotty/tools/dotc/util/Util.scala

@@ -0,0 +1,34 @@
+package dotty.tools.dotc.util
+import reflect.ClassTag
+
+object Util {
+  
+  /** The index `i` in `candidates.indices` such that `candidates(i) <= x` and
+   *  `candidates(i)` is closest to `x`, determined by binary search, or -1
+   *  if `x < candidates(0)`.
+   *  @param  hint   If between 0 and `candidates.length` use this
+   *                 as the first search point, otherwise use 
+   *                 `candidates.length/2`.
+   *  @pre   candidates is sorted
+   */
+  def bestFit(candidates: Array[Int], x: Int, hint: Int = -1): Int = {
+    def recur(lo: Int, hi: Int, mid: Int): Int =
+      if (x < candidates(mid)) 
+        recur(lo, mid - 1, (lo + mid - 1) / 2)
+      else if (mid + 1 < candidates.length && x >= candidates(mid + 1)) 
+        recur(mid + 1, hi, (mid + 1 + hi) / 2)
+      else mid
+    val initMid = 
+      if (0 <= hint && hint < candidates.length) hint
+      else candidates.length / 2
+    if (candidates.isEmpty || x < candidates(0)) -1
+    else recur(0, candidates.length, initMid)
+  }
+  
+  /** An array twice the size of given array, with existing elements copied over */
+  def dble[T: ClassTag](arr: Array[T]) = {
+    val arr1 = new Array[T](arr.length * 2)
+    Array.copy(arr, 0, arr1, 0, arr.length)
+    arr1
+  }
+}