More refactorings to standardize identifier/keyword "make sure it can't continue" behavior"

1 files changed, 13 insertions, 15 deletions

diff --git a/scalaParser/src/main/scala/scalaParser/syntax/Identifiers.scala b/scalaParser/src/main/scala/scalaParser/syntax/Identifiers.scala
index 78fdba4..dc12e46 100644
--- a/scalaParser/src/main/scala/scalaParser/syntax/Identifiers.scala
+++ b/scalaParser/src/main/scala/scalaParser/syntax/Identifiers.scala
@@ -6,17 +6,11 @@ import org.parboiled2._
 trait Identifiers { self: Parser with Basic =>
   object Identifiers{
     import Basic._
-    def Operator = rule(oneOrMore(OperatorChar))
+    def Operator = rule{!Keywords ~ oneOrMore(OperatorChar)}
 
-    def VarId = rule {
-      !(Keywords | WhitespaceChar | Newline | "//" | "/*") ~ Lower ~ IdRest
-    }
-    def PlainId = rule {
-      Upper ~ IdRest |
-      VarId |
-      !(Keywords | WhitespaceChar | Newline | "//" | "/*") ~ !Keywords ~ Operator
-    }
-    def Id = rule { PlainId | ("`" ~ oneOrMore(noneOf("`")) ~ "`") }
+    def VarId = rule { !Keywords ~ Lower ~ IdRest }
+    def PlainId = rule { !Keywords ~ Upper ~ IdRest | VarId | Operator }
+    def Id = rule { !Keywords ~ PlainId | ("`" ~ oneOrMore(noneOf("`")) ~ "`") }
     def IdRest = rule {
       zeroOrMore(zeroOrMore("_") ~ oneOrMore(!"_" ~ Letter | Digit)) ~
       optional(oneOrMore("_") ~ optional(Operator))
@@ -24,15 +18,19 @@ trait Identifiers { self: Parser with Basic =>
 
 
     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" | "_"
+      (
+        "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" | "_"
+      ) ~ !Letter
     }
     def SymbolicKeywords = rule{
-      ":" | ";" | "=>" | "=" | "<-" | "<:" | "<%" | ">:" | "#" | "@" | "\u21d2" | "\u2190"
+      (
+        ":" | ";" | "=>" | "=" | "<-" | "<:" | "<%" | ">:" | "#" | "@" | "\u21d2" | "\u2190"
+      )  ~ !OperatorChar
     }
     def Keywords = rule {
-      AlphabetKeywords ~ !Letter | SymbolicKeywords ~ !OperatorChar
+      AlphabetKeywords | SymbolicKeywords
 
     }
   }