diff options
author | Li Haoyi <haoyi@dropbox.com> | 2014-11-16 21:27:45 -0800 |
---|---|---|
committer | Li Haoyi <haoyi@dropbox.com> | 2014-11-16 21:27:45 -0800 |
commit | e4c385c0f0a5c2adf1ad9a8ed3be663d67918997 (patch) | |
tree | eac2a09badd3c4a556253a13191237de0f6591bc /scalatexApi/src/main/scala | |
parent | 79fa15b304d36f24fa9dd9c9d9552a6c598c5739 (diff) | |
download | hands-on-scala-js-e4c385c0f0a5c2adf1ad9a8ed3be663d67918997.tar.gz hands-on-scala-js-e4c385c0f0a5c2adf1ad9a8ed3be663d67918997.tar.bz2 hands-on-scala-js-e4c385c0f0a5c2adf1ad9a8ed3be663d67918997.zip |
The parser has reached meta-circularity~!
Diffstat (limited to 'scalatexApi/src/main/scala')
-rw-r--r-- | scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala | 9 | ||||
-rw-r--r-- | scalatexApi/src/main/scala/scalaparser/syntax/Literals.scala | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala b/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala index 989e6d9..264c79c 100644 --- a/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala +++ b/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala @@ -130,11 +130,14 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif ForCFlow(G) | "throw" ~ Expr(G) | "return" ~ optional(Expr(G)) | - SimpleExpr() ~ ArgumentExprs() ~ '=' ~ Expr(G) | - optional(SimpleExpr() ~ '.') ~ Id() ~ '=' ~ Expr(G) | + NaiveAssignment(G) | + SimpleExpr() ~ ( + ArgumentExprs() ~ '=' ~ Expr(G) | + '.' ~ NaiveAssignment(G) + ) | PostfixExpr(false) ~ optional("match" ~ '{' ~ CaseClauses ~ StrW("}", false) | Ascription(false)) ~ W(G) } - + def NaiveAssignment(G: B = t) = rule{ Id() ~ '=' ~ Expr(G) } def IfCFlow(G: B = t) = rule { "if" ~ '(' ~ Expr() ~ ')' ~ zeroOrMore(Newline) ~ Expr(G) ~ optional(optional(Semi) ~ "else" ~ Expr(G)) } def WhileCFlow(G: B = t) = rule { "while" ~ '(' ~ Expr() ~ ')' ~ zeroOrMore(Newline) ~ Expr(G) } def TryCFlow(G: B = t) = rule { "try" ~ '{' ~ Block ~ StrW("}", G) ~ optional("catch" ~ '{' ~ CaseClauses ~ StrW("}", G)) ~ optional("finally" ~ Expr(G)) } diff --git a/scalatexApi/src/main/scala/scalaparser/syntax/Literals.scala b/scalatexApi/src/main/scala/scalaparser/syntax/Literals.scala index 11eb943..8aaf664 100644 --- a/scalatexApi/src/main/scala/scalaparser/syntax/Literals.scala +++ b/scalatexApi/src/main/scala/scalaparser/syntax/Literals.scala @@ -37,7 +37,7 @@ trait Literals { self: Parser with Basic with Identifiers => def EscapedChars = rule { '\\' ~ anyOf("rnt\\\"") } - def SymbolLiteral = rule { ''' ~ capture(Identifiers.PlainId) } + def SymbolLiteral = rule { ''' ~ capture(Identifiers.PlainId | Identifiers.Keywords) } def CharacterLiteral = rule { ''' ~ capture(UnicodeExcape | EscapedChars | !'\\' ~ CharPredicate.from(isPrintableChar)) ~ ''' } |