fixed split method on JVM

1 files changed, 58 insertions, 46 deletions

diff --git a/test/files/run/richs.scala b/test/files/run/richs.scala
index 951b249e07..db8f228843 100644
--- a/test/files/run/richs.scala
+++ b/test/files/run/richs.scala
@@ -17,11 +17,11 @@ trait RichTest {
 }
 object RichCharTest1 extends RichTest {
   def run {
-    Console.println("\n" + getObjectName + ":")
-    Console.println('\40'.isWhitespace)
-    Console.println('\011'.isWhitespace)
-    Console.println('1'.asDigit == 1)
-    Console.println('A'.asDigit == 10)
+    println("\n" + getObjectName + ":")
+    println('\40'.isWhitespace)
+    println('\011'.isWhitespace)
+    println('1'.asDigit == 1)
+    println('A'.asDigit == 10)
   }
 }
 // object RichCharTest2 extends RichTest {
@@ -30,84 +30,95 @@ object RichCharTest1 extends RichTest {
 //     private var c: Char = _
 //     def ch(): Char = c
 //     def nextch(): Unit = { c = if (it.hasNext) it.next else ';' }
-//     def err(msg: String) = Console.println(msg)
+//     def err(msg: String) = println(msg)
 //     nextch()
 //   }
 //   def run {
-//     Console.println("\n" + getObjectName + ":")
+//     println("\n" + getObjectName + ":")
 //     val c1 = C("x4A;")
 //     val s1 = xml.Utility.parseCharRef(c1.ch, c1.nextch, c1.err)
 //     val c2 = C("74;")
 //     val s2 = xml.Utility.parseCharRef(c2.ch, c2.nextch, c2.err)
-//     Console.println(s1 == s2)
+//     println(s1 == s2)
 //   }
 // }
 object RichIntTest extends RichTest {
   private val n = 10
   private val m = -2
   def run {
-    Console.println("\n" + getObjectName + ":")
-    Console.println(length(0 until n))
-    Console.println(length(0 to n))
-    Console.println(length(m until n))
-    Console.println(length(m to n))
-    Console.println(length(n until m))
-    Console.println(length(n to m))
+    println("\n" + getObjectName + ":")
+    println(length(0 until n))
+    println(length(0 to n))
+    println(length(m until n))
+    println(length(m to n))
+    println(length(n until m))
+    println(length(n to m))
   }
 }
 object RichStringTest1 extends RichTest {
   def run {
-    Console.println("\n" + getObjectName + ":")
-    Console.println("s1: " + s1)
-    Console.println("s2: " + s2)
-    Console.println("s3: " + s3)
-    Console.println("s4: " + s4)
-    Console.println("s5: " + s5)
+    println("\n" + getObjectName + ":")
+    println("s1: " + s1)
+    println("s2: " + s2)
+    println("s3: " + s3)
+    println("s4: " + s4)
+    println("s5: " + s5)
   }
 }
 object RichStringTest2 extends RichTest {
   def run {
-    Console.println("\n" + getObjectName + ":")
-    Console.print("s1: "); s1.lines foreach Console.println
-    Console.print("s2: "); s2.lines foreach Console.println
-    Console.print("s3: "); s3.lines foreach Console.println
-    Console.print("s4: "); s4.lines foreach Console.println
-    Console.print("s5: "); s5.lines foreach Console.println
+    println("\n" + getObjectName + ":")
+    Console.print("s1: "); s1.lines foreach println
+    Console.print("s2: "); s2.lines foreach println
+    Console.print("s3: "); s3.lines foreach println
+    Console.print("s4: "); s4.lines foreach println
+    Console.print("s5: "); s5.lines foreach println
   }
 }
 object RichStringTest3 extends RichTest {
   def run {
-    Console.println("\n" + getObjectName + ":")
-    Console.println("s1: " + s1.stripLineEnd)
-    Console.println("s2: " + s2.stripLineEnd)
-    Console.println("s3: " + s3.stripLineEnd)
-    Console.println("s4: " + s4.stripLineEnd)
-    Console.println("s5: " + s5.stripLineEnd)
+    println("\n" + getObjectName + ":")
+    println("s1: " + s1.stripLineEnd)
+    println("s2: " + s2.stripLineEnd)
+    println("s3: " + s3.stripLineEnd)
+    println("s4: " + s4.stripLineEnd)
+    println("s5: " + s5.stripLineEnd)
   }
 }
 object RichStringTest4 extends RichTest {
   def run {
-    Console.println("\n" + getObjectName + ":")
-    Console.println("s1: " + s1.stripMargin)
-    Console.println("s2: " + s2.stripMargin)
-    Console.println("s3: " + s3.stripMargin)
-    Console.println("s4: " + s4.stripMargin)
-    Console.println("s5: " + s5.stripMargin)
+    println("\n" + getObjectName + ":")
+    println("s1: " + s1.stripMargin)
+    println("s2: " + s2.stripMargin)
+    println("s3: " + s3.stripMargin)
+    println("s4: " + s4.stripMargin)
+    println("s5: " + s5.stripMargin)
   }
 }
 object RichStringTest5 extends RichTest {
   def run {
-    Console.println("\n" + getObjectName + ":")
-    Console.println("s1: " + s3.stripMargin('#'))
-    Console.println("s2: " + s3.stripMargin('#'))
-    Console.println("s3: " + s3.stripMargin('#'))
-    Console.println("s4: " + s4.stripMargin('#'))
-    Console.println("s5: " + s5.stripMargin('#'))
+    println("\n" + getObjectName + ":")
+    println("s1: " + s3.stripMargin('#'))
+    println("s2: " + s3.stripMargin('#'))
+    println("s3: " + s3.stripMargin('#'))
+    println("s4: " + s4.stripMargin('#'))
+    println("s5: " + s5.stripMargin('#'))
+  }
+}
+object RichStringTest6 extends RichTest {
+  def run {
+    println("a:b:c:d".split(':').toList)
+    println("a.b.c.d".split('.').toList)
+    println("a$b$c$d".split('$').toList)
+    println("a^b^c^d".split('^').toList)
+    println("a\\b\\c\\d".split('\\').toList)
+    println("a:b:c.d".split(Array(':', '.')).toList)
+    println("a:b.c$d".split(Array(':', '.', '$')).toList)
   }
 }
 /** xxx */
 object Test {
-  def main(args: Array[String]): Unit = {
+  def main(args: Array[String]) {
     RichCharTest1.run
     //RichCharTest2.run
     RichIntTest.run
@@ -116,5 +127,6 @@ object Test {
     RichStringTest3.run
     RichStringTest4.run
     RichStringTest5.run
+    RichStringTest6.run
   }
 }