--- a/src/Pure/Tools/bibtex.scala Sat Jan 07 19:36:40 2017 +0100
+++ b/src/Pure/Tools/bibtex.scala Sat Jan 07 20:01:05 2017 +0100
@@ -8,8 +8,8 @@
import scala.collection.mutable
-import scala.util.parsing.input.{Reader, CharSequenceReader}
import scala.util.parsing.combinator.RegexParsers
+import scala.util.parsing.input.Reader
object Bibtex
@@ -383,17 +383,14 @@
/* parse */
def parse(input: CharSequence): List[Chunk] =
- {
- val in: Reader[Char] = new CharSequenceReader(input)
- Parsers.parseAll(Parsers.rep(Parsers.chunk), in) match {
+ Parsers.parseAll(Parsers.rep(Parsers.chunk), Scan.char_reader(input)) match {
case Parsers.Success(result, _) => result
case _ => error("Unexpected failure to parse input:\n" + input.toString)
}
- }
def parse_line(input: CharSequence, context: Line_Context): (List[Chunk], Line_Context) =
{
- var in: Reader[Char] = new CharSequenceReader(input)
+ var in: Reader[Char] = Scan.char_reader(input)
val chunks = new mutable.ListBuffer[Chunk]
var ctxt = context
while (!in.atEnd) {