1 files changed, 24 insertions, 23 deletions
diff --git a/scalatexApi/src/main/scala/torimatomeru/syntax/Basic.scala b/scalatexApi/src/main/scala/torimatomeru/syntax/Basic.scala
index 1cc9d39..69c27b8 100644
--- a/scalatexApi/src/main/scala/torimatomeru/syntax/Basic.scala
+++ b/scalatexApi/src/main/scala/torimatomeru/syntax/Basic.scala
@@ -4,32 +4,33 @@ package syntax
 import org.parboiled2._
 
 trait Basic { self: ScalaSyntax =>
+  object Basic{
+    def UnicodeExcape = rule { "\\u" ~ 4.times(HexDigit) }
 
-  def UnicodeExcape = rule { "\\u" ~ 4.times(HexDigit) }
 
+    //Numbers and digits
+    def HexDigit = rule { Digit | "a" - "f" | "A" - "Z" }
+    def Digit = rule { "0" | NonZeroDigit }
+    def NonZeroDigit = rule { "1" - "9" }
+    def HexNumeral = rule { "0x" ~ oneOrMore(HexDigit) }
+    def DecimalNumeral = rule(oneOrMore(Digit))
+    def ExponentPart = rule { anyOf("Ee") ~ optional(anyOf("+-")) ~ oneOrMore(Digit) }
+    def FloatType = rule { anyOf("FfDd") }
 
-  //Numbers and digits
-  def HexDigit = rule { Digit | "a" - "f" | "A" - "Z" }
-  def Digit = rule { "0" | NonZeroDigit }
-  def NonZeroDigit = rule { "1" - "9" }
-  def HexNumeral = rule { "0x" ~ oneOrMore(HexDigit) }
-  def DecimalNumeral = rule(oneOrMore(Digit))
-  def ExponentPart = rule { anyOf("Ee") ~ optional(anyOf("+-")) ~ oneOrMore(Digit) }
-  def FloatType = rule { anyOf("FfDd") }
+    def Parentheses = rule { "(" | ")" | "[" | "]" | "{" | "}" }
+    def DelimiterChar = rule { "'" | "\"" | "." | ";" | "," }
 
-  def Parentheses = rule { "(" | ")" | "[" | "]" | "{" | "}" }
-  def DelimiterChar = rule { "'" | "\"" | "." | ";" | "," }
-
-  def WhitespaceChar = rule { "\u0020" | "\u0009" }
-  def Newline = rule { "\r\n" | "\n" }
-  def Semi = rule { ';' | oneOrMore(NewlineS) }
-  def OperatorChar = rule {
-    anyOf("""!#$%&*+-/:<=>?@\^|~""") |
-    CharPredicate.from(_.getType match {
-      case Character.OTHER_SYMBOL | Character.MATH_SYMBOL => true; case _ => false
-    })
+    def WhitespaceChar = rule { "\u0020" | "\u0009" }
+    def Newline = rule { "\r\n" | "\n" }
+    def Semi = rule { ';' | oneOrMore(Newline) }
+    def OperatorChar = rule {
+      anyOf("""!#$%&*+-/:<=>?@\^|~""") |
+      CharPredicate.from(_.getType match {
+        case Character.OTHER_SYMBOL | Character.MATH_SYMBOL => true; case _ => false
+      })
+    }
+    def Letter = rule { Upper | Lower | CharPredicate.from(c => c.isLetter | c.isDigit) }
+    def Lower = rule { "a" - "z" | "$" | "_" | CharPredicate.from(_.isLower) }
+    def Upper = rule { "A" - "Z" | CharPredicate.from(_.isUpper) }
   }
-  def Letter = rule { Upper | Lower | CharPredicate.from(c => c.isLetter | c.isDigit) }
-  def Lower = rule { "a" - "z" | "$" | "_" | CharPredicate.from(_.isLower) }
-  def Upper = rule { "A" - "Z" | CharPredicate.from(_.isUpper) }
 }