From 84d025280986302c0435a5910a6a3c9c34d8fc8c Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Tue, 4 Nov 2014 00:03:13 -0800 Subject: Inline definition-statements now work and are tested. --- scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala') 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) } -- cgit v1.2.3