kalc 0.5.6 → 0.5.7

data/lib/kalc/ast.rb

@@ -107,7 +107,6 @@ module Kalc
       end
 
       def eval(context)
-      
         @ops.inject(@left.eval(context)) { |x, op|
           a = Arithmetic.new(x, op[:right].eval(context), op[:operator])
           a.eval(context)

data/lib/kalc/grammar.rb

@@ -156,28 +156,17 @@ class Kalc::Grammar < Parslet::Parser
     left_paren >> conditional_expression >> right_paren
   }
 
-  rule(:non_ops_atom) {
-    paren_expression.as(:paren_expression) | variable.as(:variable) | number
-  }
-
   rule(:non_ops_expression) {
-    (non_ops_atom.as(:left) >> 
+    (atom.as(:left) >> 
       power_of >>
-      non_ops_atom.as(:right)).as(:non_ops)
+      atom.as(:right)).as(:non_ops) | atom
   }
 
   # IF(1, 2, 3)
   # AND(1, 2, ...)
   rule(:function_call_expression) {
     (identifier.as(:name) >> paren_variable_list.as(:variable_list)).as(:function_call) |
-    (str('-') >> atom).as(:negative) | atom
-  }
-
-  # 1 * 2
-  rule(:multiplicative_expression) {
-    (non_ops_expression | function_call_expression).as(:left) >> 
-      ((multiply | divide | modulus) >> 
-        multiplicative_expression.as(:right)).repeat.as(:ops)
+    (str('-') >> non_ops_expression).as(:negative) | non_ops_expression
   }
 
   # 1 + 2
@@ -187,6 +176,13 @@ class Kalc::Grammar < Parslet::Parser
         multiplicative_expression.as(:right)).repeat.as(:ops)
   }
 
+  # 1 * 2
+  rule(:multiplicative_expression) {
+    function_call_expression.as(:left) >> 
+      ((multiply | divide | modulus) >> 
+        function_call_expression.as(:right)).repeat.as(:ops)
+  }
+
   # 1 < 2
   # 1 > 2
   # 1 <= 2

data/lib/kalc/version.rb

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

data/spec/interpreter_spec.rb

@@ -10,6 +10,13 @@ describe Kalc::Interpreter do
   it { evaluate("1 + 1").should == 2.0 }
   it { evaluate("4 + 1").should == 5 }
   it { evaluate("5 + 5").should == 10 }
+  
+  it { evaluate("5 / 5").should == 1 }
+  
+  it { evaluate("5 / 4 / 2").should == 0.625 }
+  it { evaluate("5/4/2").should == 0.625 }
+
+  it { evaluate("6 * 2 / 3").should == 4 }
 
   it { evaluate("10 > 9").should == true }
   it { evaluate("10 < 9").should == false }

metadata

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