diff options
| author | Li Haoyi <haoyi@dropbox.com> | 2014-11-04 00:03:13 -0800 |
|---|---|---|
| committer | Li Haoyi <haoyi@dropbox.com> | 2014-11-04 00:03:13 -0800 |
| commit | 84d025280986302c0435a5910a6a3c9c34d8fc8c (patch) | |
| tree | f194b1c44f7b48ecfc3a7252edf256a7da041f26 /scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala | |
| parent | 9d9cd46a6ccc5bbe8b22dc38f615b532e526774c (diff) | |
| download | hands-on-scala-js-84d025280986302c0435a5910a6a3c9c34d8fc8c.tar.gz hands-on-scala-js-84d025280986302c0435a5910a6a3c9c34d8fc8c.tar.bz2 hands-on-scala-js-84d025280986302c0435a5910a6a3c9c34d8fc8c.zip | |
Inline definition-statements now work and are tested.
Diffstat (limited to 'scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala')
| -rw-r--r-- | scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala b/scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala index 5bbd0af..bf0e0e2 100644 --- a/scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala +++ b/scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala @@ -166,7 +166,7 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif def Params: Rule0 = rule { zeroOrMore(Param).separatedBy(',') } def Param: Rule0 = rule { zeroOrMore(Annotation) ~ IdS ~ optional(':' ~ ParamType) ~ optional('=' ~ Expr) } def ClassParamClauses: Rule0 = rule { zeroOrMore(ClassParamClause) ~ optional(optional(NewlineS) ~ '(' ~ "implicit" ~ ClassParam ~ ')') } - def ClassParamClause: Rule0 = rule { optional(NewlineS) ~ '(' ~ optional(ClassParam) ~ ')' } + def ClassParamClause: Rule0 = rule { optional(NewlineS) ~ '(' ~ optional(ClassParams) ~ ')' } def ClassParams: Rule0 = rule { oneOrMore(ClassParam).separatedBy(',') } def ClassParam: Rule0 = rule { zeroOrMore(Annotation) ~ optional(zeroOrMore(Modifier) ~ ("val" | "var")) ~ IdS ~ ":" ~ ParamType ~ optional("=" ~ Expr) } |