diff options
| author | Li Haoyi <haoyi@dropbox.com> | 2014-11-16 14:51:12 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi@dropbox.com> | 2014-11-16 14:51:12 -0800 |
| commit | 37adfa72f2658b0859a61f09cae5d400efec123e (patch) | |
| tree | c88b4183199b47343a5bb952c2e1d16e7859dbdc /scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala | |
| parent | e59178f01ea9944173654ba62f5ecc7852dc7597 (diff) | |
| download | hands-on-scala-js-37adfa72f2658b0859a61f09cae5d400efec123e.tar.gz hands-on-scala-js-37adfa72f2658b0859a61f09cae5d400efec123e.tar.bz2 hands-on-scala-js-37adfa72f2658b0859a61f09cae5d400efec123e.zip | |
All tests pass???
Diffstat (limited to 'scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala')
| -rw-r--r-- | scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala b/scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala index be3b076..283926e 100644 --- a/scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala +++ b/scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala @@ -129,7 +129,7 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif def SimpleExpr1(G: B = true) = rule{ "new" ~ (ClassTemplate(G) | TemplateBody(G)) | BlockExpr(G) | - LiteralS() ~ drop[String] | + LiteralS(G) ~ drop[String] | Path(G) | '_' | '(' ~ optional(Exprs) ~ wspStrG(")", G) @@ -144,7 +144,7 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif def BlockExpr(G: B = true): Rule0 = rule { '{' ~ (CaseClauses | Block) ~ wspStrG("}", G) } def Block: Rule0 = rule { zeroOrMore(BlockStat ~ SemiS) ~ optional(ResultExpr()) } def BlockStat: Rule0 = rule { - &(SemiS) ~ MATCH | //shortcircuit when Semi is found + SemiS | Import(false) | zeroOrMore(Annotation) ~ (optional("implicit" | "lazy") ~ Def(false) | zeroOrMore(LocalModifier) ~ TmplDef(false)) | Expr1(false) |