kalc 0.5.7.1 → 0.5.8

data/lib/kalc/grammar.rb

@@ -122,7 +122,7 @@ class Kalc::Grammar < Parslet::Parser
 
   # Should look like 'Name'
   rule(:variable) {
-    identifier | (str("'") >> identifier >> str("'")) >> spaces?
+    identifier | (str("'") >> spaces? >> identifier.repeat >> str("'")) >> spaces?
   }
 
   # Does not self-evaluate

data/lib/kalc/version.rb

@@ -1,3 +1,3 @@
 module Kalc
-  VERSION = "0.5.7.1"
+  VERSION = "0.5.8"
 end

data/spec/interpreter_spec.rb

@@ -25,6 +25,22 @@ describe Kalc::Interpreter do
 
   it { evaluate("10 >= 10").should == true }
 
+  it "should be able to load variables" do
+    evaluate("a = 1; 1 + a").should == 2
+    evaluate("a = 1; b = 2; 1 + b").should == 3
+  end
+
+  it "should be able to load single quoted variables" do
+    evaluate("'a' = 1; 1 + 'a'").should == 2
+    evaluate("'a' = 1; 'b' = 2; 'b' + 'a'").should == 3
+  
+    evaluate("'a b' = 1; 'a b' + 1").should == 2
+  end
+
+  it { evaluate("((75.0)*(25.0))+((125.0)*(25.0))+((150.0)*(25.0))+((250.0)*(25.0))").should == 15000 }
+
+  it { evaluate("(((40.0)/1000*(4380.0)*(200.0))-((40.0)/1000*(4380.0)*((((75.0)*(25.0))+((125.0)*(25.0))+((150.0)*(25.0))+((250.0)*(25.0)))/(10.0)/(40.0)/(0.8))))*(0.05)").should == 1341.375 }
+
   private
   def evaluate(expression)
     g = @grammar.parse(expression)

metadata

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