dentaku 3.0.0 → 3.1.0

data/lib/dentaku/ast/bitwise.rb

@@ -3,13 +3,13 @@ require_relative './operation'
 module Dentaku
   module AST
     class BitwiseOr < Operation
-      def value(context={})
+      def value(context = {})
         left.value(context) | right.value(context)
       end
     end
 
     class BitwiseAnd < Operation
-      def value(context={})
+      def value(context = {})
         left.value(context) & right.value(context)
       end
     end

data/lib/dentaku/ast/case.rb

@@ -25,7 +25,7 @@ module Dentaku
         end
       end
 
-      def value(context={})
+      def value(context = {})
         switch_value = @switch.value(context)
         @conditions.each do |condition|
           if condition.when.value(context) == switch_value
@@ -40,7 +40,7 @@ module Dentaku
         end
       end
 
-      def dependencies(context={})
+      def dependencies(context = {})
         # TODO: should short-circuit
         switch_dependencies(context) +
         condition_dependencies(context) +
@@ -49,15 +49,15 @@ module Dentaku
 
       private
 
-      def switch_dependencies(context={})
+      def switch_dependencies(context = {})
         @switch.dependencies(context)
       end
 
-      def condition_dependencies(context={})
+      def condition_dependencies(context = {})
         @conditions.flat_map { |condition| condition.dependencies(context) }
       end
 
-      def else_dependencies(context={})
+      def else_dependencies(context = {})
         @else ? @else.dependencies(context) : []
       end
     end

data/lib/dentaku/ast/case/case_conditional.rb

@@ -15,7 +15,7 @@ module Dentaku
         end
       end
 
-      def dependencies(context={})
+      def dependencies(context = {})
         @when.dependencies(context) + @then.dependencies(context)
       end
     end

data/lib/dentaku/ast/case/case_else.rb

@@ -9,11 +9,11 @@ module Dentaku
         @node = node
       end
 
-      def value(context={})
+      def value(context = {})
         @node.value(context)
       end
 
-      def dependencies(context={})
+      def dependencies(context = {})
         @node.dependencies(context)
       end
     end

data/lib/dentaku/ast/case/case_switch_variable.rb

@@ -5,11 +5,11 @@ module Dentaku
         @node = node
       end
 
-      def value(context={})
+      def value(context = {})
         @node.value(context)
       end
 
-      def dependencies(context={})
+      def dependencies(context = {})
         @node.dependencies(context)
       end
 

data/lib/dentaku/ast/case/case_then.rb

@@ -9,11 +9,11 @@ module Dentaku
         @node = node
       end
 
-      def value(context={})
+      def value(context = {})
         @node.value(context)
       end
 
-      def dependencies(context={})
+      def dependencies(context = {})
         @node.dependencies(context)
       end
     end

data/lib/dentaku/ast/case/case_when.rb

@@ -9,11 +9,11 @@ module Dentaku
         @node = node
       end
 
-      def value(context={})
+      def value(context = {})
         @node.value(context)
       end
 
-      def dependencies(context={})
+      def dependencies(context = {})
         @node.dependencies(context)
       end
     end

data/lib/dentaku/ast/combinators.rb

@@ -28,13 +28,21 @@ module Dentaku
     end
 
     class And < Combinator
-      def value(context={})
+      def operator
+        :and
+      end
+
+      def value(context = {})
         left.value(context) && right.value(context)
       end
     end
 
     class Or < Combinator
-      def value(context={})
+      def operator
+        :or
+      end
+
+      def value(context = {})
         left.value(context) || right.value(context)
       end
     end

data/lib/dentaku/ast/comparators.rb

@@ -10,42 +10,70 @@ module Dentaku
       def type
         :logical
       end
+
+      def operator
+        raise NotImplementedError
+      end
     end
 
     class LessThan < Comparator
-      def value(context={})
+      def value(context = {})
         left.value(context) < right.value(context)
       end
+
+      def operator
+        return :<
+      end
     end
 
     class LessThanOrEqual < Comparator
