summaryrefslogtreecommitdiff
path: root/scalatexApi/src/main/scala/scalaparser
diff options
context:
space:
mode:
authorLi Haoyi <haoyi@dropbox.com>2014-11-16 19:36:20 -0800
committerLi Haoyi <haoyi@dropbox.com>2014-11-16 19:36:20 -0800
commit9b15aa91bd6d75e492c3872f7d6efe1dba25030b (patch)
treed533b92653dfcc0229aa1403c47ff434cf203cbc /scalatexApi/src/main/scala/scalaparser
parent498585ce96837f815233be946902e8fd4802f9c9 (diff)
downloadhands-on-scala-js-9b15aa91bd6d75e492c3872f7d6efe1dba25030b.tar.gz
hands-on-scala-js-9b15aa91bd6d75e492c3872f7d6efe1dba25030b.tar.bz2
hands-on-scala-js-9b15aa91bd6d75e492c3872f7d6efe1dba25030b.zip
opened up two more file-tests
Diffstat (limited to 'scalatexApi/src/main/scala/scalaparser')
-rw-r--r--scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala b/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala
index 0e183a1..029ed22 100644
--- a/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala
+++ b/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala
@@ -119,7 +119,7 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif
def Refinement = rule { optional(Newline) ~ '{' ~ oneOrMore(RefineStat).separatedBy(Semi) ~ '}' }
def RefineStat = rule { "type" ~ TypeDef | Dcl | MATCH }
def TypePat = rule { Type }
- def Ascription = rule { ":" ~ (InfixType | oneOrMore(Annotation) | "_" ~ "*") }
+ def Ascription(G: B = t) = rule { ":" ~ (InfixType | oneOrMore(Annotation) | "_" ~ StrW("*", G)) }
def ParamType = rule { "=>" ~ Type | Type ~ "*" | Type }
@@ -134,7 +134,7 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif
"return" ~ optional(Expr(G)) |
SimpleExpr() ~ ArgumentExprs() ~ '=' ~ Expr(G) |
optional(SimpleExpr() ~ '.') ~ Id() ~ '=' ~ Expr(G) |
- PostfixExpr(G) ~ optional("match" ~ '{' ~ CaseClauses ~ '}' | Ascription)
+ PostfixExpr(false) ~ optional("match" ~ '{' ~ CaseClauses ~ StrW("}", false) | Ascription(false)) ~ W(G)
}
def IfCFlow(G: B = t) = rule { "if" ~ '(' ~ Expr() ~ ')' ~ zeroOrMore(Newline) ~ Expr(G) ~ optional(optional(Semi) ~ "else" ~ Expr(G)) }