diff options
author | Li Haoyi <haoyi@dropbox.com> | 2014-11-16 18:04:29 -0800 |
---|---|---|
committer | Li Haoyi <haoyi@dropbox.com> | 2014-11-16 18:04:29 -0800 |
commit | 90963daf606ea1c0854132a3e8cbafd17a5a346a (patch) | |
tree | 61df16d68074d53e376aa3ad53ee4389f552b021 /scalatexApi/src/main/scala/scalatex/stages/Parser.scala | |
parent | ba96a85378fd7fb24cf386ced21a3427112c3610 (diff) | |
download | hands-on-scala-js-90963daf606ea1c0854132a3e8cbafd17a5a346a.tar.gz hands-on-scala-js-90963daf606ea1c0854132a3e8cbafd17a5a346a.tar.bz2 hands-on-scala-js-90963daf606ea1c0854132a3e8cbafd17a5a346a.zip |
All unit tests pass, file integration tests still seem to have crappy performance
Diffstat (limited to 'scalatexApi/src/main/scala/scalatex/stages/Parser.scala')
-rw-r--r-- | scalatexApi/src/main/scala/scalatex/stages/Parser.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scalatexApi/src/main/scala/scalatex/stages/Parser.scala b/scalatexApi/src/main/scala/scalatex/stages/Parser.scala index d143463..5db0a8e 100644 --- a/scalatexApi/src/main/scala/scalatex/stages/Parser.scala +++ b/scalatexApi/src/main/scala/scalatex/stages/Parser.scala @@ -45,7 +45,7 @@ class Parser(input: ParserInput, indent: Int = 0, offset: Int = 0) extends Scala } def HeaderBlock: Rule1[Ast.Header] = rule{ - Header ~ zeroOrMore(capture(WhiteLines) ~ Header ~> (_ + _)) ~ runSubParser{new Parser(_, indent, cursor).Body0} ~> { + Header ~ zeroOrMore(capture(WL) ~ Header ~> (_ + _)) ~ runSubParser{new Parser(_, indent, cursor).Body0} ~> { (start: String, heads: Seq[String], body: Ast.Block) => Ast.Header(start + heads.mkString, body) } } @@ -99,7 +99,7 @@ class Parser(input: ParserInput, indent: Int = 0, offset: Int = 0) extends Scala (push(offsetCursor) ~ capture(ArgumentExprs2) ~> ((x, y) => Ast.Chain.Args(y, x))) | BraceBlock } - def Ws = WhiteLines + def Ws = WL // clones of the version in ScalaSyntax, but without tailing whitespace or newlines def TypeArgs2 = rule { '[' ~ Ws ~ Types ~ ']' } def ArgumentExprs2 = rule { |