diff options
author | Li Haoyi <haoyi@dropbox.com> | 2014-11-16 18:53:21 -0800 |
---|---|---|
committer | Li Haoyi <haoyi@dropbox.com> | 2014-11-16 18:53:21 -0800 |
commit | 001bc7ed3dd1f92be14802406897e7304ac1f2de (patch) | |
tree | 092785256d15d1fb28617ef5f257630f9e6e0126 /scalatexApi/src/main/scala/torimatomeru/syntax/Identifiers.scala | |
parent | 85cf9e1849b452da681d11ead314f46ba8be9512 (diff) | |
download | hands-on-scala-js-001bc7ed3dd1f92be14802406897e7304ac1f2de.tar.gz hands-on-scala-js-001bc7ed3dd1f92be14802406897e7304ac1f2de.tar.bz2 hands-on-scala-js-001bc7ed3dd1f92be14802406897e7304ac1f2de.zip |
Bunch of moving things into namespaces, `Basic`, `Identifiers` and `Literals` don't have their guts spilling everywhere
Diffstat (limited to 'scalatexApi/src/main/scala/torimatomeru/syntax/Identifiers.scala')
-rw-r--r-- | scalatexApi/src/main/scala/torimatomeru/syntax/Identifiers.scala | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/scalatexApi/src/main/scala/torimatomeru/syntax/Identifiers.scala b/scalatexApi/src/main/scala/torimatomeru/syntax/Identifiers.scala index 9c39577..2901688 100644 --- a/scalatexApi/src/main/scala/torimatomeru/syntax/Identifiers.scala +++ b/scalatexApi/src/main/scala/torimatomeru/syntax/Identifiers.scala @@ -4,19 +4,21 @@ package syntax import org.parboiled2._ trait Identifiers { self: Parser with Basic => + object Identifiers{ + import Basic._ + def Operator = rule(oneOrMore(OperatorChar)) - def Operator = rule(oneOrMore(OperatorChar)) + 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 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 { - "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" | "_" | - ":" | ";" | "=>" | "=" | "<-" | "<:" | "<%" | ">:" | "#" | "@" | "\u21d2" | "\u2190" + def Keywords = 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" | "_" | + ":" | ";" | "=>" | "=" | "<-" | "<:" | "<%" | ">:" | "#" | "@" | "\u21d2" | "\u2190" + } } } |