kalc 0.5.1 → 0.5.2

data/lib/kalc/ast.rb

@@ -17,7 +17,6 @@ module Kalc
       end
     end
 
-
     class Expressions
       attr_reader :expressions
 
@@ -34,6 +33,22 @@ module Kalc
       end
     end
 
+    class Negative
+      attr_reader :value
+
+      def initialize(value)
+        @value = value
+      end
+
+      def eval(context)
+        begin
+          -(@value.eval(context))
+        rescue
+          @value.eval(context)
+        end
+      end
+    end
+
     class BooleanValue
       attr_reader :value
 

data/lib/kalc/grammar.rb

@@ -160,7 +160,7 @@ class Kalc::Grammar < Parslet::Parser
   # AND(1, 2, ...)
   rule(:function_call_expression) {
     (identifier.as(:name) >> paren_variable_list.as(:variable_list)).as(:function_call) |
-    atom
+    (str('-') >> atom).as(:negative) | atom
   }
 
   # 1 * 2

data/lib/kalc/transform.rb

@@ -21,6 +21,10 @@ module Kalc
       Ast::Commands.new([commands])
     }
 
+    rule(:negative => simple(:negative)) {
+      Ast::Negative.new(negative)
+    }
+
     rule(:expressions => sequence(:expressions)) {
       Ast::Expressions.new(expressions)
     }

data/lib/kalc/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kalc
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000 Z
+date: 2012-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70319428937140 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70319428937140
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70319428936560 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70319428936560
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: &70319428935920 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,7 +53,12 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70319428935920
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: Calculation language slightly based on Excel's formula language.
 email:
 - mrcsparker@gmail.com
@@ -91,7 +106,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: kalc
-rubygems_version: 1.8.15
+rubygems_version: 1.8.19
 signing_key: 
 specification_version: 3
 summary: Small calculation language.