kalc 0.5.4 → 0.5.5

data/lib/kalc/ast.rb

@@ -85,6 +85,18 @@ module Kalc
       end
     end
 
+    class NonOps
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+
+      def eval(context)
+        Arithmetic.new(@value.left.eval(context), @value.right.eval(context), @value.operator).eval(context)
+      end
+    end
+
     class Ops
       attr_reader :left
       attr_reader :ops

data/lib/kalc/grammar.rb

@@ -156,6 +156,16 @@ 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) >> 
+      power_of >>
+      non_ops_atom.as(:right)).as(:non_ops)
+  }
+
   # IF(1, 2, 3)
   # AND(1, 2, ...)
   rule(:function_call_expression) {
@@ -165,8 +175,8 @@ class Kalc::Grammar < Parslet::Parser
 
   # 1 * 2
   rule(:multiplicative_expression) {
-    function_call_expression.as(:left) >> 
-      ((power_of | multiply | divide | modulus) >> 
+    (non_ops_expression | function_call_expression).as(:left) >> 
+      ((multiply | divide | modulus) >> 
         multiplicative_expression.as(:right)).repeat.as(:ops)
   }
 

data/lib/kalc/transform.rb

@@ -13,6 +13,14 @@ module Kalc
       right 
     }
 
+    rule(:left => subtree(:left), :non_ops => []) { 
+      left 
+    }
+
+    rule(:right => subtree(:right), :non_ops => []) { 
+      right 
+    }
+
     rule(:commands => sequence(:commands)) {
       Ast::Commands.new(commands)
     }
@@ -45,6 +53,10 @@ module Kalc
       Ast::FloatingPointNumber.new(number) 
     }
 
+    rule(:non_ops => subtree(:non_ops)) {
+      Ast::NonOps.new(non_ops)
+    }
+
     rule(:left => simple(:left), :ops => subtree(:ops)) {
       Ast::Ops.new(left, ops)
     }

data/lib/kalc/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kalc
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
   prerelease: 
 platform: ruby
 authors: