build with 2.13 stdlib

bishabosha · cheeseng · commit 6ab1cedc35b3 · 2019-12-23T21:34:42.000+08:00
diff --git a/common-test.dotty/src/main/scala/org/scalatest/SharedHelpers.scala b/common-test.dotty/src/main/scala/org/scalatest/SharedHelpers.scala
@@ -26,6 +26,7 @@ import scala.collection.SortedSet
 import FailureMessages.decorateToStringValue
 import java.util.concurrent.Executors
 import org.scalactic.Prettifier
+import org.scalactic.ArrayHelper.deep
 
 object SharedHelpers extends Assertions with LineNumberHelper {
 
@@ -855,7 +856,7 @@ object SharedHelpers extends Assertions with LineNumberHelper {
         case map: GenMap[_, _] => element.asInstanceOf[Tuple2[_, _]]._1
         case genTrv: GenTraversable[_] => getIndex(xs, element)
       }
-    Array(indexOrKey.toString, element.length.toString, (if (element != null && element.isInstanceOf[Array[_]]) element.asInstanceOf[Array[T]].deep.toString else element.toString))
+    Array(indexOrKey.toString, element.length.toString, (if (element != null && element.isInstanceOf[Array[_]]) deep(element.asInstanceOf[Array[T]]).toString else element.toString))
   }
 
   def indexLengthElement[T](itr: java.util.Iterator[String], xs: java.util.Collection[String], errorFun: String => Boolean): Array[String] = {
@@ -865,7 +866,7 @@ object SharedHelpers extends Assertions with LineNumberHelper {
         case map: java.util.Map[_, _] => element.asInstanceOf[java.util.Map.Entry[_, _]].getKey
         case genTrv: java.util.Collection[_] => getIndex(xs, element)
       }
-    Array(indexOrKey.toString, element.length.toString, (if (element != null && element.isInstanceOf[Array[_]]) element.asInstanceOf[Array[T]].deep.toString else element.toString))
+    Array(indexOrKey.toString, element.length.toString, (if (element != null && element.isInstanceOf[Array[_]]) deep(element.asInstanceOf[Array[T]]).toString else element.toString))
   }
 
   def indexElementLengthString[T](itr: Iterator[String], xs: GenTraversable[String], errorFun: String => Boolean): Array[String] = {
diff --git a/project/DottyBuild.scala b/project/DottyBuild.scala
@@ -13,7 +13,7 @@ trait DottyBuild { this: BuildCommons =>
 
   // List of available night build at https://repo1.maven.org/maven2/ch/epfl/lamp/dotty-compiler_0.14/
   // lazy val dottyVersion = dottyLatestNightlyBuild.get
-  lazy val dottyVersion = "0.17.0-RC1"
+  lazy val dottyVersion = "0.18.1"
   lazy val dottySettings = List(
     scalaVersion := dottyVersion,
     libraryDependencies := libraryDependencies.value.map(_.withDottyCompat(scalaVersion.value)),
diff --git a/project/GenArrayHelper.scala b/project/GenArrayHelper.scala
@@ -21,7 +21,7 @@ object GenArrayHelper {
 
   def genMain(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
     val content =
-      if (scalaVersion startsWith "2.13")
+      if (ScalaVersionHelper.isStdLibCompat_213(scalaVersion))
         """/*
           | * Copyright 2001-2018 Artima, Inc.
           | *
diff --git a/project/GenColCompatHelper.scala b/project/GenColCompatHelper.scala
@@ -21,7 +21,7 @@ object GenColCompatHelper {
 
   def genMain(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
     val content =
-      if (scalaVersion startsWith "2.13")
+      if (ScalaVersionHelper.isStdLibCompat_213(scalaVersion))
         """/*
           | * Copyright 2001-2018 Artima, Inc.
           | *
@@ -53,7 +53,9 @@ object GenColCompatHelper {
           |
           |  type Factory[-A, +C] = scala.collection.Factory[A, C]
           |
-          |  object Factory {}
+          |  object Factory {
+          |    $$DOTTY_CONVERSION_METHODS$$
+          |  }
           |
           |  def className(col: scala.collection.Iterable[_]): String = {
           |    val colToString = col.toString
@@ -69,7 +71,10 @@ object GenColCompatHelper {
           |  type StringOps = scala.collection.StringOps
           |}
           |
-        """.stripMargin
+        """.replaceAllLiterally(
+              "$$DOTTY_CONVERSION_METHODS$$",
+              if (ScalaVersionHelper.isDotty(scalaVersion)) dottyColCompatHelperFactoryMethods else "")
+           .stripMargin
       else
         """/*
           | * Copyright 2001-2018 Artima, Inc.
@@ -137,9 +142,23 @@ object GenColCompatHelper {
     )
   }
 
+  private def dottyColCompatHelperFactoryMethods: String = """
+  |    implicit def mkFactoryFromList[A]: Conversion[scala.collection.immutable.List.type, scala.collection.Factory[A, scala.collection.immutable.List[A]]] =
+  |      scala.collection.IterableFactory.toFactory(_)
+  |
+  |    implicit def mkFactoryFromVector[A]: Conversion[scala.collection.immutable.Vector.type, scala.collection.Factory[A, scala.collection.immutable.Vector[A]]] =
+  |      scala.collection.IterableFactory.toFactory(_)
+  |
+  |    implicit def mkFactoryFromSet[A]: Conversion[scala.collection.immutable.Set.type, scala.collection.Factory[A, scala.collection.immutable.Set[A]]] =
+  |      scala.collection.IterableFactory.toFactory(_)
+  |
+  |    implicit def mkFactoryFromListBuffer[A]: Conversion[scala.collection.mutable.ListBuffer.type, scala.collection.Factory[A, scala.collection.mutable.ListBuffer[A]]] =
+  |      scala.collection.IterableFactory.toFactory(_)
+  """.stripMargin
+
   def genTest(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
     val chainSpec =
-      if (scalaVersion startsWith "2.13")
+      if (ScalaVersionHelper.isStdLibCompat_213(scalaVersion))
         """/*
           | * Copyright 2001-2018 Artima, Inc.
           | *
@@ -213,7 +232,7 @@ object GenColCompatHelper {
         """.stripMargin
 
     val everySpec =
-      if (scalaVersion startsWith "2.13")
+      if (ScalaVersionHelper.isStdLibCompat_213(scalaVersion))
         """/*
           | * Copyright 2001-2018 Artima, Inc.
           | *
diff --git a/project/GenCompatibleClasses.scala b/project/GenCompatibleClasses.scala
@@ -80,7 +80,7 @@ object GenCompatibleClasses {
     targetDir.mkdirs()
     val file = new File(targetDir, "CompatParColls.scala")
     if (!file.exists || generatorSource.lastModified > file.lastModified) {
-      val parMethod = if (scalaVersion startsWith "2.13") "def par: T = oriCol" else ""
+      val parMethod = if(ScalaVersionHelper.isStdLibCompat_213(scalaVersion)) "def par: T = oriCol" else ""
       /*
        For recording purpose, this is the original version of CompatParColls that stops working in 2.13.0-M4
         /**
diff --git a/project/GenConfigMap.scala b/project/GenConfigMap.scala
@@ -21,7 +21,7 @@ object GenConfigMap {
 
   def genMain(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
     val content =
-      if (scalaVersion startsWith "2.13")
+      if(ScalaVersionHelper.isStdLibCompat_213(scalaVersion))
         """/*
           | * Copyright 2001-2013 Artima, Inc.
           | *
diff --git a/project/GenEvery.scala b/project/GenEvery.scala
@@ -6,7 +6,7 @@ import scala.io.Source
 object GenEvery {
 
   def transformLine(line: String, scalaVersion: String): String = {
-    if (scalaVersion startsWith "2.13")
+    if(ScalaVersionHelper.isStdLibCompat_213(scalaVersion))
       line
         .replaceAllLiterally(": Map[K, Every[T]]", ": scala.collection.MapView[K, org.scalactic.Every[T]]")
         .replaceAllLiterally("final def to[Col[_]](implicit cbf: CanBuildFrom[Nothing, T, Col[T @uV]]): Col[T @uV] = underlying.to[Col](cbf)",
diff --git a/project/GenScalacticDotty.scala b/project/GenScalacticDotty.scala
@@ -30,8 +30,13 @@ object GenScalacticDotty {
     else
       line
 
+  private def rewrite213(line: String): String =
+    line.replaceAllLiterally("final def startsWith(that: GenSeq[Char]): Boolean = theString.startsWith(that)", "final def startsWith(that: GenSeq[Char]): Boolean = theString.startsWith(that.mkString)")
+        .replaceAllLiterally("final def startsWith(that: Every[Char]): Boolean = theString.startsWith(that.toVector)", "final def startsWith(that: Every[Char]): Boolean = theString.startsWith(that.mkString)")
+        .replaceAllLiterally("""val fn: Int => Char = NonEmptyString("123").compose((idx: Int) => (idx + 1).toChar)""", """val fn: Int => Char = NonEmptyString("123").compose { case idx => (idx + 1).toChar }""")
+
   private def transformLine(line: String): String =
-    uncommentJsExport(line)
+    ((uncommentJsExport _) andThen (rewrite213 _))(line)
 
   private def copyFile(sourceFile: File, destFile: File): File = {
     val destWriter = new BufferedWriter(new FileWriter(destFile))
diff --git a/project/GenTable.scala b/project/GenTable.scala
@@ -353,7 +353,7 @@ object TableFor$n$ {
 """
 
 def tableTemplate(scalaVersion: String): String =
-  if (scalaVersion startsWith "2.13")
+  if(ScalaVersionHelper.isStdLibCompat_213(scalaVersion))
     tableTemplateRaw.replaceAllLiterally("scala.collection.IndexedSeqLike[($alphaUpper$), TableFor$n$[$alphaUpper$]]", "scala.collection.IndexedSeqOps[($alphaUpper$), scala.collection.IndexedSeq, scala.collection.IndexedSeq[($alphaUpper$)]]")
       .replaceAllLiterally("$$CLASS_BUILDER_METHODS$$", "")
       .replaceAllLiterally("$$OBJECT_BUILDER_METHODS$$",
diff --git a/project/ScalaVersionHelper.scala b/project/ScalaVersionHelper.scala
@@ -0,0 +1,11 @@
+object ScalaVersionHelper {
+    def isStdLibCompat_213(scalaVersion: String): Boolean = {
+        scalaVersion.startsWith("2.13") ||
+        isDotty(scalaVersion)
+    }
+
+    def isDotty(scalaVersion: String): Boolean = {
+        scalaVersion.startsWith("3.") ||
+        scalaVersion.matches("""0\.(?:1[8-]|2).*""")
+    }
+}
diff --git a/scalactic.dotty/src/main/scala/org/scalactic/anyvals/NumericString.scala b/scalactic.dotty/src/main/scala/org/scalactic/anyvals/NumericString.scala
@@ -25,7 +25,6 @@ import scala.collection.SeqView
 import scala.collection.GenIterable
 import scala.collection.GenTraversableOnce
 import scala.collection.generic.CanBuildFrom
-import scala.collection.generic.FilterMonadic
 //import scala.collection.parallel.ParSeq
 import scala.util.matching.Regex
 import scala.language.higherKinds
@@ -1208,7 +1207,7 @@ final class NumericString private (val value: String) extends AnyVal {
    *                  element of this `NumericString` and
    *                  concatenating the results.
    */
-  def flatMap[B, That](f: (Char) ⇒ GenTraversableOnce[B])(implicit bf: CanBuildFrom[String, B, That]): That =
+  def flatMap[B](f: (Char) => org.scalactic.ColCompatHelper.IterableOnce[B]): IndexedSeq[B] =
     value.flatMap(f)
 
   /** Folds the elements of this `NumericString` using the specified associative
@@ -1861,7 +1860,7 @@ final class NumericString private (val value: String) extends AnyVal {
     value.replaceAllLiterally(literal, replacement)
 
   def repr: String =
-    value.repr
+    value
 
   /** Returns new string with elements in reversed order.
    *
@@ -1894,7 +1893,7 @@ final class NumericString private (val value: String) extends AnyVal {
    *                `NumericString` and collecting the results
    *                in reversed order.
    */
-  def reverseMap[B, That](f: (Char) ⇒ B)(implicit bf: CanBuildFrom[String, B, That]): That =
+  def reverseMap[B](f: (Char) => B): IndexedSeq[B] =
     value.reverseMap(f)
 
   /** Checks if the other iterable collection contains the same
@@ -1911,49 +1910,36 @@ final class NumericString private (val value: String) extends AnyVal {
    *
    *  Note: The neutral element `z` may be applied more than once.
    *
-   *  @tparam B         element type of the resulting collection
-   *  @tparam That      type of the resulting collection
    *  @param z          neutral element for the operator `op`
    *  @param op         the associative operator for the scan
-   *  @param cbf        combiner factory which provides a combiner
    *
    *  @return a new string containing the prefix scan of the
    *          elements in this `NumericString`
    */
-  def scan[B >: Char, That](z: B)(op: (B, B) ⇒ B)(implicit cbf: CanBuildFrom[String, B, That]): That =
+  def scan(z: Char)(op: (Char, Char) ⇒ Char) =
     value.scan(z)(op)
 
   /** Produces a collection containing cumulative results of applying the
    *  operator going left to right.
    *
-   *  @tparam B      the type of the elements in the resulting collection
-   *  @tparam That   the actual type of the resulting collection
    *  @param z       the initial value
    *  @param op      the binary operator applied to the intermediate
    *                 result and the element
-   *  @param bf      an implicit value of class CanBuildFrom which
-   *                 determines the result class That from the current
-   *                 representation type Repr and the new element type B.
    *  @return        collection with intermediate results
    */
-  def scanLeft[B, That](z: B)(op: (B, Char) ⇒ B)(implicit bf: CanBuildFrom[String, B, That]): That =
+  def scanLeft(z: String)(op: (String, Char) ⇒ String) =
     value.scanLeft(z)(op)
 
   /** Produces a collection containing cumulative results of
    *  applying the operator going right to left.  The head of
    *  the collection is the last cumulative result.
    *
-   *  @tparam B      the type of the elements in the resulting collection
-   *  @tparam That   the actual type of the resulting collection
    *  @param z       the initial value
    *  @param         op the binary operator applied to the intermediate
    *                 result and the element
-   *  @param         bf an implicit value of class CanBuildFrom which
-   *                 determines the result class That from the current
-   *                 representation type Repr and the new element type B.
    *  @return        collection with intermediate results
    */
-  def scanRight[B, That](z: B)(op: (Char, B) ⇒ B)(implicit bf: CanBuildFrom[String, B, That]): That =
+  def scanRight(z: String)(op: (Char, String) ⇒ String) =
     value.scanRight(z)(op)
 
 
@@ -2181,7 +2167,7 @@ final class NumericString private (val value: String) extends AnyVal {
    *           the collection class `NumericString`.
    */
   def stringPrefix: String =
-    value.stringPrefix
+    org.scalactic.ColCompatHelper.className(value)
 
   /**
    *  Strip trailing line end character from this string if it has one.
@@ -2282,15 +2268,6 @@ final class NumericString private (val value: String) extends AnyVal {
   def takeWhile(p: (Char) ⇒ Boolean): String =
     value.takeWhile(p)
 
-  /** Converts this `NumericString` into another collection by
-   * copying all elements.
-   *
-   *  @tparam Col  The collection type to build.
-   *  @return a new collection containing all elements of this `NumericString`.
-   */
-  def to[Col[_]](implicit cbf: CanBuildFrom[Nothing, Char, Col[Char]]): Col[Char] =
-    value.to[Col]
-
   /** Converts this `NumericString` to an array.
    *
    *  @return    an array containing all elements of this `NumericString`.
@@ -2429,7 +2406,7 @@ final class NumericString private (val value: String) extends AnyVal {
    *                  `NumericString` followed by all elements
    *                  of `that`.
    */
-  def union[B >: Char, That](that: GenSeq[B])(implicit bf: CanBuildFrom[String, B, That]): That =
+  def union(that: Seq[Char]) =
     value.union(that)
 
   /** A copy of this `NumericString` with one single replaced element.
@@ -2441,32 +2418,14 @@ final class NumericString private (val value: String) extends AnyVal {
    *  @throws IndexOutOfBoundsException if `index` does not
    *    satisfy `0 <= index < length`.
    */
-  def updated[B >: Char, That](index: Int, elem: B)(implicit bf: CanBuildFrom[String, B, That]): That =
-    value.updated(index, elem)
-
-  /** Creates a non-strict view of a slice of this `NumericString`.
-   *
-   *  Note: the difference between `view` and `slice` is that
-   *        `view` produces a view of the current
-   *        `NumericString`, whereas `slice` produces a new
-   *        string.
-   *
-   *  Note: `view(from, to)` is equivalent to `view.slice(from, to)`
-   *
-   *  @param from   the index of the first element of the view
-   *  @param until  the index of the element following the view
-   *  @return a non-strict view of a slice of this
-   *    `NumericString`, starting at index `from` and extending up
-   *    to (but not including) index `until`.
-   */
-  def view(from: Int, until: Int): SeqView[Char, String] =
-    value.view(from, until)
+  def updated(index: Int, elem: NumericChar): NumericString =
+    NumericString.ensuringValid(value.updated(index, elem.value))
 
   /** Creates a non-strict view of this `NumericString`.
    *
    *  @return a non-strict view of this `NumericString`.
    */
-  def view: SeqView[Char, String] =
+  def view =
     value.view
 
   /** Creates a non-strict filter of this `NumericString`.
@@ -2483,10 +2442,10 @@ final class NumericString private (val value: String) extends AnyVal {
    *             those elements of this `NumericString` which
    *             satisfy the predicate `p`.
    */
-  def withFilter(p: (Char) ⇒ Boolean): FilterMonadic[Char, String] =
+  def withFilter(p: (Char) ⇒ Boolean) =
     value.withFilter(p)
 
-  /** Returns a collection of pairs formed from this `NumericString`
+  /** Returns a <code>Iterable</code> of pairs formed from this `NumericString`
    *  and another iterable collection by combining corresponding
    *  elements in pairs.  If one of the two collections is
    *  longer than the other, its remaining elements are ignored.
@@ -2500,7 +2459,7 @@ final class NumericString private (val value: String) extends AnyVal {
    *                 the lengths of this `NumericString` and
    *                 `that`.
    */
-  def zip[A1 >: Char, B, That](that: GenIterable[B])(implicit bf: CanBuildFrom[String, (A1, B), That]): That =
+  def zip[B](that: Iterable[B]): Iterable[(Char, B)] =
     value.zip(that)
 
   /** Returns a collection of pairs formed from this
@@ -2516,7 +2475,7 @@ final class NumericString private (val value: String) extends AnyVal {
    *                  result if this `NumericString` is shorter than `that`.
    *  @param thatElem the element to be used to fill up the
    *                  result if `that` is shorter than this `NumericString`.
-   *  @return   a new collection consisting of corresponding
+   *  @return   a new <code>Iterable</code> consisting of corresponding
    *            elements of this `NumericString` and
    *            `that`. The length of the returned
    *            collection is the maximum of the lengths
@@ -2527,21 +2486,21 @@ final class NumericString private (val value: String) extends AnyVal {
    *            this `NumericString`, `thatElem` values
    *            are used to pad the result.
    */
-  def zipAll[B, A1 >: Char, That](that: GenIterable[B], thisElem: A1, thatElem: B)(implicit bf: CanBuildFrom[String, (A1, B), That]): That =
+  def zipAll[A1 >: Char, B](that: Iterable[B], thisElem: A1, thatElem: B): Iterable[(A1, B)] =
     value.zipAll(that, thisElem, thatElem)
 
   /** Zips this `NumericString` with its indices.
    *
-   *    @return A new collection containing pairs
-   *                   consisting of all elements of this
+   *    @return A new <code>Iterable</code> containing pairs
+   *                   consisting of all characters of this
    *                   `NumericString` paired with their
    *                   index. Indices start at `0`.
    *    @example {{{
    * scala> NumericString("123").zipWithIndex
    * res41: scala.collection.immutable.IndexedSeq[(Char, Int)] = Vector((1,0), (2,1), (3,2))
    * }}}
    */
-  def zipWithIndex[A1 >: Char, That](implicit bf: CanBuildFrom[String, (A1, Int), That]): That =
+  def zipWithIndex: Iterable[(Char, Int)] =
     value.zipWithIndex
 
   /**
diff --git a/scalatest.dotty/src/main/scala/org/scalatest/Assertions.scala b/scalatest.dotty/src/main/scala/org/scalatest/Assertions.scala

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import scala.collection.SortedSet`
`26`	`26`	`import FailureMessages.decorateToStringValue`
`27`	`27`	`import java.util.concurrent.Executors`
`28`	`28`	`import org.scalactic.Prettifier`
	`29`	`+import org.scalactic.ArrayHelper.deep`
`29`	`30`
`30`	`31`	`object SharedHelpers extends Assertions with LineNumberHelper {`
`31`	`32`
`@@ -855,7 +856,7 @@ object SharedHelpers extends Assertions with LineNumberHelper {`
`855`	`856`	`case map: GenMap[_, _] => element.asInstanceOf[Tuple2[_, _]]._1`
`856`	`857`	`case genTrv: GenTraversable[_] => getIndex(xs, element)`
`857`	`858`	`}`
`858`		`- Array(indexOrKey.toString, element.length.toString, (if (element != null && element.isInstanceOf[Array[_]]) element.asInstanceOf[Array[T]].deep.toString else element.toString))`
	`859`	`+ Array(indexOrKey.toString, element.length.toString, (if (element != null && element.isInstanceOf[Array[_]]) deep(element.asInstanceOf[Array[T]]).toString else element.toString))`
`859`	`860`	`}`
`860`	`861`
`861`	`862`	`def indexLengthElement[T](itr: java.util.Iterator[String], xs: java.util.Collection[String], errorFun: String => Boolean): Array[String] = {`
`@@ -865,7 +866,7 @@ object SharedHelpers extends Assertions with LineNumberHelper {`
`865`	`866`	`case map: java.util.Map[_, _] => element.asInstanceOf[java.util.Map.Entry[_, _]].getKey`
`866`	`867`	`case genTrv: java.util.Collection[_] => getIndex(xs, element)`
`867`	`868`	`}`
`868`		`- Array(indexOrKey.toString, element.length.toString, (if (element != null && element.isInstanceOf[Array[_]]) element.asInstanceOf[Array[T]].deep.toString else element.toString))`
	`869`	`+ Array(indexOrKey.toString, element.length.toString, (if (element != null && element.isInstanceOf[Array[_]]) deep(element.asInstanceOf[Array[T]]).toString else element.toString))`
`869`	`870`	`}`
`870`	`871`
`871`	`872`	`def indexElementLengthString[T](itr: Iterator[String], xs: GenTraversable[String], errorFun: String => Boolean): Array[String] = {`