rgviz 0.31 → 0.32

data/lib/rgviz/lexer.rb

@@ -1,7 +1,7 @@
 module Rgviz
   class Lexer
     def initialize(str)
-      @str = (str || '').chars.to_a
+      @str = (str || '').scan(/./)
       @len = @str.length
       @token = Token.new
       @p = 0
@@ -23,7 +23,7 @@ module Rgviz
           ending = c
           while c! != ending && c != nil
           end
-          raise ParseException.new "Unmatched #{char}" if c != ending
+          raise ParseException.new("Unmatched #{char}") if c != ending
           @p += 1
           @token.value = ending == '`' ? Token::ID : Token::STRING
           @token.string = @str[@token.start + 1 ... @p - 1].join
@@ -62,16 +62,16 @@ module Rgviz
           @token.value = Token::DECIMAL
           @token.number = @str[@token.start ... @p].join.to_f
           return @token
-        when '+'; return keyword! Token::PLUS
-        when '-'; return keyword! Token::MINUS
-        when '*'; return keyword! Token::STAR
-        when '/'; return keyword! Token::SLASH
-        when ','; return keyword! Token::COMMA
-        when '('; return keyword! Token::LPAREN
-        when ')'; return keyword! Token::RPAREN
-        when '='; return keyword! Token::EQ
+        when '+'; return keyword!(Token::PLUS)
+        when '-'; return keyword!(Token::MINUS)
+        when '*'; return keyword!(Token::STAR)
+        when '/'; return keyword!(Token::SLASH)
+        when ','; return keyword!(Token::COMMA)
+        when '('; return keyword!(Token::LPAREN)
+        when ')'; return keyword!(Token::RPAREN)
+        when '='; return keyword!(Token::EQ)
         when '!';
-          raise ParseException.new "Unexpected character '!'" if c! != '='
+          raise ParseException.new("Unexpected character '!'") if c! != '='
           return keyword! Token::NEQ
         when '<';
           case c!
@@ -99,20 +99,20 @@ module Rgviz
           case c!
           when 'n', 'N'
             case c! when 'd', 'D'
-              return keyword Token::And if end_of_identifier!
+              return keyword(Token::And) if end_of_identifier!
             end
           when 's', 'S'
             case c! when 'c', 'C'
-              return keyword Token::Asc if end_of_identifier!
+              return keyword(Token::Asc) if end_of_identifier!
             end
           when 'v', 'V'
             case c! when 'g', 'G'
-              return keyword Token::Avg if end_of_identifier!
+              return keyword(Token::Avg) if end_of_identifier!
             end
           end
         when 'b', 'B'
           case c! when 'y', 'Y'
-            return keyword Token::By if end_of_identifier!
+            return keyword(Token::By) if end_of_identifier!
           end
         when 'c', 'C'
           case c! when 'o', 'O'
@@ -123,7 +123,7 @@ module Rgviz
                   case c! when 'i', 'I'
                     case c! when 'n', 'N'
                       case c! when 's', 'S'
-                        return keyword Token::Contains if end_of_identifier!
+                        return keyword(Token::Contains) if end_of_identifier!
                       end
                     end
                   end
@@ -132,7 +132,7 @@ module Rgviz
             when 'u', 'U'
               case c! when 'n', 'N'
                 case c! when 't', 'T'
-                  return keyword Token::Count if end_of_identifier!
+                  return keyword(Token::Count) if end_of_identifier!
                 end
               end
             end
@@ -143,13 +143,13 @@ module Rgviz
             case c! 
             when 't', 'T'
               case c! when 'e', 'E'
-                return keyword Token::Date if end_of_identifier!
+                return keyword(Token::Date) if end_of_identifier!
                 case c
                 when 'd', 'D'
                   case c! when 'i', 'I'
                     case c! when 'f', 'F'
                       case c! when 'f', 'F'
-                        return keyword Token::DateDiff if end_of_identifier!
+                        return keyword(Token::DateDiff) if end_of_identifier!
                       end
                     end
                   end
@@ -157,21 +157,21 @@ module Rgviz
                   case c! when 'i', 'I'
                     case c! when 'm', 'M'
                       case c! when 'e', 'E'
-                        return keyword Token::DateTime if end_of_identifier!
+                        return keyword(Token::DateTime) if end_of_identifier!
                       end
                     end
                   end
                 end
               end
             when 'y', 'Y'
-              return keyword Token::Day if end_of_identifier!
+              return keyword(Token::Day) if end_of_identifier!
               case c when 'o', 'O'
                 case c! when 'f', 'F'
                   case c! when 'w', 'W'
                     case c! when 'e', 'E'
                       case c! when 'e', 'E'
                         case c! when 'k', 'K'