-      def value(context={})
+      def value(context = {})
         left.value(context) <= right.value(context)
       end
+
+      def operator
+        return :<=
+      end
     end
 
     class GreaterThan < Comparator
-      def value(context={})
+      def value(context = {})
         left.value(context) > right.value(context)
       end
+
+      def operator
+        return :>
+      end
     end
 
     class GreaterThanOrEqual < Comparator
-      def value(context={})
+      def value(context = {})
         left.value(context) >= right.value(context)
       end
+
+      def operator
+        return :>=
+      end
     end
 
     class NotEqual < Comparator
-      def value(context={})
+      def value(context = {})
         left.value(context) != right.value(context)
       end
+
+      def operator
+        return :!=
+      end
     end
 
     class Equal < Comparator
-      def value(context={})
+      def value(context = {})
         left.value(context) == right.value(context)
       end
+
+      def operator
+        return :==
+      end
     end
   end
 end

data/lib/dentaku/ast/function.rb

@@ -11,7 +11,7 @@ module Dentaku
         @args = args
       end
 
-      def dependencies(context={})
+      def dependencies(context = {})
         @args.flat_map { |a| a.dependencies(context) }
       end
 

data/lib/dentaku/ast/function_registry.rb

@@ -38,7 +38,7 @@ module Dentaku
             @implementation.arity < 0 ? nil : @implementation.arity
           end
 
-          def value(context={})
+          def value(context = {})
             args = @args.map { |a| a.value(context) }
             self.class.implementation.call(*args)
           end

data/lib/dentaku/ast/functions/if.rb

@@ -11,15 +11,19 @@ module Dentaku
         @right     = right
       end
 
-      def value(context={})
+      def value(context = {})
         predicate.value(context) ? left.value(context) : right.value(context)
       end
 
+      def node_type
+        :condition
+      end
+
       def type
         left.type
       end
 
-      def dependencies(context={})
+      def dependencies(context = {})
         # TODO : short-circuit?
         (predicate.dependencies(context) + left.dependencies(context) + right.dependencies(context)).uniq
       end

data/lib/dentaku/ast/functions/max.rb

@@ -1,5 +1,5 @@
 require_relative '../function'
 
 Dentaku::AST::Function.register(:max, :numeric, ->(*args) {
-  args.map { |arg| Dentaku::AST::Function.numeric(arg) }.max
+  args.flatten.map { |arg| Dentaku::AST::Function.numeric(arg) }.max
 })

data/lib/dentaku/ast/functions/min.rb

@@ -1,5 +1,5 @@
 require_relative '../function'
 
 Dentaku::AST::Function.register(:min, :numeric, ->(*args) {
-  args.map { |arg| Dentaku::AST::Function.numeric(arg) }.min
+  args.flatten.map { |arg| Dentaku::AST::Function.numeric(arg) }.min
 })

data/lib/dentaku/ast/functions/ruby_math.rb

@@ -3,6 +3,6 @@ require_relative '../function'
 
 Math.methods(false).each do |method|
   Dentaku::AST::Function.register(method, :numeric, lambda { |*args|
-    Math.send(method, *args.map { |arg| Dentaku::AST::Function.numeric(arg) })
+    Math.send(method, *args.flatten.map { |arg| Dentaku::AST::Function.numeric(arg) })
   })
 end

data/lib/dentaku/ast/functions/string_functions.rb

@@ -9,7 +9,7 @@ module Dentaku
           @string, @length = *@args
         end
 
-        def value(context={})
+        def value(context = {})
           string = @string.value(context).to_s
           length = @length.value(context)
           string[0, length]
@@ -22,7 +22,7 @@ module Dentaku
           @string, @length = *@args
         end
 
-        def value(context={})
+        def value(context = {})
           string = @string.value(context).to_s
           length = @length.value(context)
           string[length * -1, length] || string
@@ -35,7 +35,7 @@ module Dentaku
           @string, @offset, @length = *@args
         end
 
-        def value(context={})
+        def value(context = {})
           string = @string.value(context).to_s
           offset = @offset.value(context)
           length = @length.value(context)
@@ -49,7 +49,7 @@ module Dentaku
           @string = @args[0]
         end
 
-        def value(context={})
+        def value(context = {})
           string = @string.value(context).to_s
           string.length
         end
@@ -61,7 +61,7 @@ module Dentaku
           @needle, @haystack = *@args
         end
 
-        def value(context={})
+        def value(context = {})
           needle = @needle.value(context)
           needle = needle.to_s unless needle.is_a?(Regexp)
           haystack = @haystack.value(context).to_s
@@ -76,7 +76,7 @@ module Dentaku
           @original, @search, @replacement = *@args
         end
 
-        def value(context={})
+        def value(context = {})
           original = @original.value(context).to_s
           search = @search.value(context)
           search = search.to_s unless search.is_a?(Regexp)
@@ -90,7 +90,7 @@ module Dentaku
           super
         end
 
-        def value(context={})
+        def value(context = {})
           @args.map { |arg| arg.value(context).to_s }.join
         end
       end
@@ -101,7 +101,7 @@ module Dentaku
           @needle, @haystack = *args
         end
 
-        def value(context={})
+        def value(context = {})
           @haystack.value(context).to_s.include? @needle.value(context).to_s
         end
       end

data/lib/dentaku/ast/functions/sum.rb

@@ -0,0 +1,12 @@
+require_relative '../function'
+
+Dentaku::AST::Function.register(:sum, :numeric, ->(*args) {
+  if args.empty?
+    raise Dentaku::ArgumentError.for(
+        :too_few_arguments,
+        function_name: 'SUM()', at_least: 1, given: 0
+    ), 'SUM() requires at least one argument'
+  end
+
+  args.flatten.map { |arg| Dentaku::AST::Function.numeric(arg) }.reduce(0, :+)
+})

data/lib/dentaku/ast/grouping.rb

@@ -5,7 +5,7 @@ module Dentaku
         @node = node
       end
 
-      def value(context={})
+      def value(context = {})
         @node.value(context)
       end
 
@@ -13,7 +13,7 @@ module Dentaku
         @node.type
       end
 
-      def dependencies(context={})
+      def dependencies(context = {})
         @node.dependencies(context)
       end
     end

data/lib/dentaku/ast/identifier.rb

@@ -1,15 +1,18 @@
 require_relative '../exceptions'
+require 'dentaku/string_casing'
 
 module Dentaku
   module AST
     class Identifier < Node
-      attr_reader :identifier
+      include StringCasing
+      attr_reader :identifier, :case_sensitive
 
-      def initialize(token)
-        @identifier = token.value.downcase
+      def initialize(token, options = {})
+        @case_sensitive = options.fetch(:case_sensitive, false)
+        @identifier = standardize_case(token.value)
       end
 
-      def value(context={})
+      def value(context = {})
         v = context.fetch(identifier) do
           raise UnboundVariableError.new([identifier]),
                 "no value provided for variables: #{identifier}"
@@ -23,7 +26,7 @@ module Dentaku
         end
       end
 
-      def dependencies(context={})
+      def dependencies(context = {})
         context.key?(identifier) ? dependencies_of(context[identifier]) : [identifier]
       end
 

data/lib/dentaku/ast/negation.rb

@@ -14,7 +14,7 @@ module Dentaku
         :*
       end
 
-      def value(context={})
+      def value(context = {})
         cast(@node.value(context)) * -1
       end
 
@@ -34,7 +34,7 @@ module Dentaku
         40
       end
 
-      def dependencies(context={})
+      def dependencies(context = {})
         @node.dependencies(context)
       end
 

data/lib/dentaku/ast/node.rb

@@ -12,7 +12,7 @@ module Dentaku
       def self.peek(*)
       end
 
-      def dependencies(context={})
+      def dependencies(context = {})
         []
       end
     end