summaryrefslogtreecommitdiff
path: root/src/compiler
diff options
context:
space:
mode:
authorGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2014-12-04 16:55:50 +0100
committerGrzegorz Kossakowski <grzegorz.kossakowski@gmail.com>2014-12-04 16:55:50 +0100
commit3eddd4cc1736defe9743f31765df3d42b7f211d4 (patch)
tree73f49773be283cde7693a403784fb51b468435d1 /src/compiler
parent40547cd02aeb8bbd3682a281d8a1c5afcab782ee (diff)
parentdb8d5476537902760d33d29839afd813ff369ac8 (diff)
downloadscala-3eddd4cc1736defe9743f31765df3d42b7f211d4.tar.gz
scala-3eddd4cc1736defe9743f31765df3d42b7f211d4.tar.bz2
scala-3eddd4cc1736defe9743f31765df3d42b7f211d4.zip
Merge pull request #4185 from som-snytt/issue/9027
SI-9027 Parser no longer consumes space after multi XML elements
Diffstat (limited to 'src/compiler')
-rwxr-xr-xsrc/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala
index d3f495f280..f1517e56a0 100755
--- a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala
@@ -346,12 +346,11 @@ trait MarkupParsers {
// parse more XML ?
if (charComingAfter(xSpaceOpt()) == '<') {
- xSpaceOpt()
- while (ch == '<') {
+ do {
+ xSpaceOpt()
nextch()
ts append element
- xSpaceOpt()
- }
+ } while (charComingAfter(xSpaceOpt()) == '<')
handle.makeXMLseq(r2p(start, start, curOffset), ts)
}
else {