summaryrefslogtreecommitdiff
path: root/scalatexApi/src/main/scala
diff options
context:
space:
mode:
Diffstat (limited to 'scalatexApi/src/main/scala')
-rw-r--r--scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala7
-rw-r--r--scalatexApi/src/main/scala/scalaparser/syntax/Literals.scala1
2 files changed, 2 insertions, 6 deletions
diff --git a/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala b/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala
index 264c79c..b7501a1 100644
--- a/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala
+++ b/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala
@@ -130,14 +130,9 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif
ForCFlow(G) |
"throw" ~ Expr(G) |
"return" ~ optional(Expr(G)) |
- NaiveAssignment(G) |
- SimpleExpr() ~ (
- ArgumentExprs() ~ '=' ~ Expr(G) |
- '.' ~ NaiveAssignment(G)
- ) |
+ SimpleExpr() ~ '=' ~ Expr(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 8aaf664..6e8c79d 100644
--- a/scalatexApi/src/main/scala/scalaparser/syntax/Literals.scala
+++ b/scalatexApi/src/main/scala/scalaparser/syntax/Literals.scala
@@ -37,6 +37,7 @@ trait Literals { self: Parser with Basic with Identifiers =>
def EscapedChars = rule { '\\' ~ anyOf("rnt\\\"") }
+ // Note that symbols can take on the same values as keywords!
def SymbolLiteral = rule { ''' ~ capture(Identifiers.PlainId | Identifiers.Keywords) }
def CharacterLiteral = rule { ''' ~ capture(UnicodeExcape | EscapedChars | !'\\' ~ CharPredicate.from(isPrintableChar)) ~ ''' }