Issue [SI-4824](https://issues.scala-lang.org/browse/SI-4824). Fixes …

…stack overflow bug when parsing long multiline comments
scala · Jul 7, 2014 · f326847 · f326847
1 parent 01ef53c
commit f326847
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 3 deletions.
diff --git a/src/main/scala/scala/util/parsing/combinator/lexical/StdLexical.scala b/src/main/scala/scala/util/parsing/combinator/lexical/StdLexical.scala
@@ -59,9 +59,9 @@ class StdLexical extends Lexical with StdTokens {
     )
 
   protected def comment: Parser[Any] = (
-      '*' ~ '/'  ^^ { case _ => ' '  }
-    | chrExcept(EofCh) ~ comment
-    )
+    rep (chrExcept (EofCh, '*')) ~ '*' ~ '/'     ^^ { case _ => ' ' }
+  | rep (chrExcept (EofCh, '*')) ~ '*' ~ comment ^^ { case _ => ' ' }
+  )
 
   /** The set of reserved identifiers: these will be returned as `Keyword`s. */
   val reserved = new mutable.HashSet[String]

diff --git a/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala b/src/test/scala/scala/util/parsing/combinator/PackratParsersTest.scala
@@ -30,6 +30,36 @@ class PackratParsersTest {
     check(4, "8/2")
     check(37, "4*9-0/7+9-8*1")
     check(9, "(1+2)*3")
+    check(3, """/* This is a
+                   long long long long long 
+                   long long long long long
+                   long long long long long
+                   long long long long long 
+                   long long long long long
+                   long long long long long
+                   long long long long long 
+                   long long long long long
+                   long long long long long
+                   long long long long long 
+                   long long long long long
+                   long long long long long
+                   long long long long long 
+                   long long long long long
+                   long long long long long
+                   long long long long long 
+                   long long long long long
+                   long long long long long
+                   long long long long long 
+                   long long long long long
+                   long long long long long
+                   long long long long long 
+                   long long long long long
+                   long long long long long
+                   long long long long long 
+                   long long long long long
+                   long long long long long
+                   comment */
+                1+2""")
   }
 
   @Test