rgviz 0.4 → 0.5

data/lib/rgviz/nodes.rb

@@ -107,8 +107,8 @@ module Rgviz
 
   class Sort
 
-    Asc = :asc
-    Desc = :desc
+    Asc = Token::Asc
+    Desc = Token::Desc
 
     attr_accessor :column
     attr_accessor :order
@@ -214,19 +214,19 @@ module Rgviz
   end
 
   class BinaryExpression
-    And = :and
-    Contains = :contains
-    EndsWith = :ends_with
-    Eq = :EQ
-    Gt = :GT
-    Gte = :GTE
-    Like = :like
-    Lt = :LT
-    Lte = :LTE
-    Matches = :matches
-    Neq = :NEQ
-    Or = :or
-    StartsWith = :starts_with
+    And = Token::And
+    Contains = Token::Contains
+    EndsWith = :'ends with'
+    Eq = Token::EQ
+    Gt = Token::GT
+    Gte = Token::GTE
+    Like = Token::Like
+    Lt = Token::LT
+    Lte = Token::LTE
+    Matches = Token::Matches
+    Neq = Token::NEQ
+    Or = Token::Or
+    StartsWith = :'starts with'
 
     attr_accessor :operator
     attr_accessor :left
@@ -252,9 +252,9 @@ module Rgviz
   end
 
   class UnaryExpression
-    Not = :not
-    IsNull = :is_null
-    IsNotNull = :is_not_null
+    Not = Token::Not
+    IsNull = :'is null'
+    IsNotNull = :'is not null'
     
     attr_accessor :operand
     attr_accessor :operator
@@ -357,24 +357,24 @@ module Rgviz
 
   class ScalarFunctionColumn
 
-    DateDiff = :datediff
-    Day = :day
-    DayOfWeek = :dayofweek
+    DateDiff = Token::DateDiff
+    Day = Token::Day
+    DayOfWeek = Token::DayOfWeek
     Difference = :difference
-    Hour = :hour
-    Lower = :lower
-    Millisecond = :millisecond
-    Minute = :minute
-    Month = :month
-    Now = :now
+    Hour = Token::Hour
+    Lower = Token::Lower
+    Millisecond = Token::Millisecond
+    Minute = Token::Minute
+    Month = Token::Month
+    Now = Token::Now
     Product = :product
-    Quarter = :quarter
+    Quarter = Token::Quarter
     Quotient = :quotient
-    Second = :second
+    Second = Token::Second
     Sum = :sum
-    ToDate = :todate
-    Upper = :upper
-    Year = :year
+    ToDate = Token::ToDate
+    Upper = Token::Upper
+    Year = Token::Year
 
     attr_accessor :function
     attr_accessor :arguments
@@ -409,11 +409,11 @@ module Rgviz
 
   class AggregateColumn
 
-    Avg = :avg
-    Count = :count
-    Max = :max
-    Min = :min
-    Sum = :sum
+    Avg = Token::Avg
+    Count = Token::Count
+    Max = Token::Max
+    Min = Token::Min
+    Sum = Token::Sum
 
     attr_accessor :function
     attr_accessor :argument

data/lib/rgviz/parser.rb

@@ -239,7 +239,7 @@ module Rgviz
           raise ParseException.new "Expecting right exp" unless right
           return BinaryExpression.new left, operator, right
         when Token::Starts, Token::Ends
-          operator = "#{@token.value}_with".to_sym
+          operator = "#{@token.value} with".to_sym
           next_token
           check! Token::With
           right = parse_column

data/lib/rgviz/token.rb

@@ -58,22 +58,22 @@ module Rgviz
     DECIMAL = :DECIMAL
     STRING = :STRING
     
-    PLUS = :PLUS
-    MINUS = :MINUS
-    STAR = :STAR
-    SLASH = :SLASH
+    PLUS = :'+'
+    MINUS = :'-'
+    STAR = :'*'
+    SLASH = :'/'
     
-    COMMA = :COMMA
-    LPAREN = :LPAREN
-    RPAREN = :RPAREN
-    EQ = :EQ
-    LT = :LT
-    LTE = :LTE
-    GT = :GT
-    GTE = :GTE
-    NEQ = :NEQ
+    COMMA = :','
+    LPAREN = :'('
+    RPAREN = :')'
+    EQ = :'='
+    LT = :'<'
+    LTE = :'<='
+    GT = :'>'
+    GTE = :'>='
+    NEQ = :'!='
     
-    EOF = :EOF
+    EOF = :'<EOF'
     
     attr_accessor :start
     attr_accessor :value

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: false
   segments: 
   - 0
-  - 4
-  version: "0.4"
+  - 5
+  version: "0.5"
 platform: ruby
 authors: 
 - Ary Borenszweig