kalc 0.4 → 0.5

data/kalc.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |s|
   # specify any dependencies here; for example:
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
-  s.add_runtime_dependency "parslet", "~> 1.2"
+  s.add_runtime_dependency "parslet", "~> 1.3"
 end

data/lib/kalc/grammar.rb

@@ -165,7 +165,7 @@ class Kalc::Grammar < Parslet::Parser
 
   # 1 * 2
   rule(:multiplicative_expression) {
-    function_call_expression.as(:left) >> 
+    function_call_expression.as(:left) >>
       (power_of | multiply | divide | modulus) >> 
       multiplicative_expression.as(:right) |
     function_call_expression

data/lib/kalc/transform.rb

@@ -29,6 +29,18 @@ 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), :right => simple(:right), :operator => simple(:operator)) { 
       Ast::Arithmetic.new(left, right, operator)
     }

data/lib/kalc/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kalc
 version: !ruby/object:Gem::Version
-  version: '0.4'
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70227178471520 !ruby/object:Gem::Requirement
+  requirement: &70142802434300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227178471520
+  version_requirements: *70142802434300
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70227178471100 !ruby/object:Gem::Requirement
+  requirement: &70142802433760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,18 +32,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70227178471100
+  version_requirements: *70142802433760
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &70227178470600 !ruby/object:Gem::Requirement
+  requirement: &70142802433140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70227178470600
+  version_requirements: *70142802433140
 description: Calculation language slightly based on Excel's formula language.
 email:
 - mrcsparker@gmail.com