dentaku 3.4.2 → 3.5.0

data/spec/parser_spec.rb

@@ -71,6 +71,11 @@ describe Dentaku::Parser do
     expect(node.value("x" => 3)).to eq(4)
   end
 
+  it 'evaluates a nested case statement with case-sensitivity' do
+    node = parse('CASE x WHEN 1 THEN CASE Y WHEN "A" THEN 2 WHEN "B" THEN 3 END END', { case_sensitive: true }, { case_sensitive: true })
+    expect(node.value("x" => 1, "y" => "A", "Y" => "B")).to eq(3)
+  end
+
   it 'evaluates arrays' do
     node = parse('{1, 2, 3}')
     expect(node.value).to eq([1, 2, 3])
@@ -89,6 +94,16 @@ describe Dentaku::Parser do
       }.to raise_error(Dentaku::ParseError)
     end
 
+    it 'raises a parse error for too many operands' do
+      expect {
+        parse("IF(1, 0, IF(1, 2, 3, 4))")
+      }.to raise_error(Dentaku::ParseError)
+
+      expect {
+        parse("CASE a WHEN 1 THEN true ELSE THEN IF(1, 2, 3, 4) END")
+      }.to raise_error(Dentaku::ParseError)
+    end
+
     it 'raises a parse error for bad grouping structure' do
       expect {
         parse(",")
@@ -144,8 +159,8 @@ describe Dentaku::Parser do
 
   private
 
-  def parse(expr)
-    tokens = Dentaku::Tokenizer.new.tokenize(expr)
-    described_class.new(tokens).parse
+  def parse(expr, parser_options = {}, tokenizer_options = {})
+    tokens = Dentaku::Tokenizer.new.tokenize(expr, tokenizer_options)
+    described_class.new(tokens, parser_options).parse
   end
 end

data/spec/print_visitor_spec.rb

@@ -0,0 +1,66 @@
+require 'dentaku/print_visitor'
+require 'dentaku/tokenizer'
+require 'dentaku/parser'
+
+describe Dentaku::PrintVisitor do
+  it 'prints a representation of an AST' do
+    repr = roundtrip('5+4')
+    expect(repr).to eq('5 + 4')
+  end
+
+  it 'quotes string literals' do
+    repr = roundtrip('Concat(\'a\',   "B")')
+    expect(repr).to eq('CONCAT("a", "B")')
+  end
+
+  it 'handles unary operations on literals' do
+    repr = roundtrip('- 4')
+    expect(repr).to eq('-4')
+  end
+
+  it 'handles unary operations on trees' do
+    repr = roundtrip('- (5 + 5)')
+    expect(repr).to eq('-(5 + 5)')
+  end
+
+  it 'handles a complex arithmetic expression' do
+    repr = roundtrip('(((1 + 7) * (8 ^ 2)) / - (3.0 - apples))')
+    expect(repr).to eq('(1 + 7) * 8 ^ 2 / -(3.0 - apples)')
+  end
+
+  it 'handles a complex logical expression' do
+    repr = roundtrip('1 < 2 and 3 <= 4 or 5 > 6 AND 7 >= 8 OR 9 != 10 and true')
+    expect(repr).to eq('1 < 2 and 3 <= 4 or 5 > 6 and 7 >= 8 or 9 != 10 and true')
+  end
+
+  it 'handles a function call' do
+    repr = roundtrip('IF(a[0] = NULL, "five", \'seven\')')
+    expect(repr).to eq('IF(a[0] = NULL, "five", "seven")')
+  end
+
+  it 'handles a case statement' do
+    repr = roundtrip('case (a % 5) when 0 then a else b end')
+    expect(repr).to eq('CASE a % 5 WHEN 0 THEN a ELSE b END')
+  end
+
+  it 'handles a bitwise operators' do
+    repr = roundtrip('0xCAFE & 0xDECAF | 0xBEEF')
+    expect(repr).to eq('0xCAFE & 0xDECAF | 0xBEEF')
+  end
+
+  it 'handles a datetime literal' do
+    repr = roundtrip('2017-12-24 23:59:59')
+    expect(repr).to eq('2017-12-24 23:59:59')
+  end
+
+  private
+
+  def roundtrip(string)
+    described_class.new(parsed(string)).to_s
+  end
+
+  def parsed(string)
+    tokens = Dentaku::Tokenizer.new.tokenize(string)
+    Dentaku::Parser.new(tokens).parse
+  end
+end

data/spec/tokenizer_spec.rb

@@ -25,6 +25,12 @@ describe Dentaku::Tokenizer do
       expect(tokens.map(&:category)).to eq([:numeric])
       expect(tokens.map(&:value)).to eq([6.02e23])
     end
+
+    tokens = tokenizer.tokenize('6E23')
+    expect(tokens.map(&:value)).to eq([0.6e24])
+
+    tokens = tokenizer.tokenize('6e-23')
+    expect(tokens.map(&:value)).to eq([0.6e-22])
   end
 
   it 'tokenizes addition' do

data/spec/visitor/infix_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+require 'dentaku/visitor/infix'
+
+class ArrayProcessor
+  attr_reader :expression
+  include Dentaku::Visitor::Infix
+
+  def initialize
+    @expression = []
+  end
+
+  def process(node)
+    @expression << node.to_s
+  end
+end
+
+RSpec.describe Dentaku::Visitor::Infix do
+  it 'generates array representation of operation' do
+    processor = ArrayProcessor.new
+    processor.visit(ast('5 + 3'))
+    expect(processor.expression).to eq ['5', '+', '3']
+  end
+
+  private
+
+  def ast(expression)
+    tokens = Dentaku::Tokenizer.new.tokenize(expression)
+    Dentaku::Parser.new(tokens).parse
+  end
+end

data/spec/visitor_spec.rb

@@ -0,0 +1,137 @@
+require 'spec_helper'
+require 'set'
+
+class TestVisitor
+  attr_reader :visited
+
+  def initialize(node)
+    @visited = Set.new
+    node.accept(self)
+  end
+
+  def mark_visited(node)
+    @visited.add(node.class.to_s.split("::").last.to_sym)
+  end
+
+  def visit_operation(node)
+    mark_visited(node)
+
+    node.left.accept(self) if node.left
+    node.right.accept(self) if node.right
+  end
+
+  def visit_function(node)
+    mark_visited(node)
+    node.args.each { |a| a.accept(self) }
+  end
+
+  def visit_array(node)
+    mark_visited(node)
+  end
+
+  def visit_case(node)
+    mark_visited(node)
+    node.switch.accept(self)
+    node.conditions.each { |c| c.accept(self) }
+    node.else && node.else.accept(self)
+  end
+
+  def visit_switch(node)
+    mark_visited(node)
+    node.node.accept(self)
+  end
+
+  def visit_case_conditional(node)
+    mark_visited(node)
+    node.when.accept(self)
+    node.then.accept(self)
+  end
+
+  def visit_when(node)
+    mark_visited(node)
+    node.node.accept(self)
+  end
+
+  def visit_then(node)
+    mark_visited(node)
+    node.node.accept(self)
+  end
+
+  def visit_else(node)
+    mark_visited(node)
+    node.node.accept(self)
+  end
+
+  def visit_negation(node)
+    mark_visited(node)
+    node.node.accept(self)
+  end
+
+  def visit_access(node)
+    mark_visited(node)
+    node.structure.accept(self)
+    node.index.accept(self)
+  end
+
+  def visit_literal(node)
+    mark_visited(node)
+  end
+
+  def visit_identifier(node)
+    mark_visited(node)
+  end
+
+  def visit_nil(node)
+    mark_visited(node)
+  end
+end
+
+describe TestVisitor do
+  def generic_subclasses
+    [
+      :Arithmetic,
+      :Combinator,
+      :Comparator,
+      :Function,
+      :FunctionRegistry,
+      :Grouping,
+      :Literal,
+      :Node,
+      :Operation,
+      :StringFunctions,
+      :RubyMath,
+      :Enum,
+    ]
+  end
+
+  it 'visits all concrete AST node types' do
+    @visited = Set.new
+
+    visit_nodes('(1 + 7) * (8 ^ 2) / - 3.0 - apples')
+    visit_nodes('1 < 2 and 3 <= 4 or 5 > 6 AND 7 >= 8 OR 9 != 10 and true')
+    visit_nodes('IF(a[0] = NULL, "five", \'seven\')')
+    visit_nodes('case (a % 5) when 0 then a else b end')
+    visit_nodes('0xCAFE & 0xDECAF | 0xBEEF')
+    visit_nodes('2017-12-24 23:59:59')
+    visit_nodes('ALL({1, 2, 3}, "val", val % 2 == 0)')
+    visit_nodes('ANY(vals, val, val > 1)')
+    visit_nodes('COUNT({1, 2, 3})')
+    visit_nodes('PLUCK(users, age)')
+    visit_nodes('XOR(false, false)')
+    visit_nodes('duration(1, day)')
+    visit_nodes('MAP(vals, val, val + 1)')
+    visit_nodes('FILTER(vals, val, val > 1)')
+
+    @expected = Set.new(Dentaku::AST::constants - generic_subclasses)
+    expect(@visited.sort).to eq(@expected.sort)
+  end
+
+  private
+
+  def visit_nodes(string)
+    tokens = Dentaku::Tokenizer.new.tokenize(string)
+    node = Dentaku::Parser.new(tokens).parse
+    visitor = TestVisitor.new(node)
+    @visited += visitor.visited
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 3.4.2
+  version: 3.5.0
 platform: ruby
 authors:
 - Solomon White
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2022-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -176,6 +176,7 @@ files:
 - lib/dentaku/ast/functions/avg.rb
 - lib/dentaku/ast/functions/count.rb
 - lib/dentaku/ast/functions/duration.rb
+- lib/dentaku/ast/functions/enum.rb
 - lib/dentaku/ast/functions/filter.rb
 - lib/dentaku/ast/functions/if.rb
 - lib/dentaku/ast/functions/map.rb
@@ -192,6 +193,7 @@ files:
 - lib/dentaku/ast/functions/string_functions.rb
 - lib/dentaku/ast/functions/sum.rb
 - lib/dentaku/ast/functions/switch.rb
+- lib/dentaku/ast/functions/xor.rb
 - lib/dentaku/ast/grouping.rb
 - lib/dentaku/ast/identifier.rb
 - lib/dentaku/ast/literal.rb
@@ -209,6 +211,7 @@ files:
 - lib/dentaku/exceptions.rb
 - lib/dentaku/flat_hash.rb
 - lib/dentaku/parser.rb
+- lib/dentaku/print_visitor.rb
 - lib/dentaku/string_casing.rb
 - lib/dentaku/token.rb
 - lib/dentaku/token_matcher.rb
@@ -216,9 +219,12 @@ files:
 - lib/dentaku/token_scanner.rb
 - lib/dentaku/tokenizer.rb
 - lib/dentaku/version.rb
+- lib/dentaku/visitor/infix.rb
 - spec/ast/addition_spec.rb
+- spec/ast/all_spec.rb
 - spec/ast/and_function_spec.rb
 - spec/ast/and_spec.rb
+- spec/ast/any_spec.rb
 - spec/ast/arithmetic_spec.rb
 - spec/ast/avg_spec.rb
 - spec/ast/case_spec.rb
@@ -235,12 +241,14 @@ files:
 - spec/ast/node_spec.rb
 - spec/ast/numeric_spec.rb
 - spec/ast/or_spec.rb
+- spec/ast/pluck_spec.rb
 - spec/ast/round_spec.rb
 - spec/ast/rounddown_spec.rb
 - spec/ast/roundup_spec.rb
 - spec/ast/string_functions_spec.rb
 - spec/ast/sum_spec.rb
 - spec/ast/switch_spec.rb
+- spec/ast/xor_spec.rb
 - spec/benchmark.rb
 - spec/bulk_expression_solver_spec.rb
 - spec/calculator_spec.rb
@@ -248,16 +256,19 @@ files:
 - spec/exceptions_spec.rb
 - spec/external_function_spec.rb
 - spec/parser_spec.rb
+- spec/print_visitor_spec.rb
 - spec/spec_helper.rb
 - spec/token_matcher_spec.rb
 - spec/token_scanner_spec.rb
 - spec/token_spec.rb
 - spec/tokenizer_spec.rb
+- spec/visitor/infix_spec.rb
+- spec/visitor_spec.rb
 homepage: http://github.com/rubysolo/dentaku
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -272,14 +283,16 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.9
+signing_key:
 specification_version: 4
 summary: A formula language parser and evaluator
 test_files:
 - spec/ast/addition_spec.rb
+- spec/ast/all_spec.rb
 - spec/ast/and_function_spec.rb
 - spec/ast/and_spec.rb
+- spec/ast/any_spec.rb
 - spec/ast/arithmetic_spec.rb
 - spec/ast/avg_spec.rb
 - spec/ast/case_spec.rb
@@ -296,12 +309,14 @@ test_files:
 - spec/ast/node_spec.rb
 - spec/ast/numeric_spec.rb
 - spec/ast/or_spec.rb
+- spec/ast/pluck_spec.rb
 - spec/ast/round_spec.rb
 - spec/ast/rounddown_spec.rb
 - spec/ast/roundup_spec.rb
 - spec/ast/string_functions_spec.rb
 - spec/ast/sum_spec.rb
 - spec/ast/switch_spec.rb
+- spec/ast/xor_spec.rb
 - spec/benchmark.rb
 - spec/bulk_expression_solver_spec.rb
 - spec/calculator_spec.rb
@@ -309,8 +324,11 @@ test_files:
 - spec/exceptions_spec.rb
 - spec/external_function_spec.rb
 - spec/parser_spec.rb
+- spec/print_visitor_spec.rb
 - spec/spec_helper.rb
 - spec/token_matcher_spec.rb
 - spec/token_scanner_spec.rb
 - spec/token_spec.rb
 - spec/tokenizer_spec.rb
+- spec/visitor/infix_spec.rb
+- spec/visitor_spec.rb