Fix bug in repeatedly parsing scala#34

Author: Amal Elshihaby

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

@@ -436,9 +436,9 @@ trait Parsers {
 
     /** Returns a parser that repeatedly parses what this parser parses.
      *
-     *  @return rep(this)
+     *  @return rep1(this)
      */
-    def * = rep(this)
+    def * = rep1(this)
 
     /** Returns a parser that repeatedly parses what this parser parses,
      *  interleaved with the `sep` parser. The `sep` parser specifies how
@@ -884,7 +884,7 @@ trait Parsers {
         if (in1.atEnd)
           s
         else
-            lastNoSuccessVar.value filterNot { _.next.pos < in1.pos } getOrElse Failure("end of input expected", in1)
+          lastNoSuccessVar.value filterNot { _.next.pos < in1.pos } getOrElse Failure("end of input expected", in1)
         case ns => lastNoSuccessVar.value.getOrElse(ns)
       }
     }

src/test/scala/scala/util/parsing/combinator/JavaTokenParsersTest.scala

@@ -55,4 +55,28 @@ class JavaTokenParsersTest {
     parseFailure("with space", 6)
   }
 
+  @Test
+  def repeatedlyParsesTest: Unit = {
+    object TestTokenParser extends JavaTokenParsers
+    import TestTokenParser._
+    val p = ident ~ "(?i)AND".r.*
+
+    val parseResult = parseAll(p, "start start")
+    parseResult match {
+      case e @ Failure(message, next) =>
+        assertEquals(next.pos.column, 7)
+        assert(message.endsWith("string matching regex `(?i)AND' expected but `s' found"))
+      case _ => sys.error(parseResult.toString)
+    }
+
+    val parseResult2 = parseAll(p, "start AND AND")
+    parseResult2 match {
+      case Success(r, _) =>
+        assertEquals("start", r._1)
+        assertEquals("AND AND", r._2.mkString(" "))
+      case _ => sys.error(parseResult.toString)
+    }
+  }
+
+
 }