kalc 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 2db4867bb104360a3652e3c033a105eb1e0a80d1
+  data.tar.gz: c6d653e2134c519e8b71687b5916f7e0a33f01d2
+SHA512:
+  metadata.gz: 4a39757fde5d95b2d5aaddd5231ff21504ce0d2ae4092a421f412fc2888ee9416d46b6afa0a6d6032677cb507454e1a3e1cb0fa3b3892321abc2cc3557276197
+  data.tar.gz: 2b6a0377c1a3f0ac04bd8214fb0019c0a2fac3508fb625da55785757aef0f1031ae64ef2bccc3de9c02c6e81e3fad97538a4f67edd23bba78178895476511a79

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kalc (1.0.0)
+    kalc (1.0.1)
       parslet (~> 1.6)
 
 GEM
@@ -9,17 +9,22 @@ GEM
   specs:
     blankslate (3.1.3)
     diff-lcs (1.2.5)
-    parslet (1.6.2)
+    parslet (1.7.0)
       blankslate (>= 2.0, <= 4.0)
-    rake (10.1.1)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rake (10.4.2)
+    rspec (3.2.0)
+      rspec-core (~> 3.2.0)
+      rspec-expectations (~> 3.2.0)
+      rspec-mocks (~> 3.2.0)
+    rspec-core (3.2.2)
+      rspec-support (~> 3.2.0)
+    rspec-expectations (3.2.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-mocks (3.2.1)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.2.0)
+    rspec-support (3.2.2)
 
 PLATFORMS
   java

data/README.md

@@ -10,6 +10,17 @@ ikalc
 kalc comes with its own repl, known as `ikalc`. Start it up in your console by
 typing in `ikalc`
 
+The Awesomest Contributors in the World!
+----------------------------------------
+
+These people have made kalc a much more awesome language.
+
+Cristina Matonte
+https://github.com/anitsirc
+
+Mikel Lindsaar
+https://github.com/mikel
+
 Syntax
 ------
 
@@ -107,7 +118,7 @@ Some of them are:
     # Math functions
     ABS, DEGREES, PRODUCT, RADIANS, ROUND, SUM, TRUNC, LN, ACOS,
     ACOSH, ASIN, ASINH, ATAN, ATANH, CBRT, COS, COSH, ERF, ERFC, EXP, GAMMA,
-    LGAMMA, LOG, LOG2, LOG10, SIN, SINH, SQRT, TAN, TANH
+    LGAMMA, LOG, LOG2, LOG10, SIN, SINH, SQRT, TAN, TANH, MIN, MAX, FLOOR, CEILING
 
     # String functions
     CHOMP, CHOP, CHR, CLEAR, COUNT, DOWNCASE, HEX, INSPECT, INTERN, TO_SYM, LENGTH, SIZE,
@@ -126,6 +137,8 @@ Some of them are:
     PLUS_ONE, MINUS_ONE, SQUARE, CUBE, FIB, FACTORIAL,
     TOWERS_OF_HANOI
 
+FLOOR and CEILING functions acts as the mathematical definition of floor and ceil, meaning that it has a fixed significance value of 1.
+
 Loops
 -----
 
@@ -168,3 +181,6 @@ Contributing
 ------------
 
 Fork on GitHub and after you've committed tested patches, send a pull request.
+
+
+

data/lib/kalc/ast.rb

@@ -205,7 +205,7 @@ module Kalc
       end
 
       def eval(context)
-        context.add_variable(@variable, @value.eval(context))
+        context.add_variable(@variable, @value)
       end
     end
 
@@ -217,7 +217,9 @@ module Kalc
       end
 
       def eval(context)
-        context.get_variable(@variable)
+        var = context.get_variable(@variable)
+        fail "Invalid variable: #{@variable}" unless var
+        var.class == BigDecimal ? var : var.eval(context)
       end
     end
 
@@ -244,7 +246,11 @@ module Kalc
 
       def eval(context)
         to_call = context.get_function(@name)
-        to_call.call(context, *@variable_list) if to_call
+        fail "Unknown function #{@name}" unless to_call
+        to_call.call(context, *@variable_list)
+      rescue ArgumentError
+        fail "Argument Error. Function #{@name} was called with #{@variable_list.count} parameters. " +
+          "It needs at least #{to_call.parameters.select{|a| a.first == :req}.count - 1 } parameters"
       end
     end
 

data/lib/kalc/interpreter.rb

@@ -83,7 +83,7 @@ module Kalc
         })
 
         env.add_function(:ROUND, lambda { |cxt, num, digits|
-          num.eval(cxt).round(digits.eval(cxt))
+          num.eval(cxt).round(digits.eval(cxt).to_i)
         })
 
         env.add_function(:SUM, lambda { |cxt, *args|
@@ -98,6 +98,14 @@ module Kalc
           Math.log(val.eval(cxt))
         })
 
+        env.add_function(:MAX, lambda { |cxt, first, *args|
+          (args<<first).map { |a| a.eval(cxt) }.max
+        })
+
+        env.add_function(:MIN, lambda { |cxt, first, *args|
+          (args<<first).map { |a| a.eval(cxt) }.min
+        })
+
         math_funs =
             %w(acos acosh asin asinh atan atanh cbrt cos cosh erf erfc exp gamma lgamma log log2 log10 sin sinh sqrt tan tanh)
 
@@ -246,6 +254,14 @@ module Kalc
           puts output.eval(cxt)
         })
 
+        env.add_function(:FLOOR, lambda { |cxt, val|
+          val.eval(cxt).floor
+        })
+
+        env.add_function(:CEILING, lambda { |cxt, val|
+          val.eval(cxt).ceil
+        })
+
       end
     end
 

data/lib/kalc/version.rb

@@ -1,3 +1,3 @@
 module Kalc
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

data/spec/grammar_spec.rb

@@ -5,105 +5,116 @@ describe Kalc::Grammar do
 
   context 'integers' do
     1.upto(10) do |i|
-      it { grammar.should parse("#{i}") }
+      it { expect(grammar).to parse("#{i}") }
     end
   end
 
   context 'decimal numbers' do
     1.upto(10) do |i|
       1.upto(10) do |n|
-        it { grammar.should parse("#{i}.#{n}") }
+        it { expect(grammar).to parse("#{i}.#{n}") }
       end
     end
   end
 
   context 'basic integer math' do
     1.upto(10) do |i|
-      it { grammar.should parse("#{i} - #{i}") }
-      it { grammar.should parse("#{i} + #{i}") }
-      it { grammar.should parse("#{i} * #{i}") }
-      it { grammar.should parse("#{i} / #{i}") }
-      it { grammar.should parse("#{i} % #{i}") }
+      it { expect(grammar).to parse("#{i} - #{i}") }
+      it { expect(grammar).to parse("#{i} + #{i}") }
+      it { expect(grammar).to parse("#{i} * #{i}") }
+      it { expect(grammar).to parse("#{i} / #{i}") }
+      it { expect(grammar).to parse("#{i} % #{i}") }
     end
   end
 
   context 'basic decimal math' do
     1.upto(10) do |i|
       1.upto(10) do |n|
-        it { grammar.should parse("#{i}.#{n} - #{i}.#{n}") }
-        it { grammar.should parse("#{i}.#{n} + #{i}.#{n}") }
-        it { grammar.should parse("#{i}.#{n} * #{i}.#{n}") }
-        it { grammar.should parse("#{i}.#{n} / #{i}.#{n}") }
-        it { grammar.should parse("#{i}.#{n} % #{i}.#{n}") }
+        it { expect(grammar).to parse("#{i}.#{n} - #{i}.#{n}") }
+        it { expect(grammar).to parse("#{i}.#{n} + #{i}.#{n}") }
+        it { expect(grammar).to parse("#{i}.#{n} * #{i}.#{n}") }
+        it { expect(grammar).to parse("#{i}.#{n} / #{i}.#{n}") }
+        it { expect(grammar).to parse("#{i}.#{n} % #{i}.#{n}") }
       end
     end
   end
 
   context 'Logical expressions' do
-    it { grammar.should parse('3 && 1') }
-    it { grammar.should_not parse('&& 1') }
+    it { expect(grammar).to parse('3 && 1') }
+    it { expect(grammar).to_not parse('&& 1') }
 
-    it { grammar.should parse('3 || 1') }
-    it { grammar.should_not parse('|| 1') }
+    it { expect(grammar).to parse('3 || 1') }
+    it { expect(grammar).to_not parse('|| 1') }
   end
 
   context 'Comparison expressions' do
-    it { grammar.should parse('3 > 1') }
-    it { grammar.should parse('3 < 1') }
-    it { grammar.should parse('3 >= 1') }
-    it { grammar.should parse('3 <= 1') }
-
-    it { grammar.should_not parse('> 1') }
-    it { grammar.should_not parse('< 1') }
-    it { grammar.should_not parse('>= 1') }
-    it { grammar.should_not parse('<= 1') }
+    it { expect(grammar).to parse('3 > 1') }
+    it { expect(grammar).to parse('3 < 1') }
+    it { expect(grammar).to parse('3 >= 1') }
+    it { expect(grammar).to parse('3 <= 1') }
+
+    it { expect(grammar).to_not parse('> 1') }
+    it { expect(grammar).to_not parse('< 1') }
+    it { expect(grammar).to_not parse('>= 1') }
+    it { expect(grammar).to_not parse('<= 1') }
   end
 
   context 'Equality' do
-    it { grammar.should parse('3 == 1') }
-    it { grammar.should parse('2 != 1') }
+    it { expect(grammar).to parse('3 == 1') }
+    it { expect(grammar).to parse('2 != 1') }
   end
 
   context 'Block' do
-    it { grammar.should parse('(2 + 1)') }
-    it { grammar.should parse('(2 + 1) + 1') }
-    it { grammar.should parse('(2 + 1) * (1 / 2) + 3') }
-    it { grammar.should parse('(2 + 1) + (1 + 2) + ((3 + 2) / (2 + 1)) * 9') }
-    it { grammar.should parse('(2 + 1) - (1)') }
-    it { grammar.should parse('(2 ) + (  1)') }
-    it { grammar.should parse('((2) + (    1 ))') }
+    it { expect(grammar).to parse('(2 + 1)') }
+    it { expect(grammar).to parse('(2 + 1) + 1') }
+    it { expect(grammar).to parse('(2 + 1) * (1 / 2) + 3') }
+    it { expect(grammar).to parse('(2 + 1) + (1 + 2) + ((3 + 2) / (2 + 1)) * 9') }
+    it { expect(grammar).to parse('(2 + 1) - (1)') }
+    it { expect(grammar).to parse('(2 ) + (  1)') }
+    it { expect(grammar).to parse('((2) + (    1 ))') }
   end
 
   context 'Ternary expressions' do
-    it { grammar.should parse('3 > 2 ? 1 : 5') }
-    it { grammar.should parse('3 > 2 || 4 <= 5 ? 1 : 5') }
-    it { grammar.should parse('(3 > (2 + 4)) ? 1 : 5') }
-    it { grammar.should parse('IF(2 > 3, 3 > 2 ? 1 : 5, 7)') }
-    it { grammar.should parse('3 > 2 ? 1 : 5 > 4 ? 7 : 5') }
+    it { expect(grammar).to parse('3 > 2 ? 1 : 5') }
+    it { expect(grammar).to parse('3 > 2 || 4 <= 5 ? 1 : 5') }
+    it { expect(grammar).to parse('(3 > (2 + 4)) ? 1 : 5') }
+    it { expect(grammar).to parse('IF(2 > 3, 3 > 2 ? 1 : 5, 7)') }
+    it { expect(grammar).to parse('3 > 2 ? 1 : 5 > 4 ? 7 : 5') }
   end
 
   context 'AND statements' do
-    it { grammar.should parse('AND(1, 2, 3)') }
-    it { grammar.should parse('AND(1, 2, 3, 4, 5, 6)') }
-    it { grammar.should parse('AND(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)') }
+    it { expect(grammar).to parse('AND(1, 2, 3)') }
+    it { expect(grammar).to parse('AND(1, 2, 3, 4, 5, 6)') }
+    it { expect(grammar).to parse('AND(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)') }
   end
 
   context 'OR statements' do
-    it { grammar.should parse('OR(1, 2, 3)') }
-    it { grammar.should parse('OR(1, 2, 3, 4, 5, 6)') }
-    it { grammar.should parse('OR(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)') }
+    it { expect(grammar).to parse('OR(1, 2, 3)') }
+    it { expect(grammar).to parse('OR(1, 2, 3, 4, 5, 6)') }
+    it { expect(grammar).to parse('OR(1, 2, 3, 4, 5, 6, 7, 8, 9, 10)') }
   end
 
   context 'IF statements' do
-    it { grammar.should parse('IF(3, 2, 1)') }
-    it { grammar.should parse('IF(3 > 1, 2, 1)') }
-    it { grammar.should parse('IF((3 > 1) || (2 < 1), 2, 1)') }
-    it { grammar.should parse('IF(OR(1 > 3, 2 < 5), 3, 2)') }
+    it { expect(grammar).to parse('IF(3, 2, 1)') }
+    it { expect(grammar).to parse('IF(3 > 1, 2, 1)') }
+    it { expect(grammar).to parse('IF((3 > 1) || (2 < 1), 2, 1)') }
+    it { expect(grammar).to parse('IF(OR(1 > 3, 2 < 5), 3, 2)') }
   end
 
   context 'Nested IF statements' do
-    it { grammar.should parse('IF(3 > 2, IF(2 < 3, 1, 3), 5)') }
-    it { grammar.should parse('IF(3 > 2, IF(2 < 3, 1, 3), IF(5 > 1, 3, 9))') }
+    it { expect(grammar).to parse('IF(3 > 2, IF(2 < 3, 1, 3), 5)') }
+    it { expect(grammar).to parse('IF(3 > 2, IF(2 < 3, 1, 3), IF(5 > 1, 3, 9))') }
   end
 
+  context 'MAX statements' do
+    it { expect(grammar).to parse('MAX(3, 1, 2)') }
+    it { expect(grammar).to parse('MAX(-1, 2*4, (3-1)*2, 5, 6)') }
+    it { expect(grammar).to parse('MAX(1, var, 10)') }
+  end
+
+  context 'MIN statements' do
+    it { expect(grammar).to parse('MIN(3, 1, 2)') }
+    it { expect(grammar).to parse('MIN(-1, 2*4, (3-1)*2, 5, 6)') }
+    it { expect(grammar).to parse('MIN(1, -var, 10)') }
+  end
 end

data/spec/interpreter_spec.rb

@@ -6,91 +6,124 @@ 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 { expect(evaluate('2 + 2')).to eq(4) }
+  it { expect(evaluate('1 + 1')).to eq(2.0) }
+  it { expect(evaluate('4 + 1')).to eq(5) }
+  it { expect(evaluate('5 + 5')).to eq(10) }
 
-  it { evaluate('5 / 5').should == 1 }
+  it { expect(evaluate('5 / 5')).to eq(1) }
 
-  it { evaluate('5 / 4 / 2').should == 0.625 }
-  it { evaluate('5/4/2').should == 0.625 }
+  it { expect(evaluate('5 / 4 / 2')).to eq(0.625) }
+  it { expect(evaluate('5/4/2')).to eq(0.625) }
 
-  it { evaluate('6 * 2 / 3').should == 4 }
+  it { expect(evaluate('6 * 2 / 3')).to eq(4) }
 
-  it { evaluate('10 > 9').should == true }
-  it { evaluate('10 < 9').should == false }
+  it { expect(evaluate('10 > 9')).to eq(true) }
+  it { expect(evaluate('10 < 9')).to eq(false) }
 
-  it { evaluate('10 + 19 + 11 * 3').should == 62 }
+  it { expect(evaluate('10 + 19 + 11 * 3')).to eq(62) }
 
-  it { evaluate('10 >= 10').should == true }
+  it { expect(evaluate('10 >= 10')).to eq(true) }
 
-  it { evaluate('ABS(-1 + -2)').should == 3 }
+  it { expect(evaluate('ABS(-1 + -2)')).to eq(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
+    expect(evaluate('a := 1; 1 + a')).to eq(2)
+    expect(evaluate('a := 1; b := 2; 1 + b')).to eq(3)
   end
 
   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
+    expect(evaluate("'Item (a)' := 1; 1 + 'Item (a)'")).to eq(2)
+    expect(evaluate("'a' := 1; 'b[a]' := 2 + 'a'; 1 + 'b[a]'")).to eq(4)
   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
+    expect(evaluate("'a' := 1; 1 + 'a'")).to eq(2)
+    expect(evaluate("'a' := 1; 'b' := 2; 'b' + 'a'")).to eq(3)
 
-    evaluate("'a b' := 1; 'a b' + 1").should == 2
+    expect(evaluate("'a b' := 1; 'a b' + 1")).to eq(2)
   end
 
-  it { evaluate('((75.0)*(25.0))+((125.0)*(25.0))+((150.0)*(25.0))+((250.0)*(25.0))').should == 15000 }
+  it { expect(evaluate('((75.0)*(25.0))+((125.0)*(25.0))+((150.0)*(25.0))+((250.0)*(25.0))')).to eq(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 { expect(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)')).to eq(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 }
+    it { expect(evaluate('-2')).to eq(-2) }
+    it { expect(evaluate('-1000')).to eq(-1000) }
+    it { expect(evaluate('-1000.0001')).to eq(-1000.0001) }
+    it { expect(evaluate('1 + -1')).to eq(0 )}
+    it { expect(evaluate('1 + -10')).to eq(-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 }
+    it { expect(evaluate('1 + +1')).to eq(2) }
+    it { expect(evaluate('1 + +1 - 1')).to eq(1) }
+    it { expect(evaluate('+10000.0001')).to eq(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 }
+    it { expect(evaluate('TRUE')).to eq(true) }
+    it { expect(evaluate('FALSE')).to eq(false) }
+    it { expect(evaluate('FALSE || TRUE')).to eq(true) }
+    it { expect(evaluate('FALSE && TRUE')).to  eq(false) }
   end
 
   context 'Decimal numbers' 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.2 - 1.0').should == 0.2 }
-    it { evaluate('1.01 = 1.01').should == true }
-    it { evaluate('1.01 = 1.02').should == false }
+    it { expect(evaluate('1.01')).to eq(1.01) }
+    it { expect(evaluate('1.01 + 0.02')).to eq(1.03) }
+    it { expect(evaluate('1.01 - 0.01')).to eq(1) }
+    it { expect(evaluate('1.1 + 1.1')).to eq(2.2) }
+    it { expect(evaluate('1.2 - 1.0')).to eq(0.2) }
+    it { expect(evaluate('1.01 = 1.01')).to eq(true) }
+    it { expect(evaluate('1.01 = 1.02')).to eq(false) }
   end
 
   context 'Ternary' do
-    it { evaluate('1 > 2 ? 1 : 2').should == 2 }
+    it { expect(evaluate('1 > 2 ? 1 : 2')).to eq(2) }
   end
 
   context 'Exponents' do
-    it { evaluate('1.23e+10').should == 12300000000.0 }
-    it { evaluate('1.23e-10').should == 1.23e-10 }
+    it { expect(evaluate('1.23e+10')).to eq(12300000000.0) }
+    it { expect(evaluate('1.23e-10')).to eq(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 }
+    it { expect(evaluate('0.4')).to eq(0.4) }
+    it { expect(evaluate('.4')).to eq(0.4) }
+  end
+
+  context 'Min and Max Functions' do
+    it { expect(evaluate('MAX(3, 1, 2)')).to eq(3) }
+    it { expect(evaluate('MAX(-1, 2*4, (3-1)*2, 5, 6)')).to eq(8) }
+    it { expect(evaluate('MIN(3, 1, 2)')).to eq(1) }
+    it { expect(evaluate('MIN(-1, 2*4, (3-1)*2, 5, 6)')).to eq(-1) }
+    context 'having variables' do
+      it { expect(evaluate('var := 15; MAX(1, var, 10)')).to eq(15) }
+      it { expect(evaluate('var := 15; MIN(1, var, -10)')).to eq(-10) }
+    end
+  end
+
+  context 'Ceil and Floor functions' do
+    it { expect(evaluate('FLOOR(3.4)')).to eq(3) }
+    it { expect(evaluate('FLOOR(3.8)')).to eq(3) }
+    it { expect(evaluate('FLOOR(-3.4)')).to eq(-4) }
+    it { expect(evaluate('FLOOR(3)')).to eq(3) }
+    it { expect(evaluate('CEILING(3)')).to eq(3) }
+    it { expect(evaluate('CEILING(3.8)')).to eq(4) }
+    it { expect(evaluate('CEILING(3.8)')).to eq(4) }
+    it { expect(evaluate('CEILING(-3.2)')).to eq(-3) }
+
+    context 'having variables' do
+      it { expect(evaluate('var := 2.456; FLOOR(var)')).to eq(2) }
+      it { expect(evaluate('var := 2.444; CEILING(var)')).to eq(3) }
+    end
+  end
+
+  context 'Round function' do
+    it { expect(evaluate('ROUND(3.256,2)')).to eq(3.26) }
+    it { expect(evaluate('ROUND(3.2,2)')).to eq(3.20) }
+    it { expect(evaluate('ROUND(233.256,-2)')).to eq(200) }
   end
 
   private

data/spec/stdlib_spec.rb

@@ -12,42 +12,42 @@ describe Kalc::Stdlib do
   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 }
+    it { expect(evaluate('PLUS_ONE(1)')).to eq(2) }
+    it { expect(evaluate('PLUS_ONE(101)')).to eq(102) }
+    it { expect(evaluate('PLUS_ONE(0)')).to eq(1) }
+    it { expect(evaluate('PLUS_ONE(-1)')).to eq(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 }
+    it { expect(evaluate('MINUS_ONE(1)')).to eq(0) }
+    it { expect(evaluate('MINUS_ONE(101)')).to eq(100) }
+    it { expect(evaluate('MINUS_ONE(0)')).to eq(-1) }
+    it { expect(evaluate('MINUS_ONE(-1)')).to eq(-2) }
   end
 
   describe 'SQUARE' do
-    it { evaluate('SQUARE(2)').should == 4 }
-    it { evaluate('SQUARE(4)').should == 16 }
+    it { expect(evaluate('SQUARE(2)')).to eq(4) }
+    it { expect(evaluate('SQUARE(4)')).to eq(16) }
   end
 
   describe 'CUBE' do
-    it { evaluate('CUBE(2)').should == 8 }
-    it { evaluate('CUBE(4)').should == 64 }
+    it { expect(evaluate('CUBE(2)')).to eq(8) }
+    it { expect(evaluate('CUBE(4)')).to eq(64) }
   end
 
   describe 'FIB' do
-    it { evaluate('FIB(1)').should == 1 }
-    it { evaluate('FIB(10)').should == 55 }
+    it { expect(evaluate('FIB(1)')).to eq(1) }
+    it { expect(evaluate('FIB(10)')).to eq(55) }
   end
 
   describe 'FACTORIAL' do
-    it { evaluate('FACTORIAL(1)').should == 1 }
-    it { evaluate('FACTORIAL(5)').should == 120 }
+    it { expect(evaluate('FACTORIAL(1)')).to eq(1) }
+    it { expect(evaluate('FACTORIAL(5)')).to eq(120) }
   end
 
   describe 'TOWERS_OF_HANOI' do
-    it { evaluate('TOWERS_OF_HANOI(4)').should == 15 }
-    it { evaluate('TOWERS_OF_HANOI(10)').should == 1023 }
+    it { expect(evaluate('TOWERS_OF_HANOI(4)')).to eq(15) }
+    it { expect(evaluate('TOWERS_OF_HANOI(10)')).to eq(1023) }
   end
 
   private

metadata

@@ -1,62 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: kalc
 version: !ruby/object:Gem::Version
-  version: 1.0.0
-  prerelease: 
+  version: 1.1.0
 platform: ruby
 authors:
 - Chris Parker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-12 00:00:00.000000000 Z
+date: 2015-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: parslet
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
 description: Calculation language slightly based on Excel's formula language.
@@ -93,27 +86,26 @@ files:
 - spec/stdlib_spec.rb
 homepage: https://github.com/mrcsparker/kalc
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: kalc
-rubygems_version: 1.8.23.2
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Small calculation language.
 test_files:
 - spec/grammar_spec.rb