From 7bca4e8954f2196e5a20556567539f97c539df37 Mon Sep 17 00:00:00 2001 From: bu Date: Wed, 28 Mar 2018 13:57:25 +0200 Subject: [PATCH] stand der diskussion --- converter.scala | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/converter.scala b/converter.scala index 2aae588..51184f4 100644 --- a/converter.scala +++ b/converter.scala @@ -193,14 +193,13 @@ import scala.util.parsing.input.{NoPosition, Position, Reader} object LaTeXParser extends Parsers { override type Elem = LaTeXToken -class LaTeXTokenReader(tokens: Seq[LaTeXToken]) extends Reader[Seq[LaTeXToken]] { - override def first: Seq[LaTeXToken] = tokens.head::Nil +class LaTeXTokenReader(tokens: Seq[LaTeXToken]) extends Reader[LaTeXToken] { + override def first: LaTeXToken = tokens.head override def atEnd: Boolean = tokens.isEmpty override def pos: Position = NoPosition - override def rest: Reader[Seq[LaTeXToken]] = new LaTeXTokenReader(tokens.tail) + override def rest: Reader[LaTeXToken] = new LaTeXTokenReader(tokens.tail) } - def apply(tokens: Seq[LaTeXToken]): Either[LaTeXParserError, Seq[LaTeXToken]] = { val reader = new LaTeXTokenReader(tokens) parse_latex(reader) match { @@ -211,11 +210,17 @@ def apply(tokens: Seq[LaTeXToken]): Either[LaTeXParserError, Seq[LaTeXToken]] = } } +def parse_latex(r: Reader[LaTeXToken]) : Parser[Seq[LaTeXToken]] = Success(Nil, Nil) + +} + +} def parse_latex: Parser[Seq[LaTeXToken]] = positioned { phrase(sections) } + def sections: Parser[Seq[LaTeXToken]] = positioned { rep1(section) ^^ { case stmtList => stmtList.flatten } }