-                          return keyword Token::DayOfWeek if end_of_identifier!
+                          return keyword(Token::DayOfWeek) if end_of_identifier!
                         end
                       end
                     end
@@ -182,7 +182,7 @@ module Rgviz
           when 'e', 'E'
             case c! when 's', 'S'
               case c! when 'c', 'C'
-                return keyword Token::Desc if end_of_identifier!
+                return keyword(Token::Desc) if end_of_identifier!
               end
             end
           end
@@ -190,7 +190,7 @@ module Rgviz
           case c! when 'n', 'N'
             case c! when 'd', 'D'
               case c! when 's', 'S'
-                return keyword Token::Ends if end_of_identifier!
+                return keyword(Token::Ends) if end_of_identifier!
               end
             end
           end
@@ -200,7 +200,7 @@ module Rgviz
             case c! when 'l', 'L'
               case c! when 's', 'S'
                 case c! when 'e', 'E'
-                  return keyword Token::False if end_of_identifier!
+                  return keyword(Token::False) if end_of_identifier!
                 end
               end
             end
@@ -209,7 +209,7 @@ module Rgviz
               case c! when 'm', 'M'
                 case c! when 'a', 'A'
                   case c! when 't', 'T'
-                    return keyword Token::Format if end_of_identifier!
+                    return keyword(Token::Format) if end_of_identifier!
                   end
                 end
               end
@@ -220,7 +220,7 @@ module Rgviz
             case c! when 'o', 'O'
               case c! when 'u', 'U'
                 case c! when 'p', 'P'
-                  return keyword Token::Group if end_of_identifier!
+                  return keyword(Token::Group) if end_of_identifier!
                 end
               end
             end
@@ -229,13 +229,13 @@ module Rgviz
           case c! when 'o', 'O'
             case c! when 'u', 'U'
               case c! when 'r', 'R'
-                return keyword Token::Hour if end_of_identifier!
+                return keyword(Token::Hour) if end_of_identifier!
               end
             end
           end
         when 'i', 'I'
           case c! when 's', 'S'
-            return keyword Token::Is if end_of_identifier!
+            return keyword(Token::Is) if end_of_identifier!
           end
         when 'l', 'L'
           case c! 
@@ -243,7 +243,7 @@ module Rgviz
             case c! when 'b', 'B'
               case c! when 'e', 'E'
                 case c! when 'l', 'L'
-                  return keyword Token::Label if end_of_identifier!
+                  return keyword(Token::Label) if end_of_identifier!
                 end
               end
             end
@@ -251,12 +251,12 @@ module Rgviz
             case c!
             when 'k', 'K'
               case c! when 'e', 'E'
-                return keyword Token::Like if end_of_identifier!
+                return keyword(Token::Like) if end_of_identifier!
               end
             when 'm', 'M'
               case c! when 'i', 'I'
                 case c! when 't', 'T'
-                  return keyword Token::Limit if end_of_identifier!
+                  return keyword(Token::Limit) if end_of_identifier!
                 end
               end
             end
@@ -264,7 +264,7 @@ module Rgviz
             case c! when 'w', 'W'
               case c! when 'e', 'E'
                 case c! when 'r', 'R'
-                  return keyword Token::Lower if end_of_identifier!
+                  return keyword(Token::Lower) if end_of_identifier!
                 end
               end
             end
@@ -278,13 +278,13 @@ module Rgviz
                 case c! when 'h', 'H'
                   case c! when 'e', 'E'
                     case c! when 's', 'S'
-                      return keyword Token::Matches if end_of_identifier!
+                      return keyword(Token::Matches) if end_of_identifier!
                     end
                   end
                 end
               end
             when 'x', 'X'
-              return keyword Token::Max if end_of_identifier!
+              return keyword(Token::Max) if end_of_identifier!
             end 
           when 'i', 'I'
             case c! when 'l', 'L'
@@ -296,7 +296,7 @@ module Rgviz
                         case c! when 'o', 'O'
                           case c! when 'n', 'N'
                             case c! when 'd', 'D'
-                              return keyword Token::Millisecond if end_of_identifier!
+                              return keyword(Token::Millisecond) if end_of_identifier!
                             end
                           end
                         end
@@ -306,11 +306,11 @@ module Rgviz
                 end
               end 
             when 'n', 'N'
