kalc 0.5 → 0.5.1

data/lib/kalc/ast.rb

@@ -58,6 +58,24 @@ module Kalc
       end
     end
 
+    class Ops
+      attr_reader :left
+      attr_reader :ops
+      
+      def initialize(left, ops)
+        @left = left
+        @ops = ops
+      end
+
+      def eval(context)
+        @ops.inject(@left.eval(context)) { |x, op|
+          a = Arithmetic.new(x, op[:right].eval(context), op[:operator])
+          a.eval(context) 
+        }
+      end
+
+    end
+
     class Arithmetic
       attr_reader :left
       attr_reader :right
@@ -70,10 +88,6 @@ module Kalc
       end
 
       def eval(context)
-
-        @left = @left.eval(context)
-        @right = @right.eval(context)
-
         case @operator.to_s.strip
         when '&&'
           @left && @right

data/lib/kalc/grammar.rb

@@ -165,18 +165,16 @@ class Kalc::Grammar < Parslet::Parser
 
   # 1 * 2
   rule(:multiplicative_expression) {
-    function_call_expression.as(:left) >>
-      (power_of | multiply | divide | modulus) >> 
-      multiplicative_expression.as(:right) |
-    function_call_expression
+    function_call_expression.as(:left) >> 
+      ((power_of | multiply | divide | modulus) >> 
+        multiplicative_expression.as(:right)).repeat.as(:ops)
   }
 
   # 1 + 2
   rule(:additive_expression) {
     multiplicative_expression.as(:left) >> 
-      (add | subtract) >> 
-      additive_expression.as(:right) |
-    multiplicative_expression
+      ((add | subtract) >> 
+        additive_expression.as(:right)).repeat.as(:ops)
   }
 
   # 1 < 2
@@ -185,43 +183,38 @@ class Kalc::Grammar < Parslet::Parser
   # 1 >= 2
   rule(:relational_expression) {
     additive_expression.as(:left) >> 
-      (less | greater | less_equal | greater_equal) >>
-      relational_expression.as(:right) |
-    additive_expression
+      ((less | greater | less_equal | greater_equal) >>
+        relational_expression.as(:right)).repeat.as(:ops)
   }
 
   # 1 == 2
   rule(:equality_expression) {
     relational_expression.as(:left) >>
-      (equal | not_equal) >>
-      equality_expression.as(:right) |
-    relational_expression
+      ((equal | not_equal) >>
+        equality_expression.as(:right)).repeat.as(:ops)
   }
 
   # 1 && 2
   rule(:logical_and_expression) {
     equality_expression.as(:left) >>
-      (logical_and | string_and) >>
-      logical_and_expression.as(:right) |
-    equality_expression
+      ((logical_and | string_and) >>
+        logical_and_expression.as(:right)).repeat.as(:ops)
   }
 
   # 1 || 2
   rule(:logical_or_expression) {
     logical_and_expression.as(:left) >>
-      (logical_or | string_or) >>
-      logical_or_expression.as(:right) |
-    logical_and_expression
+      ((logical_or | string_or) >>
+        logical_or_expression.as(:right)).repeat.as(:ops)
   }
 
   # 1 > 2 ? 3 : 4
   rule(:conditional_expression) {
     logical_or_expression.as(:condition) >> 
-      question_mark >> 
-      conditional_expression.as(:true) >> 
-      colon >> 
-      conditional_expression.as(:false) | 
-    logical_or_expression
+      (question_mark >> 
+        conditional_expression.as(:true) >> 
+        colon >> 
+        conditional_expression.as(:false)).maybe
   }
 
   # 'a' = 1

data/lib/kalc/transform.rb

@@ -1,6 +1,18 @@
 module Kalc
   class Transform < Parslet::Transform
-    
+
+    rule(:condition => subtree(:condition)) { 
+      condition 
+    }
+
+    rule(:left => subtree(:left), :ops => []) { 
+      left 
+    }
+
+    rule(:right => subtree(:right), :ops => []) { 
+      right 
+    }
+
     rule(:commands => sequence(:commands)) {
       Ast::Commands.new(commands)
     }
@@ -16,7 +28,7 @@ module Kalc
     rule(:expressions => simple(:expressions)) {
       Ast::Expressions.new([expressions])
     }
-   
+
     rule(:string => simple(:string)) {
       Ast::StringValue.new(string)
     }
@@ -29,16 +41,8 @@ module Kalc
       Ast::FloatingPointNumber.new(number) 
     }
 
-    rule(:left => subtree(:tree)) {
-      tree
-    }
-
-    rule(:right => subtree(:tree)) {
-      tree
-    }
-
-    rule(:line => subtree(:tree)) {
-      tree
+    rule(:left => simple(:left), :ops => subtree(:ops)) {
+      Ast::Ops.new(left, ops)
     }
 
     rule(:left => simple(:left), :right => simple(:right), :operator => simple(:operator)) { 

data/lib/kalc/version.rb

@@ -1,3 +1,3 @@
 module Kalc
-  VERSION = "0.5"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kalc
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-07 00:00:00.000000000 Z
+date: 2012-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70142802434300 !ruby/object:Gem::Requirement
+  requirement: &70319428937140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142802434300
+  version_requirements: *70319428937140
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70142802433760 !ruby/object:Gem::Requirement
+  requirement: &70319428936560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70142802433760
+  version_requirements: *70319428936560
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &70142802433140 !ruby/object:Gem::Requirement
+  requirement: &70319428935920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +43,7 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70142802433140
+  version_requirements: *70319428935920
 description: Calculation language slightly based on Excel's formula language.
 email:
 - mrcsparker@gmail.com