Change stdlib collections to be compiled under capture checking

scala · Nov 6, 2023 · b5bfbab · b5bfbab
1 parent 3caf116
commit b5bfbab
Show file tree

Hide file tree

Showing 145 changed files with 1,983 additions and 1,980 deletions.
diff --git a/tests/pos-special/stdlib/Test1.scala b/tests/pos-special/stdlib/Test1.scala
@@ -0,0 +1,34 @@
+import language.experimental.captureChecking
+import collection.{View, Seq}
+import collection.mutable.{ArrayBuffer, ListBuffer}
+
+import java.io.*
+
+object Test0:
+
+  def usingLogFile[sealed T](op: FileOutputStream^ => T): T =
+    val logFile = FileOutputStream("log")
+    val result = op(logFile)
+    logFile.close()
+    result
+
+  def test(xs: List[Int]) =
+    usingLogFile: f =>
+      xs.map: x =>
+        f.write(x)
+        x * x
+
+object Test1:
+  def test(it: Iterator[Int]^, v: View[Int]^) =
+    val isEven: Int ->{cap[test]} Boolean = _ % 2 == 0
+    val it2 = it.filter(isEven)
+    val _: Iterator[Int]^{it, isEven} = it2
+    val it2c: Iterator[Int]^{it2} = it2
+    val v2 = v.filter(isEven)
+    val _: View[Int]^{v, isEven} = v2
+    val v2c: View[Int]^{v2} = v2
+    val v3 = v.drop(2)
+    val _: View[Int]^{v} = v3
+    val v3c: View[Int]^{v3} = v3
+    val (xs6, xs7) = v.partition(isEven)
+    val (xs6a, xs7a) = v.partition(_ % 2 == 0)
diff --git a/tests/pos-special/stdlib/Test2.scala b/tests/pos-special/stdlib/Test2.scala
@@ -0,0 +1,232 @@
+import scala.reflect.ClassTag
+import language.experimental.captureChecking
+import collection.{View, Seq}
+import collection.mutable.{ArrayBuffer, ListBuffer}
+
+object Test {
+
+  def seqOps(xs: Seq[Int]) = { // try with Seq[Int]^{cap}
+    val strPlusInt: (String, Int) => String = _ + _
+    val intPlusStr: (Int, String) => String = _ + _
+    val isEven: Int => Boolean = _ % 2 == 0
+    val isNonNeg: Int => Boolean = _ > 0
+    val flips: Int => List[Int] = x => x :: -x :: Nil
+    val x1 = xs.foldLeft("")(strPlusInt)
+    val y1: String = x1
+    val x2 = xs.foldRight("")(intPlusStr)
+    val y2: String = x2
+    val x3 = xs.indexWhere(isEven)
+    val y3: Int = x3
+    val x4 = xs.head
+    val y4: Int = x4
+    val x5 = xs.to(List)
+    val y5: List[Int] = x5
+    val (xs6, xs7) = xs.partition(isEven)
+    val ys6: Seq[Int] = xs6
+    val ys7: Seq[Int] = xs7
+    val xs8 = xs.drop(2)
+    val ys8: Seq[Int] = xs8
+    val xs9 = xs.map(isNonNeg)
+    val ys9: Seq[Boolean] = xs9
+    val xs10 = xs.flatMap(flips)
+    val ys10: Seq[Int] = xs10
+    val xs11 = xs ++ xs
+    val ys11: Seq[Int] = xs11
+    val xs12 = xs ++ Nil
+    val ys12: Seq[Int] = xs12
+    val xs13 = Nil ++ xs
+    val ys13: Seq[Int] = xs13
+    val xs14 = xs ++ ("a" :: Nil)
+    val ys14: Seq[Any] = xs14
+    val xs15 = xs.zip(xs9)
+    val ys15: Seq[(Int, Boolean)] = xs15
+    val xs16 = xs.reverse
+    val ys16: Seq[Int] = xs16
+    println("-------")
+    println(x1)
+    println(x2)
+    println(x3)
+    println(x4)
+    println(x5)
+    println(xs6)
+    println(xs7)
+    println(xs8)
+    println(xs9)
+    println(xs10)
+    println(xs11)
+    println(xs12)
+    println(xs13)
+    println(xs14)
+    println(xs15)
+    println(xs16)
+  }
+
+  def iterOps(xs: => Iterator[Int]^) =
+    val strPlusInt: (String, Int) => String = _ + _
+    val intPlusStr: (Int, String) => String = _ + _
+    val isEven: Int ->{cap[iterOps]} Boolean = _ % 2 == 0
+    val isNonNeg: Int => Boolean = _ > 0
+    val flips: Int => List[Int] = x => x :: -x :: Nil
+    val x1 = xs.foldLeft("")(strPlusInt)
+    val y1: String = x1
+    val x2 = xs.foldRight("")(intPlusStr)
+    val y2: String = x2
+    val x4 = xs.next()
+    val y4: Int = x4
+    val x5 = xs.to(List)
+    val y5: List[Int] = x5
+    val (xs6, xs7) = xs.partition(isEven)
+    val ys6: Iterator[Int]^{xs6, isEven} = xs6
+    val ys7: Iterator[Int]^{xs7, isEven} = xs7
+    val (xs6a, xs7a) = xs.partition(_ % 2 == 0)
+    val ys6a: Iterator[Int]^{xs6} = xs6
+    val ys7a: Iterator[Int]^{xs7} = xs7
+    val xs8 = xs.drop(2)
+    val ys8: Iterator[Int]^{xs8} = xs8
+    val xs9 = xs.map(isNonNeg)
+    val ys9: Iterator[Boolean]^{xs9} = xs9
+    val xs10 = xs.flatMap(flips)
+    val ys10: Iterator[Int]^{xs10} = xs10
+    val xs11 = xs ++ xs
+    val ys11: Iterator[Int]^{xs11} = xs11
+    val xs12 = xs ++ Nil
+    val ys12: Iterator[Int]^{xs12} = xs12
+    val xs13 = Nil ++ xs
+    val ys13: List[Int] = xs13
+    val xs14 = xs ++ ("a" :: Nil)
+    val ys14: Iterator[Any]^{xs14} = xs14
+    val xs15 = xs.zip(xs9)
+    val ys15: Iterator[(Int, Boolean)]^{xs15} = xs15
+    println("-------")
+    println(x1)
+    println(x2)
+    println(x4)
+    println(x5)
+    println(xs6.to(List))
+    println(xs7.to(List))
+    println(xs8.to(List))
+    println(xs9.to(List))
+    println(xs10.to(List))
+    println(xs11.to(List))
+    println(xs12.to(List))
+    println(xs13.to(List))
+    println(xs14.to(List))
+    println(xs15.to(List))
+
+  def viewOps(xs: View[Int]^) = {
+    val strPlusInt: (String, Int) => String = _ + _
+    val intPlusStr: (Int, String) => String = _ + _
+    val isEven: Int ->{cap[viewOps]} Boolean = _ % 2 == 0
+    val isNonNeg: Int => Boolean = _ > 0
+    val flips: Int => List[Int] = x => x :: -x :: Nil
+    val x1 = xs.foldLeft("")(strPlusInt)
+    val y1: String = x1
+    val x2 = xs.foldRight("")(intPlusStr)
+    val y2: String = x2
+    //val x3 = xs.indexWhere(_ % 2 == 0)  // indexWhere does not exist on View
+    //val y3: Int = x3
+    val x4 = xs.head
+    val y4: Int = x4
+    val x5 = xs.to(List)
+    val y5: List[Int] = x5
+    val (xs6, xs7) = xs.partition(isEven)
+    val ys6: View[Int]^{xs6, isEven} = xs6
+    val ys7: View[Int]^{xs7, isEven} = xs7
+    val (xs6a, xs7a) = xs.partition(_ % 2 == 0)
+    val ys6a: View[Int]^{xs6} = xs6
+    val ys7a: View[Int]^{xs7} = xs7
+    val xs8 = xs.drop(2)
+    val ys8: View[Int]^{xs8} = xs8
+    val xs9 = xs.map(isNonNeg)
+    val ys9: View[Boolean]^{xs9} = xs9
+    val xs10 = xs.flatMap(flips)
+    val ys10: View[Int]^{xs10} = xs10
+    val xs11 = xs ++ xs
+    val ys11: View[Int]^{xs11} = xs11
+    val xs12 = xs ++ Nil
+    val ys12: View[Int]^{xs12} = xs12
+    val xs13 = Nil ++ xs
+    val ys13: List[Int] = xs13
+    val xs14 = xs ++ ("a" :: Nil)
+    val ys14: View[Any]^{xs14} = xs14
+    val xs15 = xs.zip(xs9)
+    val ys15: View[(Int, Boolean)]^{xs15} = xs15
+    println("-------")
+    println(x1)
+    println(x2)
+    println(x4)
+    println(x5)
+    println(xs6.to(List))
+    println(xs7.to(List))
+    println(xs8.to(List))
+    println(xs9.to(List))
+    println(xs10.to(List))
+    println(xs11.to(List))
+    println(xs12.to(List))
+    println(xs13.to(List))
+    println(xs14.to(List))
+    println(xs15.to(List))
+  }
+
+  def stringOps(xs: String) = {
+    val x1 = xs.foldLeft("")(_ + _)
+    val y1: String = x1
+    val x2 = xs.foldRight("")(_ + _)
+    val y2: String = x2
+    val x3 = xs.indexWhere(_ % 2 == 0)
+    val y3: Int = x3
+    val x4 = xs.head
+    val y4: Int = x4
+    val x5 = xs.to(List)
+    val y5: List[Char] = x5
+    val (xs6, xs7) = xs.partition(_ % 2 == 0)
+    val ys6: String = xs6
+    val ys7: String = xs7
+    val xs8 = xs.drop(2)
+    val ys8: String = xs8
+    val xs9 = xs.map(_ + 1)
+    val ys9: Seq[Int] = xs9
+    val xs9a = xs.map(_.toUpper)
+    val ys9a: String = xs9a
+    val xs10 = xs.flatMap((x: Char) => s"$x,$x")
+    val ys10: String = xs10
+    val xs11 = xs ++ xs
+    val ys11: String = xs11
+    val ops = collection.StringOps(xs)  // !!! otherwise we can a "cannot establish reference"
+    val xs13 = Nil ++ ops.iterator
+    val ys13: List[Char] = xs13
+    val xs14 = xs ++ ("xyz" ::  Nil)
+    val ys14: Seq[Any] = xs14
+    val xs15 = xs.zip(xs9)
+    val ys15: Seq[(Char, Int)] = xs15
+    println("-------")
+    println(x1)
+    println(x2)
+    println(x3)
+    println(x4)
+    println(x5)
+    println(xs6)
+    println(xs7)
+    println(xs8)
+    println(xs9)
+    println(xs9a)
+    println(xs10)
+    println(xs11)
+    println(xs13)
+    println(xs14)
+    println(xs15)
+  }
+
+  def main(args: Array[String]) = {
+    val ints = List(1, 2, 3)
+    val intsBuf = ints.to(ArrayBuffer)
+    val intsListBuf = ints.to(ListBuffer)
+    val intsView = ints.view
+    seqOps(ints)
+    seqOps(intsBuf)
+    seqOps(intsListBuf)
+    viewOps(intsView)
+    iterOps(ints.iterator)
+    stringOps("abc")
+  }
+}