From 857c620357775c8ee79de2c53dbdc39456332c4b Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Sun, 16 Nov 2014 15:07:53 -0800 Subject: Some part of SyntaxTest parses successfully, the match expression doesn't --- scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (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 283926e..d0a9b0e 100644 --- a/scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala +++ b/scalatexApi/src/main/scala/torimatomeru/ScalaSyntax.scala @@ -207,7 +207,7 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif def Import(G: B = true): Rule0 = rule { "import" ~ oneOrMore(ImportExpr(G)).separatedBy(',') } //ImportExpr is slightly changed wrt spec because StableId always consumes all the Ids possible, so there is no need to one at the end - def ImportExpr(G: B = true): Rule0 = rule { StableId(G) ~ optional('.' ~ ('_' | ImportSelectors(G))) } + def ImportExpr(G: B = true): Rule0 = rule { StableId(G) ~ optional('.' ~ (wspStrG("_", G) | ImportSelectors(G))) } def ImportSelectors(G: B = true): Rule0 = rule { '{' ~ zeroOrMore(ImportSelector ~ ',') ~ (ImportSelector | '_') ~ wspStrG("}", G) } def ImportSelector: Rule0 = rule { IdS() ~ optional("=>" ~ (IdS() | '_')) } @@ -250,9 +250,9 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif def ConstrBlock: Rule0 = rule { '{' ~ SelfInvocation ~ zeroOrMore(SemiS ~ BlockStat) ~ '}' } def SelfInvocation: Rule0 = rule { "this" ~ oneOrMore(ArgumentExprs()) } - def TopStatSeq: Rule0 = rule { oneOrMore(TopStat).separatedBy(SemiS) } + def TopStatSeq: Rule0 = rule { zeroOrMore(TopStat).separatedBy(SemiS) } def TopStat: Rule0 = rule { Packaging | PackageObject(false) | Import(false) | zeroOrMore(Annotation ~ optional(NewlineS)) ~ zeroOrMore(Modifier) ~ TmplDef(false) | MATCH } def Packaging: Rule0 = rule { "package" ~ QualId ~ optional(NewlineS) ~ '{' ~ TopStatSeq ~ '}' } def PackageObject(G: B = true): Rule0 = rule { "package" ~ "object" ~ ObjectDef(G) } - def CompilationUnit: Rule0 = rule { zeroOrMore("package" ~ QualId ~ SemiS) ~ TopStatSeq } + def CompilationUnit: Rule1[String] = rule { capture(zeroOrMore(SemiS) ~ zeroOrMore("package" ~ QualId).separatedBy(SemiS) ~ TopStatSeq) } } -- cgit v1.2.3