-              return keyword Token::Min if end_of_identifier!
+              return keyword(Token::Min) if end_of_identifier!
               case c when 'u', 'U'
                 case c! when 't', 'T'
                   case c! when 'e', 'E'
-                    return keyword Token::Minute if end_of_identifier!
+                    return keyword(Token::Minute) if end_of_identifier!
                   end
                 end
               end
@@ -319,7 +319,7 @@ module Rgviz
             case c! when 'n', 'N'
               case c! when 't', 'T'
                 case c! when 'h', 'H'
-                  return keyword Token::Month if end_of_identifier!
+                  return keyword(Token::Month) if end_of_identifier!
                 end
               end
             end
@@ -329,9 +329,9 @@ module Rgviz
           when 'o', 'O'
             case c! 
             when 't', 'T'
-              return keyword Token::Not if end_of_identifier!
+              return keyword(Token::Not) if end_of_identifier!
             when 'w', 'W'
-              return keyword Token::Now if end_of_identifier!
+              return keyword(Token::Now) if end_of_identifier!
             when '_'
               case c!
               when 'f', 'F'
@@ -340,7 +340,7 @@ module Rgviz
                     case c! when 'm', 'M'
                       case c! when 'a', 'A'
                         case c! when 't', 'T'
-                          return keyword Token::NoFormat if end_of_identifier!
+                          return keyword(Token::NoFormat) if end_of_identifier!
                         end
                       end
                     end
@@ -352,7 +352,7 @@ module Rgviz
                     case c! when 'u', 'U'
                       case c! when 'e', 'E'
                         case c! when 's', 'S'
-                          return keyword Token::NoValues if end_of_identifier!
+                          return keyword(Token::NoValues) if end_of_identifier!
                         end
                       end
                     end
@@ -363,7 +363,7 @@ module Rgviz
           when 'u', 'U'
             case c! when 'l', 'L'
               case c! when 'l', 'L'
-                return keyword Token::Null if end_of_identifier!
+                return keyword(Token::Null) if end_of_identifier!
               end
             end
           end
@@ -374,7 +374,7 @@ module Rgviz
               case c! when 's', 'S'
                 case c! when 'e', 'E'
                   case c! when 't', 'T'
-                    return keyword Token::Offset if end_of_identifier!
+                    return keyword(Token::Offset) if end_of_identifier!
                   end
                 end
               end
@@ -385,18 +385,18 @@ module Rgviz
                 case c! when 'o', 'O'
                   case c! when 'n', 'N'
                     case c! when 's', 'S'
-                      return keyword Token::Options if end_of_identifier!
+                      return keyword(Token::Options) if end_of_identifier!
                     end
                   end
                 end
               end
             end
           when 'r', 'R'
-            return keyword Token::Or if end_of_identifier!
+            return keyword(Token::Or) if end_of_identifier!
             case c when 'd', 'D'
               case c! when 'e', 'E'
                 case c! when 'r', 'R'
-                  return keyword Token::Order if end_of_identifier!
+                  return keyword(Token::Order) if end_of_identifier!
                 end
               end
             end
@@ -406,7 +406,7 @@ module Rgviz
             case c! when 'v', 'V'
               case c! when 'o', 'O'
                 case c! when 't', 'T'
-                  return keyword Token::Pivot if end_of_identifier!
+                  return keyword(Token::Pivot) if end_of_identifier!
                 end
               end
             end
@@ -418,7 +418,7 @@ module Rgviz
                 case c! when 't', 'T'
                   case c! when 'e', 'E'
                     case c! when 'r', 'R'
-                      return keyword Token::Quarter if end_of_identifier!
+                      return keyword(Token::Quarter) if end_of_identifier!
                     end
                   end
                 end
@@ -433,7 +433,7 @@ module Rgviz
               case c! when 'o', 'O'
                 case c! when 'n', 'N'
                   case c! when 'd', 'D'
-                    return keyword Token::Second if end_of_identifier!
+                    return keyword(Token::Second) if end_of_identifier!
                   end
                 end
               end
@@ -441,7 +441,7 @@ module Rgviz
               case c! when 'e', 'E'
                 case c! when 'c', 'C'
                   case c! when 't', 'T'
-                    return keyword Token::Select if end_of_identifier!
+                    return keyword(Token::Select) if end_of_identifier!
                   end
                 end
               end
@@ -451,14 +451,14 @@ module Rgviz
               case c! when 'r', 'R'
                 case c! when 't', 'T'
                   case c! when 's', 'S'
-                    return keyword Token::Starts if end_of_identifier!
+                    return keyword(Token::Starts) if end_of_identifier!
                   end
                 end
               end
             end
           when 'u', 'U'
             case c! when 'm', 'M'
-              return keyword Token::Sum if end_of_identifier!
+              return keyword(Token::Sum) if end_of_identifier!
             end
           end
         when 't', 'T'
@@ -472,7 +472,7 @@ module Rgviz
                     case c! when 'd', 'D'
                       case c! when 'a', 'A'
                         case c! when 'y', 'Y'
-                          return keyword Token::TimeOfDay if end_of_identifier!
+                          return keyword(Token::TimeOfDay) if end_of_identifier!
                         end
                       end
                     end
@@ -482,7 +482,7 @@ module Rgviz
                     case c! when 'a', 'A'
                       case c! when 'm', 'M'
                         case c! when 'p', 'P'
-                          return keyword Token::Timestamp if end_of_identifier!
+                          return keyword(Token::Timestamp) if end_of_identifier!
                         end
                       end
                     end
@@ -495,7 +495,7 @@ module Rgviz
               case c! when 'a', 'A'
                 case c! when 't', 'T'
                   case c! when 'e', 'E'
-                    return keyword Token::ToDate if end_of_identifier!
+                    return keyword(Token::ToDate) if end_of_identifier!
                   end
                 end
               end
@@ -503,7 +503,7 @@ module Rgviz
           when 'r', 'R'
             case c! when 'u', 'U'
               case c! when 'e', 'E'
-                return keyword Token::True if end_of_identifier!
+                return keyword(Token::True) if end_of_identifier!
               end
             end
           end
@@ -512,7 +512,7 @@ module Rgviz
             case c! when 'p', 'P'
               case c! when 'e', 'E'
                 case c! when 'r', 'R'
-                  return keyword Token::Upper if end_of_identifier!
+                  return keyword(Token::Upper) if end_of_identifier!
                 end
               end
             end
@@ -523,14 +523,14 @@ module Rgviz
             case c! when 'e', 'E'
               case c! when 'r', 'R'
                 case c! when 'e', 'E'
-                  return keyword Token::Where if end_of_identifier!
+                  return keyword(Token::Where) if end_of_identifier!
                 end
               end
             end
           when 'i', 'I'
             case c! when 't', 'T'
               case c! when 'h', 'H'
-                return keyword Token::With if end_of_identifier!
+                return keyword(Token::With) if end_of_identifier!
               end
             end
           end
@@ -538,7 +538,7 @@ module Rgviz
           case c! when 'e', 'E'
             case c! when 'a', 'A'
               case c! when 'r', 'R'
-                return keyword Token::Year if end_of_identifier!
+                return keyword(Token::Year) if end_of_identifier!
               end
             end
           end
@@ -549,7 +549,7 @@ module Rgviz
           when 'a' .. 'z', 'A' .. 'Z', '_'
             @p += 1
           else
-            raise ParseException.new "Unexpected character #{c} (code: #{c[0]})"
+            raise ParseException.new("Unexpected character #{c} (code: #{c[0]})")
           end
         end
         

data/lib/rgviz/parser.rb

@@ -18,7 +18,7 @@ module Rgviz
       parse_format
       parse_options
       
-      raise ParseException.new "Expecting end of query" if @token.value != Token::EOF
+      raise ParseException.new("Expecting end of query") if @token.value != Token::EOF
       @query
     end
     
@@ -31,7 +31,7 @@ module Rgviz
       
       parse_columns @query.select.columns
       
-      raise ParseException.new "Expecting select columns" if @query.select.columns.empty?
+      raise ParseException.new("Expecting select columns") if @query.select.columns.empty?
     end
     
     def parse_where
@@ -47,7 +47,7 @@ module Rgviz
       @query.group_by = GroupBy.new
       @query.group_by.columns = parse_columns
       
-      raise ParseException.new "Expecting group by columns" if @query.group_by.columns.empty?
+      raise ParseException.new("Expecting group by columns") if @query.group_by.columns.empty?
     end
     
     def parse_pivot
@@ -56,7 +56,7 @@ module Rgviz
       @query.pivot = Pivot.new
       @query.pivot.columns = parse_columns
       
-      raise ParseException.new "Expecting pivot columns" if @query.pivot.columns.empty?
+      raise ParseException.new("Expecting pivot columns") if @query.pivot.columns.empty?
     end
     
     def parse_order_by
@@ -66,7 +66,7 @@ module Rgviz
       @query.order_by = OrderBy.new
       @query.order_by.sorts = parse_sorts
       
