Regex improvements

This adds findAllMatchIn to Regex to mirror other similar methods.

It also overloads StringLike's "r", adding a version that accepts
group names.

It includes test cases for both methods.

Closes SI-2460.

1 files changed, 13 insertions, 2 deletions

diff --git a/src/library/scala/collection/immutable/StringLike.scala b/src/library/scala/collection/immutable/StringLike.scala
index f9697565de..fc4e7bf0a8 100644
--- a/src/library/scala/collection/immutable/StringLike.scala
+++ b/src/library/scala/collection/immutable/StringLike.scala
@@ -207,9 +207,20 @@ self =>
 
   /** You can follow a string with `.r`, turning it into a `Regex`. E.g.
    *
-   *  """A\w*""".r   is the regular expression for identifiers starting with `A`.
+   *  `"""A\w*""".r`   is the regular expression for identifiers starting with `A`.
    */
-  def r: Regex = new Regex(toString)
+  def r: Regex = r()
+
+  /** You can follow a string with `.r(g1, ... , gn)`, turning it into a `Regex`,
+   *  with group names g1 through gn.
+   *
+   *  `"""(\d\d)-(\d\d)-(\d\d\d\d)""".r("month", "day", "year")` matches dates
+   *  and provides its subcomponents through groups named "month", "day" and
+   *  "year".
+   *
+   *  @param groupNames The names of the groups in the pattern, in the order they appear.
+   */
+  def r(groupNames: String*): Regex = new Regex(toString, groupNames: _*)
 
   def toBoolean: Boolean = parseBoolean(toString)
   def toByte: Byte       = java.lang.Byte.parseByte(toString)