diff options
author | buraq <buraq@epfl.ch> | 2004-07-21 15:39:57 +0000 |
---|---|---|
committer | buraq <buraq@epfl.ch> | 2004-07-21 15:39:57 +0000 |
commit | 8df9fca4623466d37fdc3d9854e3c2394dcf01e5 (patch) | |
tree | a262880fc942d4416d80ffed91d73d1dd8506f8d | |
parent | 92ed802ce4b892e0faa00339f487bd3de62f5ce6 (diff) | |
download | scala-8df9fca4623466d37fdc3d9854e3c2394dcf01e5.tar.gz scala-8df9fca4623466d37fdc3d9854e3c2394dcf01e5.tar.bz2 scala-8df9fca4623466d37fdc3d9854e3c2394dcf01e5.zip |
fix
-rw-r--r-- | sources/scala/xml/parsing/MarkupParser.scala | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/sources/scala/xml/parsing/MarkupParser.scala b/sources/scala/xml/parsing/MarkupParser.scala index 1094e455a2..4bf7a81b2f 100644 --- a/sources/scala/xml/parsing/MarkupParser.scala +++ b/sources/scala/xml/parsing/MarkupParser.scala @@ -375,31 +375,16 @@ def element: MarkupType = { * precondition: xEmbeddedBlock == false (we are not in a scala block) */ def xText: String = { -<<<<<<< MarkupParser.scala //if( xEmbeddedBlock ) throw FatalError("internal error: encountered embedded block"); // assert -======= - if (xEmbeddedBlock) - throw FatalError("internal error: encountered embedded block"); // assert ->>>>>>> 1.4 -<<<<<<< MarkupParser.scala /*if( xCheckEmbeddedBlock ) -======= - if (xCheckEmbeddedBlock) ->>>>>>> 1.4 return "" else {*/ var exit = false; -<<<<<<< MarkupParser.scala while( !exit ) { putChar( ch ); nextch; exit = /*{ nextch; xCheckEmbeddedBlock }||*/( ch == '<' ) || ( ch == '&' ); -======= - while (!exit) { - putChar(ch); - exit = { nextch; xCheckEmbeddedBlock } || (ch == '<') || (ch == '&'); ->>>>>>> 1.4 } val str = cbuf.toString(); cbuf.setLength(0); |