summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Haoyi <haoyi@dropbox.com>2014-11-16 20:31:46 -0800
committerLi Haoyi <haoyi@dropbox.com>2014-11-16 20:31:46 -0800
commit5a15a2b9a46e1fe86651d16a512ed96f5d5309e9 (patch)
tree7658e4acc58096f5ffc6bbb6d2c10e4d68290779
parent1f44f2197edb0864981a81eb9ea9137970cc7551 (diff)
downloadhands-on-scala-js-5a15a2b9a46e1fe86651d16a512ed96f5d5309e9.tar.gz
hands-on-scala-js-5a15a2b9a46e1fe86651d16a512ed96f5d5309e9.tar.bz2
hands-on-scala-js-5a15a2b9a46e1fe86651d16a512ed96f5d5309e9.zip
Seems to have sped it up, so the minimal slow-parse is now fast, but ParserTests.scala still hangs
-rw-r--r--scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala2
1 files changed, 1 insertions, 1 deletions
diff --git a/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala b/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala
index 029ed22..71e87bd 100644
--- a/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala
+++ b/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala
@@ -167,7 +167,7 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif
def Exprs: R0 = rule { oneOrMore(Expr()).separatedBy(',') }
def ArgumentExprs(G: B = t): R0 = rule {
- '(' ~ (optional(Exprs ~ ',') ~ PostfixExpr() ~ ':' ~ '_' ~ '*' | optional(Exprs)) ~ StrW(")", G) |
+ '(' ~ optional(Exprs ~ optional(':' ~ '_' ~ '*')) ~ StrW(")", G) |
optional(Newline) ~ BlockExpr(G)
}