dentaku 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5b3af0752b4a5aa4575036f593ead2f9df154721
-  data.tar.gz: ab61cb8ebd50a48d179197724019a6f5ec167556
+  metadata.gz: 2b6c2a647d615b07bb92995438da601259cb87f3
+  data.tar.gz: 75c685525c0eb619726c0d03ded7401573eaaf33
 SHA512:
-  metadata.gz: 58d3524e23835e1c842e35a91390c8601cb59fd5da31efdd234edb2e7551399e5b0c176f4f30cbb2f5b849f6cceab16661ae473a95b8ca32fc56913ec8f0f580
-  data.tar.gz: 697075e3d8a11586404c83b2ea0ff685079ab0dc3b80123e87fecfc411d4913a0012573ac7ec87eca55a6205d5957723a7a0e5edcaf8bc295b2937d096ac8667
+  metadata.gz: 7035e118512d9c98dbcc31cb510358e8ca5fee3b98b9bb2242671a7ede8c8ae0c1e4028869367615b9c91a9ff82cece3c13e70032547ef432539c9d0b8986be1
+  data.tar.gz: fb40309c2d88b7036462a4acb372753350b6655a519fa165a0f534a5464a50088cd53aa908c33e59c06bb957e69305190bd33361805d6346961c8a04126a39a7

data/lib/dentaku/evaluator.rb

@@ -102,6 +102,10 @@ module Dentaku
       Token.new(base.category, base.value ** (exp.value * -1))
     end
 
+    def mul_negate(val1, _, _, val2)
+      Token.new(val1.category, val1.value * val2.value * -1)
+    end
+
     def percentage(token, _)
       Token.new(token.category, token.value / 100.0)
     end

data/lib/dentaku/rules.rb

@@ -18,6 +18,7 @@ module Dentaku
         [ p(:math_neg_pow), :pow_negate     ],
         [ p(:math_mod),     :apply          ],
         [ p(:math_mul),     :apply          ],
+        [ p(:math_neg_mul), :mul_negate     ],
         [ p(:math_add),     :apply          ],
         [ p(:percentage),   :percentage     ],
         [ p(:negation),     :negate         ],
@@ -69,7 +70,7 @@ module Dentaku
         :comparator, :comp_gt, :comp_lt, :fopen, :open, :close, :comma,
         :non_close_plus, :non_group, :non_group_star, :arguments,
         :logical, :combinator, :if, :round, :roundup, :rounddown, :not,
-        :anchored_minus, :math_neg_pow
+        :anchored_minus, :math_neg_pow, :math_neg_mul
       ].each_with_object({}) do |name, matchers|
         matchers[name] = TokenMatcher.send(name)
       end
@@ -80,6 +81,7 @@ module Dentaku
         group:        pattern(:open,     :non_group_star, :close),
         math_add:     pattern(:numeric,  :addsub,         :numeric),
         math_mul:     pattern(:numeric,  :muldiv,         :numeric),
+        math_neg_mul: pattern(:numeric,  :muldiv,         :subtract, :numeric),
         math_pow:     pattern(:numeric,  :pow,            :numeric),
         math_neg_pow: pattern(:numeric,  :pow,            :subtract, :numeric),
         math_mod:     pattern(:numeric,  :mod,            :numeric),

data/lib/dentaku/version.rb

@@ -1,3 +1,3 @@
 module Dentaku
-  VERSION = "1.2.3"
+  VERSION = "1.2.4"
 end

data/spec/calculator_spec.rb

@@ -24,6 +24,8 @@ describe Dentaku::Calculator do
     expect(calculator.evaluate('-num + 3', :num => 2)).to eq(1)
     expect(calculator.evaluate('10 ^ 2')).to eq(100)
     expect(calculator.evaluate('0 * 10 ^ -5')).to eq(0)
+    expect(calculator.evaluate('3 + 0 * -3')).to eq(3)
+    expect(calculator.evaluate('3 + 0 / -3')).to eq(3)
   end
 
   describe 'memory' do

data/spec/evaluator_spec.rb

@@ -46,6 +46,7 @@ describe Dentaku::Evaluator do
       expect(evaluator.evaluate(token_stream(1, :subtract, :subtract, 1))).to eq(2)
       expect(evaluator.evaluate(token_stream(1, :subtract, :subtract, :subtract, 1))).to eq(0)
       expect(evaluator.evaluate(token_stream(:subtract, 1, :add, 1))).to eq(0)
+      expect(evaluator.evaluate(token_stream(3, :add, 0, :multiply, :subtract, 3))).to eq(3)
     end
 
     it 'evaluates a number multiplied by an exponent' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dentaku
 version: !ruby/object:Gem::Version
-  version: 1.2.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Solomon White
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-23 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake