kalc 0.8.1 → 0.9.0

data/spec/interpreter_spec.rb

@@ -6,90 +6,90 @@ describe Kalc::Interpreter do
     @transform = Kalc::Transform.new
   end
 
-  it { evaluate("2 + 2").should == 4 }
-  it { evaluate("1 + 1").should == 2.0 }
-  it { evaluate("4 + 1").should == 5 }
-  it { evaluate("5 + 5").should == 10 }
-  
-  it { evaluate("5 / 5").should == 1 }
-  
-  it { evaluate("5 / 4 / 2").should == 0.625 }
-  it { evaluate("5/4/2").should == 0.625 }
+  it { evaluate('2 + 2').should == 4 }
+  it { evaluate('1 + 1').should == 2.0 }
+  it { evaluate('4 + 1').should == 5 }
+  it { evaluate('5 + 5').should == 10 }
 
-  it { evaluate("6 * 2 / 3").should == 4 }
+  it { evaluate('5 / 5').should == 1 }
 
-  it { evaluate("10 > 9").should == true }
-  it { evaluate("10 < 9").should == false }
+  it { evaluate('5 / 4 / 2').should == 0.625 }
+  it { evaluate('5/4/2').should == 0.625 }
 
-  it { evaluate("10 + 19 + 11 * 3").should == 62 }
+  it { evaluate('6 * 2 / 3').should == 4 }
 
-  it { evaluate("10 >= 10").should == true }
+  it { evaluate('10 > 9').should == true }
+  it { evaluate('10 < 9').should == false }
 
-  it { evaluate("ABS(-1 + -2)").should == 3 }
+  it { evaluate('10 + 19 + 11 * 3').should == 62 }
 
-  it "should be able to load variables" do
-    evaluate("a := 1; 1 + a").should == 2
-    evaluate("a := 1; b := 2; 1 + b").should == 3
+  it { evaluate('10 >= 10').should == true }
+
+  it { evaluate('ABS(-1 + -2)').should == 3 }
+
+  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 quoted variables" do
+  it 'should be able to load quoted variables' do
     evaluate("'Item (a)' := 1; 1 + 'Item (a)'").should == 2
     evaluate("'a' := 1; 'b[a]' := 2 + 'a'; 1 + 'b[a]'").should == 4
   end
 
-  it "should be able to load single quoted variables" do
+  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('((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 }
+  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 }
 
-  context "Negative numbers" do
-    it { evaluate("-2").should == -2 }
-    it { evaluate("-1000").should == -1000 }
-    it { evaluate("-1000.0001").should == -1000.0001 }
-    it { evaluate("1 + -1").should == 0 }
-    it { evaluate("1 + -10").should == -9 }
+  context 'Negative numbers' do
+    it { evaluate('-2').should == -2 }
+    it { evaluate('-1000').should == -1000 }
+    it { evaluate('-1000.0001').should == -1000.0001 }
+    it { evaluate('1 + -1').should == 0 }
+    it { evaluate('1 + -10').should == -9 }
   end
 
-  context "Positive numbers" do
-    it { evaluate("1 + +1").should == 2 }
-    it { evaluate("1 + +1 - 1").should == 1 }
-    it { evaluate("+10000.0001").should == 10000.0001 }
+  context 'Positive numbers' do
+    it { evaluate('1 + +1').should == 2 }
+    it { evaluate('1 + +1 - 1').should == 1 }
+    it { evaluate('+10000.0001').should == 10000.0001 }
   end
 
-  context "Boolean value" do
-    it { evaluate("TRUE").should == true }
-    it { evaluate("FALSE").should == false }
-    it { evaluate("FALSE || TRUE").should == true }
-    it { evaluate("FALSE && TRUE").should == false }
+  context 'Boolean value' do
+    it { evaluate('TRUE').should == true }
+    it { evaluate('FALSE').should == false }
+    it { evaluate('FALSE || TRUE').should == true }
+    it { evaluate('FALSE && TRUE').should == false }
   end
 
-  context "Floating point number" do
-    it { evaluate("1.01").should == 1.01 }
-    it { evaluate("1.01 + 0.02").should == 1.03 }
-    it { evaluate("1.01 - 0.01").should == 1 }
-    it { evaluate("1.1 + 1.1").should == 2.2 }
-    it { evaluate("1.01 = 1.01").should == true }
-    it { evaluate("1.01 = 1.02").should == false }
+  context 'Floating point number' do
+    it { evaluate('1.01').should == 1.01 }
+    it { evaluate('1.01 + 0.02').should == 1.03 }
+    it { evaluate('1.01 - 0.01').should == 1 }
+    it { evaluate('1.1 + 1.1').should == 2.2 }
+    it { evaluate('1.01 = 1.01').should == true }
+    it { evaluate('1.01 = 1.02').should == false }
   end
 
-  context "Ternary" do
-    it { evaluate("1 > 2 ? 1 : 2").should == 2 }
+  context 'Ternary' do
+    it { evaluate('1 > 2 ? 1 : 2').should == 2 }
   end
 
