Add Collections from scala-reflect

Author: smarter

compiler/src/dotty/tools/dotc/parsing/JavaParsers.scala

@@ -23,10 +23,10 @@ import Decorators._
 import StdNames._
 import dotty.tools.dotc.reporting.diagnostic.messages.IdentifierExpected
 import dotty.tools.dotc.util.SourceFile
+import util.Collections._
 import util.Positions._
 import annotation.switch
 import scala.collection.mutable.ListBuffer
-import scala.reflect.internal.util.Collections._
 
 object JavaParsers {
 

compiler/src/dotty/tools/dotc/transform/FullParameterization.scala

@@ -12,7 +12,7 @@ import NameOps._
 import ast._
 import ast.Trees._
 
-import scala.reflect.internal.util.Collections
+import util.Collections
 
 /** Provides methods to produce fully parameterized versions of instance methods,
  *  where the `this` of the enclosing class is abstracted out in an extra leading

compiler/src/dotty/tools/dotc/transform/PatternMatcher.scala

@@ -30,7 +30,7 @@ import dotty.tools.dotc.util.Positions.Position
 import dotty.tools.dotc.core.Decorators._
 import dotty.tools.dotc.core.Flags
 
-import scala.reflect.internal.util.Collections
+import util.Collections
 
 /** This transform eliminates patterns. Right now it's a dummy.
  *  Awaiting the real pattern matcher.

compiler/src/dotty/tools/dotc/util/Collections.scala

@@ -0,0 +1,39 @@
+/* NSC -- new Scala compiler
+ * Copyright 2005-2013 LAMP/EPFL
+ * @author  Paul Phillips
+ */
+
+package dotty.tools
+package dotc
+package util
+
+import scala.collection.mutable.ListBuffer
+
+/** Profiler driven changes.
+ *  This was adapted from https://github.com/scala/scala/blob/2.11.x/src/reflect/scala/reflect/internal/util/Collections.scala
+ */
+object Collections {
+  final def mapWithIndex[A, B](xs: List[A])(f: (A, Int) => B): List[B] = {
+    val lb = new ListBuffer[B]
+    var index = 0
+    var ys = xs
+    while (!ys.isEmpty) {
+      lb += f(ys.head, index)
+      ys = ys.tail
+      index += 1
+    }
+    lb.toList
+  }
+
+  final def map2[A, B, C](xs1: List[A], xs2: List[B])(f: (A, B) => C): List[C] = {
+    val lb = new ListBuffer[C]
+    var ys1 = xs1
+    var ys2 = xs2
+    while (!ys1.isEmpty && !ys2.isEmpty) {
+      lb += f(ys1.head, ys2.head)
+      ys1 = ys1.tail
+      ys2 = ys2.tail
+    }
+    lb.toList
+  }
+}