sparkql 1.2.8 → 1.3.0

data/lib/sparkql/lexer.rb

@@ -2,9 +2,9 @@ require 'strscan'
 
 class Sparkql::Lexer < StringScanner
   include Sparkql::Token
-  
+
   attr_accessor :level, :block_group_identifier
-  
+
   attr_reader :last_field, :current_token_value, :token_index
 
   def initialize(str)
@@ -14,51 +14,50 @@ class Sparkql::Lexer < StringScanner
     @block_group_identifier = 0
     @expression_count = 0
   end
-  
+
   # Lookup the next matching token
   def shift
     @token_index = self.pos
 
-    token = case
-      when @current_token_value = scan(SPACE)
-        [:SPACE, @current_token_value]
-      when @current_token_value = scan(LPAREN)
-        levelup
-        [:LPAREN, @current_token_value]
-      when @current_token_value = scan(RPAREN)
-        # leveldown: do this after parsing group
-        [:RPAREN, @current_token_value]
-      when @current_token_value = scan(/\,/)
-        [:COMMA,@current_token_value]
-      when @current_token_value = scan(NULL)
-        literal :NULL, "NULL"
-      when @current_token_value = scan(STANDARD_FIELD)
-        check_standard_fields(@current_token_value)
-      when @current_token_value = scan(DATETIME)
-        literal :DATETIME, @current_token_value
-      when @current_token_value = scan(DATE)
-        literal :DATE, @current_token_value
-      when @current_token_value = scan(TIME)
-        literal :TIME, @current_token_value
-      when @current_token_value = scan(DECIMAL)
-        literal :DECIMAL, @current_token_value
-      when @current_token_value = scan(INTEGER)
-        literal :INTEGER, @current_token_value
-      when @current_token_value = scan(/\-/)
-        [:UMINUS, @current_token_value]
-      when @current_token_value = scan(CHARACTER)
-        literal :CHARACTER, @current_token_value
-      when @current_token_value = scan(BOOLEAN)
-        literal :BOOLEAN, @current_token_value
-      when @current_token_value = scan(KEYWORD)
-        check_keywords(@current_token_value)
-      when @current_token_value = scan(CUSTOM_FIELD)
-        [:CUSTOM_FIELD,@current_token_value]
-      when eos?
-        [false, false] # end of file, \Z don't work with StringScanner
-      else
-        [:UNKNOWN, "ERROR: '#{self.string}'"]
-    end
+    token = if (@current_token_value = scan(SPACE))
+              [:SPACE, @current_token_value]
+            elsif (@current_token_value = scan(LPAREN))
+              levelup
+              [:LPAREN, @current_token_value]
+            elsif (@current_token_value = scan(RPAREN))
+              # leveldown: do this after parsing group
+              [:RPAREN, @current_token_value]
+            elsif (@current_token_value = scan(/,/))
+              [:COMMA, @current_token_value]
+            elsif (@current_token_value = scan(NULL))
+              literal :NULL, "NULL"
+            elsif (@current_token_value = scan(STANDARD_FIELD))
+              check_standard_fields(@current_token_value)
+            elsif (@current_token_value = scan(DATETIME))
+              literal :DATETIME, @current_token_value
+            elsif (@current_token_value = scan(DATE))
+              literal :DATE, @current_token_value
+            elsif (@current_token_value = scan(TIME))
+              literal :TIME, @current_token_value
+            elsif (@current_token_value = scan(DECIMAL))
+              literal :DECIMAL, @current_token_value
+            elsif (@current_token_value = scan(INTEGER))
+              literal :INTEGER, @current_token_value
+            elsif (@current_token_value = scan(/-/))
+              [:UMINUS, @current_token_value]
+            elsif (@current_token_value = scan(CHARACTER))
+              literal :CHARACTER, @current_token_value
+            elsif (@current_token_value = scan(BOOLEAN))
+              literal :BOOLEAN, @current_token_value
+            elsif (@current_token_value = scan(KEYWORD))
+              check_keywords(@current_token_value)
+            elsif (@current_token_value = scan(CUSTOM_FIELD))
+              [:CUSTOM_FIELD, @current_token_value]
+            elsif eos?
+              [false, false] # end of file, \Z don't work with StringScanner
+            else
+              [:UNKNOWN, "ERROR: '#{self.string}'"]
+            end
 
     token.freeze
   end
@@ -66,13 +65,13 @@ class Sparkql::Lexer < StringScanner
   def check_reserved_words(value)
     u_value = value.capitalize
     if OPERATORS.include?(u_value)
-      [:OPERATOR,u_value]
+      [:OPERATOR, u_value]
     elsif RANGE_OPERATOR == u_value
-      [:RANGE_OPERATOR,u_value]
+      [:RANGE_OPERATOR, u_value]
     elsif CONJUNCTIONS.include?(u_value)
-      [:CONJUNCTION,u_value]
+      [:CONJUNCTION, u_value]
     elsif UNARY_CONJUNCTIONS.include?(u_value)
-      [:UNARY_CONJUNCTION,u_value]
+      [:UNARY_CONJUNCTION, u_value]
     elsif ADD == u_value
       [:ADD, u_value]
     elsif SUB == u_value
@@ -87,12 +86,12 @@ class Sparkql::Lexer < StringScanner
       [:UNKNOWN, "ERROR: '#{self.string}'"]
     end
   end
-  
+
   def check_standard_fields(value)
     result = check_reserved_words(value)
     if result.first == :UNKNOWN
       @last_field = value
-      result = [:STANDARD_FIELD,value]
+      result = [:STANDARD_FIELD, value]
     end
     result
   end
@@ -100,26 +99,25 @@ class Sparkql::Lexer < StringScanner
   def check_keywords(value)
     result = check_reserved_words(value)
     if result.first == :UNKNOWN
-      result = [:KEYWORD,value]
+      result = [:KEYWORD, value]
     end
     result
   end
-  
+
   def levelup
     @level += 1
     @block_group_identifier += 1
   end
-  
+
   def leveldown
     @level -= 1
   end
-  
+
   def literal(symbol, value)
     node = {
-      :type => symbol.to_s.downcase.to_sym,
-      :value => value
+      type: symbol.to_s.downcase.to_sym,
+      value: value
     }
     [symbol, node]
   end
-  
 end

data/lib/sparkql/parser.rb

@@ -1,7 +1,7 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.15
-# from Racc grammer file "".
+# This file is automatically generated by Racc 1.4.16
+# from Racc grammar file "".
 #
 
 require 'racc/parser.rb'
@@ -345,7 +345,7 @@ Racc_debug_parser = false
 # reduce 1 omitted
 
 def _reduce_2(val, _values, result)
- result = 0 
+ result = 0
     result
 end
 
@@ -356,71 +356,71 @@ end
 # reduce 5 omitted
 
 def _reduce_6(val, _values, result)
- result = tokenize_expression(val[0], val[1],val[2]) 
+ result = tokenize_expression(val[0], val[1],val[2])
     result
 end
 
 def _reduce_7(val, _values, result)
- result = tokenize_expression(val[0], val[1], val[2]) 
+ result = tokenize_expression(val[0], val[1], val[2])
     result
 end
 
 # reduce 8 omitted
 
 def _reduce_9(val, _values, result)
- result = tokenize_unary_conjunction(val[0], val[1]) 
+ result = tokenize_unary_conjunction(val[0], val[1])
     result
 end
 
 def _reduce_10(val, _values, result)
- result = tokenize_conjunction(val[0], val[1],val[2]) 
+ result = tokenize_conjunction(val[0], val[1],val[2])
     result
 end
 
 def _reduce_11(val, _values, result)
- result = tokenize_conjunction(val[0], val[1],val[2]) 
+ result = tokenize_conjunction(val[0], val[1],val[2])
     result
 end
 
 def _reduce_12(val, _values, result)
- result = tokenize_group(val[1]) 
+ result = tokenize_group(val[1])
     result
 end
 
 # reduce 13 omitted
 
 def _reduce_14(val, _values, result)
- result = tokenize_arithmetic(val[0], val[1], val[2]) 
+ result = tokenize_arithmetic(val[0], val[1], val[2])
     result
 end
 
 def _reduce_15(val, _values, result)
- result = tokenize_arithmetic(val[0], val[1], val[2]) 
+ result = tokenize_arithmetic(val[0], val[1], val[2])
     result
 end
 
 def _reduce_16(val, _values, result)
- result = tokenize_arithmetic(val[0], val[1], val[2]) 
+ result = tokenize_arithmetic(val[0], val[1], val[2])
     result
 end
 
 def _reduce_17(val, _values, result)