-  context "Exponents" do
-    it { evaluate("1.23e+10").should == 12300000000.0 }
-    it { evaluate("1.23e-10").should == 1.23e-10 }
+  context 'Exponents' do
+    it { evaluate('1.23e+10').should == 12300000000.0 }
+    it { evaluate('1.23e-10').should == 1.23e-10 }
   end
 
-  context "Numbers starting with a decimal point" do
-    it { evaluate("0.4").should == 0.4 }
-    it { evaluate(".4").should == 0.4 }
+  context 'Numbers starting with a decimal point' do
+    it { evaluate('0.4').should == 0.4 }
+    it { evaluate('.4').should == 0.4 }
   end
 
   private

data/spec/stdlib_spec.rb

@@ -5,49 +5,49 @@ class Kalc::Stdlib
 end
 
 describe Kalc::Stdlib do
-  
+
   before(:each) do
     @grammar = Kalc::Grammar.new
     @transform = Kalc::Transform.new
   end
 
-  describe "PLUS_ONE" do
-    it { evaluate("PLUS_ONE(1)").should == 2 }
-    it { evaluate("PLUS_ONE(101)").should == 102 }
-    it { evaluate("PLUS_ONE(0)").should == 1 }
-    it { evaluate("PLUS_ONE(-1)").should == 0 }
+  describe 'PLUS_ONE' do
+    it { evaluate('PLUS_ONE(1)').should == 2 }
+    it { evaluate('PLUS_ONE(101)').should == 102 }
+    it { evaluate('PLUS_ONE(0)').should == 1 }
+    it { evaluate('PLUS_ONE(-1)').should == 0 }
   end
 
-  describe "MINUS_ONE" do
-    it { evaluate("MINUS_ONE(1)").should == 0 }
-    it { evaluate("MINUS_ONE(101)").should == 100 }
-    it { evaluate("MINUS_ONE(0)").should == -1 }
-    it { evaluate("MINUS_ONE(-1)").should == -2 }
+  describe 'MINUS_ONE' do
+    it { evaluate('MINUS_ONE(1)').should == 0 }
+    it { evaluate('MINUS_ONE(101)').should == 100 }
+    it { evaluate('MINUS_ONE(0)').should == -1 }
+    it { evaluate('MINUS_ONE(-1)').should == -2 }
   end
 
-  describe "SQUARE" do
-    it { evaluate("SQUARE(2)").should == 4 }
-    it { evaluate("SQUARE(4)").should == 16 }
+  describe 'SQUARE' do
+    it { evaluate('SQUARE(2)').should == 4 }
+    it { evaluate('SQUARE(4)').should == 16 }
   end
 
-  describe "CUBE" do
-    it { evaluate("CUBE(2)").should == 8 }
-    it { evaluate("CUBE(4)").should == 64 }
+  describe 'CUBE' do
+    it { evaluate('CUBE(2)').should == 8 }
+    it { evaluate('CUBE(4)').should == 64 }
   end
 
-  describe "FIB" do
-    it { evaluate("FIB(1)").should == 1 }
-    it { evaluate("FIB(10)").should == 55 }
+  describe 'FIB' do
+    it { evaluate('FIB(1)').should == 1 }
+    it { evaluate('FIB(10)').should == 55 }
   end
 
-  describe "FACTORIAL" do
-    it { evaluate("FACTORIAL(1)").should == 1 }
-    it { evaluate("FACTORIAL(5)").should == 120 }
+  describe 'FACTORIAL' do
+    it { evaluate('FACTORIAL(1)').should == 1 }
+    it { evaluate('FACTORIAL(5)').should == 120 }
   end
 
-  describe "TOWERS_OF_HANOI" do
-    it { evaluate("TOWERS_OF_HANOI(4)").should == 15 }
-    it { evaluate("TOWERS_OF_HANOI(10)").should == 1023 }
+  describe 'TOWERS_OF_HANOI' do
+    it { evaluate('TOWERS_OF_HANOI(4)').should == 15 }
+    it { evaluate('TOWERS_OF_HANOI(10)').should == 1023 }
   end
 
   private

metadata

@@ -1,64 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: kalc
 version: !ruby/object:Gem::Version
-  version: 0.8.1
-  prerelease: 
+  version: 0.9.0
+  prerelease:
 platform: ruby
 authors:
 - Chris Parker
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-08-30 00:00:00.000000000 Z
+date: 2013-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: parslet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: '1.5'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.5'
+    none: false
+  prerelease: false
+  type: :runtime
 description: Calculation language slightly based on Excel's formula language.
 email:
 - mrcsparker@gmail.com
@@ -93,26 +93,32 @@ files:
 - spec/stdlib_spec.rb
 homepage: https://github.com/mrcsparker/kalc
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
       version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      hash: 2
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
+      segments:
+      - 0
       version: '0'
+      hash: 2
+  none: false
 requirements: []
 rubyforge_project: kalc
 rubygems_version: 1.8.24
-signing_key: 
+signing_key:
 specification_version: 3
 summary: Small calculation language.
 test_files:
@@ -120,4 +126,3 @@ test_files:
 - spec/interpreter_spec.rb
 - spec/spec_helper.rb
 - spec/stdlib_spec.rb
-has_rdoc: