kalc 0.5.5 → 0.5.6

data/lib/kalc/ast.rb

@@ -107,14 +107,10 @@ module Kalc
       end
 
       def eval(context)
+      
         @ops.inject(@left.eval(context)) { |x, op|
-          if op[:right].kind_of? Kalc::Ast::Ops
-            a = Arithmetic.new(x, op[:right].left.eval(context), op[:operator])
-            Ops.new(a, op[:right].ops).eval(context)
-          else
-            a = Arithmetic.new(x, op[:right].eval(context), op[:operator])
-            a.eval(context)
-          end
+          a = Arithmetic.new(x, op[:right].eval(context), op[:operator])
+          a.eval(context)
         }
       end
 

data/lib/kalc/grammar.rb

@@ -184,7 +184,7 @@ class Kalc::Grammar < Parslet::Parser
   rule(:additive_expression) {
     multiplicative_expression.as(:left) >> 
       ((add | subtract) >> 
-        additive_expression.as(:right)).repeat.as(:ops)
+        multiplicative_expression.as(:right)).repeat.as(:ops)
   }
 
   # 1 < 2

data/lib/kalc/version.rb

@@ -1,3 +1,3 @@
 module Kalc
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kalc
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-19 00:00:00.000000000 Z
+date: 2012-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake