dentaku 0.2.3 → 0.2.4

data/lib/dentaku/evaluator.rb

@@ -9,6 +9,8 @@ module Dentaku
     T_ADDSUB     = TokenMatcher.new(:operator, [:add, :subtract])
     T_MULDIV     = TokenMatcher.new(:operator, [:multiply, :divide])
     T_COMPARATOR = TokenMatcher.new(:comparator)
+    T_COMP_GT    = TokenMatcher.new(:comparator, [:gt, :ge])
+    T_COMP_LT    = TokenMatcher.new(:comparator, [:lt, :le])
     T_OPEN       = TokenMatcher.new(:grouping, :open)
     T_CLOSE      = TokenMatcher.new(:grouping, :close)
     T_COMMA      = TokenMatcher.new(:grouping, :comma)
@@ -24,6 +26,8 @@ module Dentaku
     P_GROUP      = [T_OPEN,    T_NON_GROUP_STAR, T_CLOSE]
     P_MATH_ADD   = [T_NUMERIC, T_ADDSUB,         T_NUMERIC]
     P_MATH_MUL   = [T_NUMERIC, T_MULDIV,         T_NUMERIC]
+    P_RANGE_ASC  = [T_NUMERIC, T_COMP_LT,        T_NUMERIC, T_COMP_LT, T_NUMERIC]
+    P_RANGE_DESC = [T_NUMERIC, T_COMP_GT,        T_NUMERIC, T_COMP_GT, T_NUMERIC]
     P_NUM_COMP   = [T_NUMERIC, T_COMPARATOR,     T_NUMERIC]
     P_STR_COMP   = [T_STRING,  T_COMPARATOR,     T_STRING]
     P_COMBINE    = [T_LOGICAL, T_COMBINATOR,     T_LOGICAL]
@@ -40,6 +44,8 @@ module Dentaku
       [P_GROUP,      :evaluate_group],
       [P_MATH_MUL,   :apply],
       [P_MATH_ADD,   :apply],
+      [P_RANGE_ASC,  :expand_range],
+      [P_RANGE_DESC, :expand_range],
       [P_NUM_COMP,   :apply],
       [P_STR_COMP,   :apply],
       [P_COMBINE,    :apply]
@@ -72,7 +78,7 @@ module Dentaku
 
     def evaluate_step(token_stream, start, length, evaluator)
       expr = token_stream.slice!(start, length)
-      token_stream.insert start, self.send(evaluator, *expr)
+      token_stream.insert start, *self.send(evaluator, *expr)
     end
 
     def find_rule_match(pattern, token_stream)
@@ -124,6 +130,10 @@ module Dentaku
       end
     end
 
+    def expand_range(left, oper1, middle, oper2, right)
+      [left, oper1, middle, Token.new(:combinator, :and), middle, oper2, right]
+    end
+
     def if(*args)
       _, open, condition, _, true_value, _, false_value, close = args
 

data/lib/dentaku/tokenizer.rb

@@ -6,9 +6,9 @@ module Dentaku
   class Tokenizer
     SCANNERS = [
       TokenScanner.new(:whitespace, '\s+'),
-      TokenScanner.new(:numeric,    '(\d+(\.\d+)?|\.\d+)', lambda{|raw| raw =~ /\./ ? raw.to_f : raw.to_i }),
-      TokenScanner.new(:string,     '"[^"]*"',    lambda{|raw| raw.gsub(/^"|"$/, '') }),
-      TokenScanner.new(:string,     "'[^']*'",    lambda{|raw| raw.gsub(/^'|'$/, '') }),
+      TokenScanner.new(:numeric,    '(\d+(\.\d+)?|\.\d+)', lambda { |raw| raw =~ /\./ ? raw.to_f : raw.to_i }),
+      TokenScanner.new(:string,     '"[^"]*"',    lambda { |raw| raw.gsub(/^"|"$/, '') }),
+      TokenScanner.new(:string,     "'[^']*'",    lambda { |raw| raw.gsub(/^'|'$/, '') }),
       TokenScanner.new(:operator,   '\+|-|\*|\/', lambda do |raw|
         case raw
         when '+' then :add
@@ -35,9 +35,9 @@ module Dentaku
         when '='  then :eq
         end
       end),
-      TokenScanner.new(:combinator, '(and|or)\b',   lambda {|raw| raw.strip.downcase.to_sym }),
-      TokenScanner.new(:function,   '(if|round)\b', lambda {|raw| raw.strip.to_sym }),
-      TokenScanner.new(:identifier, '[a-z_]+',      lambda {|raw| raw.downcase.to_sym })
+      TokenScanner.new(:combinator, '(and|or)\b',   lambda { |raw| raw.strip.downcase.to_sym }),
+      TokenScanner.new(:function,   '(if|round)\b', lambda { |raw| raw.strip.to_sym }),
+      TokenScanner.new(:identifier, '[a-z_]+',      lambda { |raw| raw.downcase.to_sym })
     ]
 
     LPAREN = TokenMatcher.new(:grouping, :open)

data/lib/dentaku/version.rb

@@ -1,3 +1,3 @@
 module Dentaku
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

data/spec/evaluator_spec.rb

@@ -60,6 +60,17 @@ describe Dentaku::Evaluator do
         evaluator.evaluate(token_stream(5, :gt, 1)).should be_true
       end
 
+      it 'should expand inequality ranges' do
+        stream   = token_stream(5, :lt, 10, :le, 10)
+        expected = token_stream(5, :lt, 10, :and, 10, :le, 10)
+        evaluator.evaluate_step(stream, 0, 5, :expand_range).should eq(expected)
+
+        evaluator.evaluate(token_stream(5, :lt, 10, :le, 10)).should be_true
+        evaluator.evaluate(token_stream(3, :gt,  5, :ge,  1)).should be_false
+
+        lambda { evaluator.evaluate(token_stream(3, :gt,  2, :lt,   1)) }.should raise_error
+      end
+
       it 'should evaluate combined conditionals' do
         evaluator.evaluate(token_stream(5, :gt, 1, :or, :false)).should be_true
         evaluator.evaluate(token_stream(5, :gt, 1, :and, :false)).should be_false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000 Z
+date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70181931083120 !ruby/object:Gem::Requirement
+  requirement: &70240118188300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70181931083120
+  version_requirements: *70240118188300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70181931082440 !ruby/object:Gem::Requirement
+  requirement: &70240118187880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70181931082440
+  version_requirements: *70240118187880
 description: ! '    Dentaku is a parser and evaluator for mathematical formulas
 
 '
@@ -75,21 +75,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2425877477882422646
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -2425877477882422646
 requirements: []
 rubyforge_project: dentaku
-rubygems_version: 1.8.15
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: A formula language parser and evaluator