fixed (hopefully) regexp pattern (Java 1.4 vs 1...

fixed (hopefully) regexp pattern (Java 1.4 vs 1.5+)

1 files changed, 8 insertions, 2 deletions

diff --git a/src/library/scala/runtime/RichString.scala b/src/library/scala/runtime/RichString.scala
index e2c5d1f0c6..23db1a3fa7 100644
--- a/src/library/scala/runtime/RichString.scala
+++ b/src/library/scala/runtime/RichString.scala
@@ -164,12 +164,18 @@ final class RichString(val self: String) extends Proxy with RandomAccessSeq[Char
    */
   def stripMargin: String = stripMargin('|')
 
+  // NB. "\\Q" + '\\' + "\\E" works on Java 1.5 and newer, but not on Java 1.4
+  private def escape(ch: Char): String = ch match {
+    case '\\' => "\\\\"
+    case _ => "\\Q"+ch+"\\E"
+  }
+
   @throws(classOf[java.util.regex.PatternSyntaxException])
-  def split(separator: Char): Array[String] = self.split("\\Q"+separator+"\\E")
+  def split(separator: Char): Array[String] = self.split(escape(separator))
 
   @throws(classOf[java.util.regex.PatternSyntaxException])
   def split(separators: Array[Char]): Array[String] = {
-    val re = separators.foldLeft("[")(_+"\\Q"+_+"\\E") + "]"
+    val re = separators.foldLeft("[")(_+escape(_)) + "]"
     self.split(re)
   }