diff options
| author | Som Snytt <som.snytt@gmail.com> | 2014-12-04 12:24:15 -0800 |
|---|---|---|
| committer | Som Snytt <som.snytt@gmail.com> | 2014-12-04 12:28:48 -0800 |
| commit | 736293ab0977a79175ed025149263456526dc561 (patch) | |
| tree | 79d886126455821d0993ab4541e7ffeff4160fa0 /src | |
| parent | a908ded364a6f8b664c6b02552a909c143d21b19 (diff) | |
| download | scala-736293ab0977a79175ed025149263456526dc561.tar.gz scala-736293ab0977a79175ed025149263456526dc561.tar.bz2 scala-736293ab0977a79175ed025149263456526dc561.zip | |
SI-9027 Backport xml parser fix
Fingers crossed, I have no local java 6 here to test.
No test because no q"" on 2.10.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala index 553a2088a6..a27bf6bea2 100755 --- a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala @@ -349,13 +349,12 @@ trait MarkupParsers { content_LT(ts) // parse more XML ? - if (charComingAfter(xSpaceOpt) == '<') { - xSpaceOpt - while (ch == '<') { - nextch + if (charComingAfter(xSpaceOpt()) == '<') { + do { + xSpaceOpt() + nextch() ts append element - xSpaceOpt - } + } while (charComingAfter(xSpaceOpt()) == '<') handle.makeXMLseq(r2p(start, start, curOffset), ts) } else { |