diff options
| author | Paul Phillips <paulp@improving.org> | 2011-10-23 18:12:56 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-10-23 18:12:56 +0000 |
| commit | fa3c892017a95dfbb647b382e76f98a7952c6ff0 (patch) | |
| tree | dd65bd4bf23862f4dc609cfd917eae528e566c0d | |
| parent | 81fda510a7aecab4463a6b6b6f9eb4f90361cdc7 (diff) | |
| download | scala-fa3c892017a95dfbb647b382e76f98a7952c6ff0.tar.gz scala-fa3c892017a95dfbb647b382e76f98a7952c6ff0.tar.bz2 scala-fa3c892017a95dfbb647b382e76f98a7952c6ff0.zip | |
Fix for combinator regression.
Propagate Error in repN. I have no time for a test case, I will gladly
take a contribution. References SI-1100, Closes SI-5108, No review.
| -rw-r--r-- | src/library/scala/util/parsing/combinator/Parsers.scala | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/library/scala/util/parsing/combinator/Parsers.scala b/src/library/scala/util/parsing/combinator/Parsers.scala index 1280ece013..e7ea9f598b 100644 --- a/src/library/scala/util/parsing/combinator/Parsers.scala +++ b/src/library/scala/util/parsing/combinator/Parsers.scala @@ -645,6 +645,7 @@ trait Parsers { val p0 = p // avoid repeatedly re-evaluating by-name parser @tailrec def applyp(in0: Input): ParseResult[List[T]] = p0(in0) match { case Success(x, rest) => elems += x ; applyp(rest) + case e @ Error(_, _) => e // still have to propagate error case _ => Success(elems.toList, in0) } |