Implement ~> and <~ for OnceParser, fixes scala/bug#6464

Author: Philippus

shared/src/main/scala/scala/util/parsing/combinator/Parsers.scala

@@ -949,6 +949,12 @@ trait Parsers {
    */
   trait OnceParser[+T] extends Parser[T] {
     override def ~ [U](p: => Parser[U]): Parser[~[T, U]]
-      = OnceParser{ (for(a <- this; b <- commit(p)) yield new ~(a,b)).named("~") }
+    = OnceParser{ (for(a <- this; b <- commit(p)) yield new ~(a,b)).named("~") }
+
+    override def ~>[U](p: => Parser[U]): Parser[U]
+    = OnceParser{ (for(a <- this; b <- commit(p)) yield b).named("~>") }
+
+    override def <~[U](p: => Parser[U]): Parser[T]
+    = OnceParser{ (for(a <- this; b <- commit(p)) yield a).named("<~") }
   }
 }

shared/src/test/scala/scala/util/parsing/combinator/t6464.scala

@@ -0,0 +1,49 @@
+import scala.util.parsing.input.CharSequenceReader
+import scala.util.parsing.combinator.RegexParsers
+
+import org.junit.Test
+import org.junit.Assert.assertEquals
+
+class t6464 {
+  object SspParser extends RegexParsers {
+    val ok: Parser[Any] =
+      ("<%" ~! rep(' ') ~ "\\w+".r ~ rep(' ') ~ "%>"
+        | "<%" ~! err("should not fail here, because of ~!"))
+
+    val buggy: Parser[Any] =
+      ("<%" ~! rep(' ') ~> "\\w+".r <~ rep(' ') ~ "%>"
+        | "<%" ~! err("should not fail here, because of ~!"))
+
+  }
+    @Test
+    def test: Unit = {
+//      println( phrase(ok)   (new CharSequenceReader("<% hi %>")))  // [1.9] parsed: ((((<%~List( ))~hi)~List( ))~%>)
+//      println( phrase(ok)   (new CharSequenceReader("<%    %>")))  // [1.7] error: string matching regex `\w+' expected but `%' found
+//      println( phrase(buggy)(new CharSequenceReader("<% hi %>")))  // [1.9] parsed: hi
+//      println( phrase(buggy)(new CharSequenceReader("<%    %>")))  // java.lang.RuntimeException: should not fail here, because of ~!
+
+      assertEquals(
+        "[1.9] parsed: ((((<%~List( ))~hi)~List( ))~%>)",
+        SspParser.phrase(SspParser.ok)(new CharSequenceReader("<% hi %>")).toString)
+      val expected = """[1.7] error: string matching regex '\w+' expected but '%' found
+
+<%    %>
+      ^"""
+      assertEquals(
+        expected,
+        SspParser.phrase(SspParser.ok)(new CharSequenceReader("<%    %>")).toString)
+
+      assertEquals(
+        "[1.9] parsed: hi",
+        SspParser.phrase(SspParser.buggy)(new CharSequenceReader("<% hi %>")).toString)
+
+      val expected2 = """[1.7] error: string matching regex '\w+' expected but '%' found
+
+<%    %>
+      ^"""
+      assertEquals(
+        expected2,
+        SspParser.phrase(SspParser.buggy)(new CharSequenceReader("<%    %>")).toString)
+
+  }
+}