kalc 0.9.1 → 1.0.0

data/Gemfile.lock

@@ -1,16 +1,16 @@
 PATH
   remote: .
   specs:
-    kalc (0.9.1)
-      parslet (~> 1.5)
+    kalc (1.0.0)
+      parslet (~> 1.6)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    blankslate (2.1.2.4)
+    blankslate (3.1.3)
     diff-lcs (1.2.5)
-    parslet (1.5.0)
-      blankslate (~> 2.0)
+    parslet (1.6.2)
+      blankslate (>= 2.0, <= 4.0)
     rake (10.1.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)

data/README.md

@@ -20,10 +20,10 @@ functionality.
 Numbers
 -------
 
-All numbers are floating point.
+All numbers are BigDecimal ruby class numbers for precision.
 
-    1 => 1.0 
-    2.020 => 2.02 
+    1 => 1.0
+    2.020 => 2.02
     1.23E => 12300000000.0
 
 Arithmetic
@@ -37,7 +37,7 @@ Arithmetic is standard infix with nesting via parenthesis.
 Logical operations
 ------------------
 
-    2 < 1 ? 1 : 3 # Ternary 
+    2 < 1 ? 1 : 3 # Ternary
     (1 || 2) # 1.0
     2 or 3 # 2.0
     OR(1 > 2, 3 < 2, 8 == 8) # true
@@ -47,7 +47,7 @@ Variable assignment
 
 The assignment operator `:=` is borrowed from Pascal.  This decision was
 made for practical reason.  Since comparison operators are both `=` and
-`==` and the language is expression-based, `=` could not be chosen. 
+`==` and the language is expression-based, `=` could not be chosen.
 
 Variables come in a lot of different flavors.
 
@@ -98,7 +98,7 @@ Some of them are:
     # Random number generation
     RAND
 
-    # System level integration  
+    # System level integration
     SYSTEM
 
     # Boolean functions
@@ -120,7 +120,7 @@ Some of them are:
     REGEXP_MATCH, REGEXP_REPLACE
 
     # Debugging
-    P, PP, PUTS, 
+    P, PP, PUTS,
 
     # Other
     PLUS_ONE, MINUS_ONE, SQUARE, CUBE, FIB, FACTORIAL,
@@ -129,12 +129,12 @@ Some of them are:
 Loops
 -----
 
-There are no looping mechanisms to speak of, but recursion works (pretty) well.  
+There are no looping mechanisms to speak of, but recursion works (pretty) well.
 **Note:** *go too deep and you might blow the stack!*
 
-    DEFINE SAMPLE_LOOP(a) { 
-      PUTS(a) 
-      IF(a == 1, 1, SAMPLE_LOOP(a - 1)) 
+    DEFINE SAMPLE_LOOP(a) {
+      PUTS(a)
+      IF(a == 1, 1, SAMPLE_LOOP(a - 1))
     }
 
 There are a few examples of loops via recursion in `lib/stdlib.kalc`

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.5'
+  s.add_runtime_dependency 'parslet', '~> 1.6'
 end

data/lib/kalc.rb

@@ -8,6 +8,7 @@ require 'kalc/transform'
 require 'kalc/environment'
 require 'kalc/interpreter'
 require 'kalc/repl'
+require 'bigdecimal'
 
 module Kalc
   class Runner

data/lib/kalc/ast.rb

@@ -77,15 +77,15 @@ module Kalc
       end
     end
 
-    class FloatingPointNumber
+    class BigDecimalNumber
       attr_reader :value
 
       def initialize(value)
-        @value = value
+        @value = BigDecimal.new(value.to_s)
       end
 
       def eval(context)
-        Float(@value)
+        BigDecimal.new(@value)
       end
     end
 

data/lib/kalc/interpreter.rb

@@ -139,7 +139,7 @@ module Kalc
         })
 
         env.add_function(:DOLLAR, lambda { |cxt, val, decimal_places|
-          "%.#{Integer(decimal_places.eval(cxt))}f" % Float(val.eval(cxt))
+          "%.#{Integer(decimal_places.eval(cxt))}f" % BigDecimal.new(val.eval(cxt))
         })
 
         env.add_function(:EXACT, lambda { |cxt, string1, string2|
@@ -152,7 +152,7 @@ module Kalc
         })
 
         env.add_function(:FIXED, lambda { |cxt, val, decimal_places, no_commas|
-          output = "%.#{Integer(decimal_places.eval(cxt))}f" % Float(val.eval(cxt))
+          output = "%.#{Integer(decimal_places.eval(cxt))}f" % BigDecimal.new(val.eval(cxt))
           output = output.to_s.reverse.scan(/(?:\d*\.)?\d{1,3}-?/).join(',').reverse if !no_commas.eval(cxt)
           output
         })

data/lib/kalc/transform.rb

@@ -54,7 +54,7 @@ module Kalc
     }
 
     rule(:number => simple(:number)) {
-      Ast::FloatingPointNumber.new(number)
+      Ast::BigDecimalNumber.new(number)
     }
 
     rule(:non_ops => subtree(:non_ops)) {

data/lib/kalc/version.rb

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

data/spec/grammar_spec.rb

@@ -9,7 +9,7 @@ describe Kalc::Grammar do
     end
   end
 
-  context 'floats' do
+  context 'decimal numbers' do
     1.upto(10) do |i|
       1.upto(10) do |n|
         it { grammar.should parse("#{i}.#{n}") }
@@ -27,7 +27,7 @@ describe Kalc::Grammar do
     end
   end
 
-  context 'basic float math' do
+  context 'basic decimal math' do
     1.upto(10) do |i|
       1.upto(10) do |n|
         it { grammar.should parse("#{i}.#{n} - #{i}.#{n}") }

data/spec/interpreter_spec.rb

@@ -69,11 +69,12 @@ describe Kalc::Interpreter do
     it { evaluate('FALSE && TRUE').should == false }
   end
 
-  context 'Floating point number' do
+  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 }
   end

metadata

@@ -1,57 +1,64 @@
 --- !ruby/object:Gem::Specification
 name: kalc
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.0
+  prerelease: 
 platform: ruby
 authors:
 - Chris Parker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-31 00:00:00.000000000 Z
+date: 2014-12-12 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.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 description: Calculation language slightly based on Excel's formula language.
 email:
 - mrcsparker@gmail.com
@@ -86,26 +93,27 @@ 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: 2.2.0
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Small calculation language.
 test_files:
 - spec/grammar_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 78824d628e330b0cea023998c7d855eb7ea61059
-  data.tar.gz: 12eceba2e9e1495b692b725902f859373fc6fd10
-SHA512:
-  metadata.gz: 40aead2c8de8ea0094ff49bcc49fdd6655b44de4c12d4f5564685821b4e06061d4480947c1b0937a5f62c6304ccae47d7decd7d4ff1c3f632cb4c2af63b9ba93
-  data.tar.gz: 2c61afc8a347df7dde81435165339ac0e56d221aa79fb2fd755a915b3d9c55582899248361b9ec9549e87b301bb2547053c1b37842d017112b31ed46f5bdbf65