From 07ba9a439901432f29960debcd3492183d51466d Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 17 Nov 2014 02:53:31 -0800 Subject: Made sure `true` `false` and the various keywords check to make sure they aren't part of a larger identifier --- scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala | 13 ++++++++++--- .../src/main/scala/scalaparser/syntax/Identifiers.scala | 14 +++++++++++--- .../src/main/scala/scalaparser/syntax/Literals.scala | 2 +- scalatexApi/src/test/scala/scalaparser/SyntaxTest.scala | 7 +++++++ .../src/main/scala/scalatex/ScalaTexPlugin.scala | 1 - 5 files changed, 29 insertions(+), 8 deletions(-) diff --git a/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala b/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala index cfd2a77..cd8bbd1 100644 --- a/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala +++ b/scalatexApi/src/main/scala/scalaparser/ScalaSyntax.scala @@ -40,6 +40,8 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif */ def WL = rule{ zeroOrMore(Basic.WhitespaceChar | Literals.Comment | Basic.Newline) } + def Gap = rule{ oneOrMore(Basic.WhitespaceChar | Literals.Comment | Basic.Newline) } + /** * Whitespace which captures or doesn't-capture * newlines depending on the G that gets passed in @@ -156,7 +158,12 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif } def DoWhileCFlow(G: B = t) = rule { "do" ~ Expr() ~ optional(Semi) ~ "while" ~ '(' ~ Expr() ~ StrW(")", G) } - def ForCFlow(G: B = t) = rule { "for" ~ ('(' ~ Enumerators ~ ')' | '{' ~ Enumerators ~ '}') ~ zeroOrMore(Newline) ~ optional("yield") ~ Expr(G) } + def ForCFlow(G: B = t) = rule { + "for" ~ + ('(' ~ Enumerators ~ ')' | '{' ~ Enumerators ~ '}') ~ + zeroOrMore(Newline) ~ + optional("yield") ~ + Expr(G) } def PostfixExpr(G: B = t): R0 = rule { InfixExpr(G) ~ optional(Id() ~ optional(Newline)) } def InfixExpr(G: B = t): R0 = rule { PrefixExpr(G) ~ zeroOrMore(Id() ~ optional(Newline) ~ PrefixExpr(G)) } def PrefixExpr(G: B = t) = rule { optional(anyOf("-+~!")) ~ SimpleExpr(G) } @@ -207,7 +214,7 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif oneOrMore(Pattern1).separatedBy('|') } def Pattern1: R0 = rule { - '_' ~ TypeColon ~ TypePat |VarId() ~ TypeColon ~ TypePat | Pattern2 + '_' ~ TypeColon ~ TypePat | VarId() ~ TypeColon ~ TypePat | Pattern2 } def Pattern2: R0 = rule { VarId() ~ "@" ~ Pattern3 | Pattern3 | VarId() @@ -215,7 +222,7 @@ class ScalaSyntax(val input: ParserInput) extends Parser with Basic with Identif def Pattern3: R0 = rule { SimplePattern ~ zeroOrMore(Id() ~ SimplePattern) } - def SimplePattern: R0 = rule { + def SimplePattern: R0 = rule { '_' | Literal() ~ drop[String] | '(' ~ optional(Patterns) ~ ')' | diff --git a/scalatexApi/src/main/scala/scalaparser/syntax/Identifiers.scala b/scalatexApi/src/main/scala/scalaparser/syntax/Identifiers.scala index e985f92..e5d3934 100644 --- a/scalatexApi/src/main/scala/scalaparser/syntax/Identifiers.scala +++ b/scalatexApi/src/main/scala/scalaparser/syntax/Identifiers.scala @@ -8,17 +8,25 @@ trait Identifiers { self: Parser with Basic => import Basic._ def Operator = rule(oneOrMore(OperatorChar)) - def VarId = rule { !(Keywords ~ (WhitespaceChar | Newline | "//" | "/*")) ~ Lower ~ IdRest } + def VarId = rule { + !(Keywords ~ (WhitespaceChar | Newline | "//" | "/*")) ~ Lower ~ IdRest + } def PlainId = rule { Upper ~ IdRest | VarId | !(Keywords ~ (WhitespaceChar | Newline | "//" | "/*")) ~ Operator } def Id = rule { PlainId | ("`" ~ oneOrMore(noneOf("`")) ~ "`") } def IdRest = rule { zeroOrMore(Letter | Digit) ~ optional("_" ~ Operator) } - def Keywords = rule { + def AlphabetKeywords = rule { "abstract" | "case" | "catch" | "class" | "def" | "do" | "else" | "extends" | "false" | "finally" | "final" | "finally" | "forSome" | "for" | "if" | "implicit" | "import" | "lazy" | "match" | "new" | "null" | "object" | "override" | "package" | "private" | "protected" | "return" | - "sealed" | "super" | "this" | "throw" | "trait" | "try" | "true" | "type" | "val" | "var" | "while" | "with" | "yield" | "_" | + "sealed" | "super" | "this" | "throw" | "trait" | "try" | "true" | "type" | "val" | "var" | "while" | "with" | "yield" | "_" + } + def SymbolicKeywords = rule{ ":" | ";" | "=>" | "=" | "<-" | "<:" | "<%" | ">:" | "#" | "@" | "\u21d2" | "\u2190" } + def Keywords = rule { + AlphabetKeywords ~ !Letter | SymbolicKeywords ~ !OperatorChar + + } } } diff --git a/scalatexApi/src/main/scala/scalaparser/syntax/Literals.scala b/scalatexApi/src/main/scala/scalaparser/syntax/Literals.scala index 80d7db7..2289d9c 100644 --- a/scalatexApi/src/main/scala/scalaparser/syntax/Literals.scala +++ b/scalatexApi/src/main/scala/scalaparser/syntax/Literals.scala @@ -17,7 +17,7 @@ trait Literals { self: Parser with Basic with Identifiers => def IntegerLiteral = rule { capture((DecimalNumeral | HexNumeral) ~ optional(anyOf("Ll"))) } - def BooleanLiteral = rule { capture("true" | "false") } + def BooleanLiteral = rule { capture("true" | "false") ~ !Letter } def MultilineComment: Rule0 = rule { "/*" ~ zeroOrMore(MultilineComment | !"*/" ~ ANY) ~ "*/" } def Comment: Rule0 = rule { diff --git a/scalatexApi/src/test/scala/scalaparser/SyntaxTest.scala b/scalatexApi/src/test/scala/scalaparser/SyntaxTest.scala index 1f3bf02..6fdb128 100644 --- a/scalatexApi/src/test/scala/scalaparser/SyntaxTest.scala +++ b/scalatexApi/src/test/scala/scalaparser/SyntaxTest.scala @@ -322,6 +322,13 @@ object SyntaxTest extends TestSuite{ |} """.stripMargin ) + * - check( + """ + |object K{ + | val trueA = 1 + |} + """.stripMargin + ) } def checkFile(path: String) = check(io.Source.fromFile(path).mkString) 'file{ diff --git a/scalatexPlugin/src/main/scala/scalatex/ScalaTexPlugin.scala b/scalatexPlugin/src/main/scala/scalatex/ScalaTexPlugin.scala index 4dfc842..ceb7ac9 100755 --- a/scalatexPlugin/src/main/scala/scalatex/ScalaTexPlugin.scala +++ b/scalatexPlugin/src/main/scala/scalatex/ScalaTexPlugin.scala @@ -25,7 +25,6 @@ class ScalaTexPlugin(val global: Global) extends Plugin { override def newPhase(prev: Phase) = new GlobalPhase(prev) { override def run() = { def recursiveListFiles(f: java.io.File): Array[java.io.File] = { - val these = f.listFiles val (dirs, files) = f.listFiles().partition(_.isDirectory) files ++ dirs.flatMap(recursiveListFiles) } -- cgit v1.2.3