summaryrefslogtreecommitdiff
path: root/scalatexApi/src/main/scala/scalatex
diff options
context:
space:
mode:
authorLi Haoyi <haoyi@dropbox.com>2014-11-16 14:41:47 -0800
committerLi Haoyi <haoyi@dropbox.com>2014-11-16 14:41:47 -0800
commite59178f01ea9944173654ba62f5ecc7852dc7597 (patch)
tree509e48c454dd816f4155624467a1b12a369202c8 /scalatexApi/src/main/scala/scalatex
parent04a1483c131da376a085c63fc02954f21d3d7a1b (diff)
downloadhands-on-scala-js-e59178f01ea9944173654ba62f5ecc7852dc7597.tar.gz
hands-on-scala-js-e59178f01ea9944173654ba62f5ecc7852dc7597.tar.bz2
hands-on-scala-js-e59178f01ea9944173654ba62f5ecc7852dc7597.zip
Something works...
Diffstat (limited to 'scalatexApi/src/main/scala/scalatex')
-rw-r--r--scalatexApi/src/main/scala/scalatex/stages/Parser.scala4
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 8647264..9693544 100644
--- a/scalatexApi/src/main/scala/scalatex/stages/Parser.scala
+++ b/scalatexApi/src/main/scala/scalatex/stages/Parser.scala
@@ -41,11 +41,11 @@ class Parser(input: ParserInput, indent: Int = 0, offset: Int = 0) extends Scala
"@" ~ capture(Id | BlockExpr2 | ('(' ~ optional(Exprs) ~ ')'))
}
def Header = rule {
- "@" ~ capture(Def(false) | Import)
+ "@" ~ capture(Def(false) | Import(false))
}
def HeaderBlock: Rule1[Ast.Header] = rule{
- Header ~ zeroOrMore(capture(NewlineS) ~ Header ~> (_ + _)) ~ runSubParser{new Parser(_, indent, cursor).Body0} ~> {
+ Header ~ zeroOrMore(capture(WhiteLines) ~ Header ~> (_ + _)) ~ runSubParser{new Parser(_, indent, cursor).Body0} ~> {
(start: String, heads: Seq[String], body: Ast.Block) => Ast.Header(start + heads.mkString, body)
}
}