dentaku 0.2.4 → 0.2.5

data/lib/dentaku/evaluator.rb

@@ -8,6 +8,7 @@ module Dentaku
     T_STRING     = TokenMatcher.new(:string)
     T_ADDSUB     = TokenMatcher.new(:operator, [:add, :subtract])
     T_MULDIV     = TokenMatcher.new(:operator, [:multiply, :divide])
+    T_POW        = TokenMatcher.new(:operator, :pow)
     T_COMPARATOR = TokenMatcher.new(:comparator)
     T_COMP_GT    = TokenMatcher.new(:comparator, [:gt, :ge])
     T_COMP_LT    = TokenMatcher.new(:comparator, [:lt, :le])
@@ -26,6 +27,7 @@ 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_MATH_POW   = [T_NUMERIC, T_POW,            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]
@@ -42,6 +44,7 @@ module Dentaku
       [P_ROUND_TWO,  :round],
 
       [P_GROUP,      :evaluate_group],
+      [P_MATH_POW,   :apply],
       [P_MATH_MUL,   :apply],
       [P_MATH_ADD,   :apply],
       [P_RANGE_ASC,  :expand_range],
@@ -110,6 +113,7 @@ module Dentaku
       r = rvalue.value
 
       case operator.value
+      when :pow      then Token.new(:numeric, l ** r)
       when :add      then Token.new(:numeric, l + r)
       when :subtract then Token.new(:numeric, l - r)
       when :multiply then Token.new(:numeric, l * r)

data/lib/dentaku/tokenizer.rb

@@ -6,11 +6,12 @@ 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(:operator,   '\+|-|\*|\/', lambda do |raw|
+      TokenScanner.new(:numeric,    '(\d+(\.\d+)?|\.\d+)\b', 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 :pow
         when '+' then :add
         when '-' then :subtract
         when '*' then :multiply
@@ -35,9 +36,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, '\w+\b',        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.4"
+  VERSION = "0.2.5"
 end

data/spec/calculator_spec.rb

@@ -51,6 +51,13 @@ describe Dentaku::Calculator do
     calculator.evaluate('foo * 2', 'foo' => 4).should eq(8)
   end
 
+  it 'should accept digits in identifiers' do
+    calculator.evaluate('foo1 * 2', :foo1 => 2).should eq(4)
+    calculator.evaluate('foo1 * 2', 'foo1' => 4).should eq(8)
+    calculator.evaluate('1foo * 2', '1foo' => 2).should eq(4)
+    calculator.evaluate('fo1o * 2', :fo1o => 4).should eq(8)
+  end
+
   it 'should compare string literals with string variables' do
     calculator.evaluate('fruit = "apple"', :fruit => 'apple').should be_true
     calculator.evaluate('fruit = "apple"', :fruit => 'pear').should be_false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70240118188300 !ruby/object:Gem::Requirement
+  requirement: &70124074683860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240118188300
+  version_requirements: *70124074683860
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70240118187880 !ruby/object:Gem::Requirement
+  requirement: &70124074683380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70240118187880
+  version_requirements: *70124074683380
 description: ! '    Dentaku is a parser and evaluator for mathematical formulas
 
 '
@@ -75,12 +75,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2332951367847572293
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2332951367847572293
 requirements: []
 rubyforge_project: dentaku
 rubygems_version: 1.8.11