-      raise ParseException.new "Expecting order by columns" if @query.order_by.sorts.empty?
+      raise ParseException.new("Expecting order by columns") if @query.order_by.sorts.empty?
     end
     
     def parse_limit
@@ -93,7 +93,7 @@ module Rgviz
       @query.labels = []
       
       column = parse_column
-      raise ParseException.new "Expecting label" unless column
+      raise ParseException.new("Expecting label") unless column
       
       check Token::STRING      
       @query.labels << Label.new(column, @token.string)      
@@ -108,7 +108,7 @@ module Rgviz
         next_token
       end
       
-      raise ParseException.new "Expecting label" if @query.labels.empty?
+      raise ParseException.new("Expecting label") if @query.labels.empty?
     end
     
     def parse_format
@@ -117,7 +117,7 @@ module Rgviz
       @query.formats = []
       
       column = parse_column
-      raise ParseException.new "Expecting format" unless column
+      raise ParseException.new("Expecting format") unless column
       
       check Token::STRING      
       @query.formats << Format.new(column, @token.string)      
@@ -132,7 +132,7 @@ module Rgviz
         next_token
       end
       
-      raise ParseException.new "Expecting format" if @query.formats.empty?
+      raise ParseException.new("Expecting format") if @query.formats.empty?
     end
     
     def parse_options
@@ -153,8 +153,8 @@ module Rgviz
         end
       end
       
-      raise ParseException.new "Expecting option" if !@query.options.no_format && !@query.options.no_values 
-      raise ParseException.new "Unknown option" if @token.value != Token::EOF
+      raise ParseException.new("Expecting option") if !@query.options.no_format && !@query.options.no_values 
+      raise ParseException.new("Unknown option #{@token.string}") if @token.value != Token::EOF
     end
     
     def parse_sorts
@@ -232,33 +232,33 @@ module Rgviz
         return exp
       else
         left = parse_column
-        raise ParseException.new "Expecting left exp" unless left
+        raise ParseException.new("Expecting left exp") unless left
         
         case @token.value
         when Token::Is
           next_token
           if token_is! Token::Not
             check! Token::Null
-            return UnaryExpression.new UnaryExpression::IsNotNull, left
+            return UnaryExpression.new(UnaryExpression::IsNotNull, left)
           elsif token_is! Token::Null
-            return UnaryExpression.new UnaryExpression::IsNull, left
+            return UnaryExpression.new(UnaryExpression::IsNull, left)
           end
         when Token::EQ, Token::NEQ, Token::LT, Token::LTE, Token::GT, Token::GTE,
              Token::Contains, Token::Matches, Token::Like
           operator = @token.value
           next_token
           right = parse_column
-          raise ParseException.new "Expecting right exp" unless right
-          return BinaryExpression.new left, operator, right
+          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
           next_token
           check! Token::With
           right = parse_column
-          raise ParseException.new "Expecting right exp" unless right
-          return BinaryExpression.new left, operator, right
+          raise ParseException.new("Expecting right exp") unless right
+          return BinaryExpression.new(left, operator, right)
         else
-          raise ParseException.new "Expecting comparison"
+          raise ParseException.new("Expecting comparison")
         end
       end
     end
@@ -368,9 +368,9 @@ module Rgviz
         if token_is! Token::LPAREN
           column = parse_column
           check! Token::RPAREN
-          return AggregateColumn.new function, column
+          return AggregateColumn.new(function, column)
         else
-          return IdColumn.new string
+          return IdColumn.new(string)
         end
       when Token::Year, Token::Month, Token::Day, 
            Token::Hour, Token::Minute, Token::Second, Token::Millisecond,
@@ -382,9 +382,9 @@ module Rgviz
         if token_is! Token::LPAREN
           columns = parse_columns
           check! Token::RPAREN
-          return ScalarFunctionColumn.new function, *columns
+          return ScalarFunctionColumn.new(function, *columns)
         else
-          return IdColumn.new string
+          return IdColumn.new(string)
         end
       end
       nil
@@ -410,7 +410,7 @@ module Rgviz
     end
     
     def check(*token_values)
-      raise ParseException.new "Expecting token #{token_values}" unless token_values.any?{|value| @token.value == value}
+      raise ParseException.new("Expecting token #{token_values}") unless token_values.any?{|value| @token.value == value}
     end
     
     def check!(*token_values)

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rgviz
 version: !ruby/object:Gem::Version 
-  hash: 53
+  hash: 75
   prerelease: false
   segments: 
   - 0
-  - 31
-  version: "0.31"
+  - 32
+  version: "0.32"
 platform: ruby
 authors: 
 - Ary Borenszweig