- result = tokenize_arithmetic(val[0], val[1], val[2]) 
+ result = tokenize_arithmetic(val[0], val[1], val[2])
     result
 end
 
 def _reduce_18(val, _values, result)
- result = tokenize_arithmetic(val[0], val[1], val[2]) 
+ result = tokenize_arithmetic(val[0], val[1], val[2])
     result
 end
 
 def _reduce_19(val, _values, result)
- result = tokenize_arithmetic_group(val[1]) 
+ result = tokenize_arithmetic_group(val[1])
     result
 end
 
 def _reduce_20(val, _values, result)
- result = tokenize_arithmetic_negation(val[1]) 
+ result = tokenize_arithmetic_negation(val[1])
     result
 end
 
@@ -435,64 +435,64 @@ end
 # reduce 25 omitted
 
 def _reduce_26(val, _values, result)
- result = tokenize_list(val[0]) 
+ result = tokenize_list(val[0])
     result
 end
 
 # reduce 27 omitted
 
 def _reduce_28(val, _values, result)
- result = group_fold(val[1]) 
+ result = group_fold(val[1])
     result
 end
 
 def _reduce_29(val, _values, result)
- result = tokenize_literal_negation(val[1]) 
+ result = tokenize_literal_negation(val[1])
     result
 end
 
 def _reduce_30(val, _values, result)
- result = add_fold(val[0], val[2]) 
+ result = add_fold(val[0], val[2])
     result
 end
 
 def _reduce_31(val, _values, result)
- result = sub_fold(val[0], val[2]) 
+ result = sub_fold(val[0], val[2])
     result
 end
 
 def _reduce_32(val, _values, result)
- result = mul_fold(val[0], val[2]) 
+ result = mul_fold(val[0], val[2])
     result
 end
 
 def _reduce_33(val, _values, result)
- result = div_fold(val[0], val[2]) 
+ result = div_fold(val[0], val[2])
     result
 end
 
 def _reduce_34(val, _values, result)
- result = mod_fold(val[0], val[2]) 
+ result = mod_fold(val[0], val[2])
     result
 end
 
 def _reduce_35(val, _values, result)
- result = tokenize_function(val[0], []) 
+ result = tokenize_function(val[0], [])
     result
 end
 
 def _reduce_36(val, _values, result)
- result = tokenize_function(val[0], val[2]) 
+ result = tokenize_function(val[0], val[2])
     result
 end
 
 def _reduce_37(val, _values, result)
- result = tokenize_function(val[0], []) 
+ result = tokenize_function(val[0], [])
     result
 end
 
 def _reduce_38(val, _values, result)
- result = tokenize_function(val[0], val[2]) 
+ result = tokenize_function(val[0], val[2])
     result
 end
 
@@ -501,12 +501,12 @@ end
 # reduce 40 omitted
 
 def _reduce_41(val, _values, result)
- result = tokenize_function_args(val[0], val[2]) 
+ result = tokenize_function_args(val[0], val[2])
     result
 end
 
 def _reduce_42(val, _values, result)
- result = tokenize_field_arg(val[0]) 
+ result = tokenize_field_arg(val[0])
     result
 end
 
@@ -517,7 +517,7 @@ end
 # reduce 45 omitted
 
 def _reduce_46(val, _values, result)
- result = tokenize_function_args(val[0], val[2]) 
+ result = tokenize_function_args(val[0], val[2])
     result
 end
 
@@ -530,17 +530,17 @@ end
 # reduce 50 omitted
 
 def _reduce_51(val, _values, result)
- result = tokenize_multiple(val[0], val[2]) 
+ result = tokenize_multiple(val[0], val[2])
     result
 end
 
 def _reduce_52(val, _values, result)
- result = tokenize_multiple(val[0], val[2]) 
+ result = tokenize_multiple(val[0], val[2])
     result
 end
 
 def _reduce_53(val, _values, result)
- result = tokenize_multiple(val[0], val[2]) 
+ result = tokenize_multiple(val[0], val[2])
     result
 end
 
@@ -581,7 +581,7 @@ def _reduce_none(val, _values, result)
 end
 
   end   # class Parser
-  end   # module Sparkql
+end   # module Sparkql
 
 
 # END PARSER