kalc 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5e7d0f88467457fa1bb05ba79d7c4e22108b0ed
-  data.tar.gz: dbc37893dc7b6105c15e39af612e502961445dd4
+  metadata.gz: 7dd87399e45a1819f532e20a2e4fed4be6824b6e
+  data.tar.gz: 17167d66287fe9869eed4c788eb8942b85551d76
 SHA512:
-  metadata.gz: bb90ace532474efe5336145bd3256406140bc97616e90da0f528e7d59c1617f524b1744d8d62353589970e21d07dce243d7b8e45f7963aa9f2cea8fcafb60b14
-  data.tar.gz: be2d7ae24e1bd786101e07ffd2bd297f586169ad70e36fea36bccb695e978bf70b2c539f63d020352bf9f3ff78ea0600aebdc7dc84cbb2b4cab32526a37ee2c7
+  metadata.gz: 9019d6437db9acf668148ababebfa77e8120d44f916d84d082011d58836f7c2e09bda5b1bf55f50d82dc96df98525f105db3d82709f0c64c5ba37d03fe90614c
+  data.tar.gz: 930b53a089d8e62a093ef09bda37a4aab7004ab4d4b64a1f8636840819ae8c5b67c60c04c4bee6e84ceb469c551bba8365a5cb071e23c5e0fe4ce9c15bf7d474

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    kalc (1.1.1)
+    kalc (1.2.0)
       parslet (~> 1.7)
 
 GEM
@@ -9,22 +9,22 @@ GEM
   specs:
     blankslate (3.1.3)
     diff-lcs (1.2.5)
-    parslet (1.7.0)
+    parslet (1.7.1)
       blankslate (>= 2.0, <= 4.0)
-    rake (10.4.2)
-    rspec (3.3.0)
-      rspec-core (~> 3.3.0)
-      rspec-expectations (~> 3.3.0)
-      rspec-mocks (~> 3.3.0)
-    rspec-core (3.3.1)
-      rspec-support (~> 3.3.0)
-    rspec-expectations (3.3.0)
+    rake (11.2.2)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.0)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-mocks (3.3.1)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.3.0)
-    rspec-support (3.3.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
 
 PLATFORMS
   java
@@ -36,4 +36,4 @@ DEPENDENCIES
   rspec
 
 BUNDLED WITH
-   1.10.6
+   1.12.5

data/lib/kalc/transform.rb

@@ -45,6 +45,11 @@ module Kalc
       Ast::StringValue.new(string)
     }
 
+    rule(:string => sequence(:string)) {
+      string = '' if string == nil
+      Ast::StringValue.new(string)
+    }
+
     rule(:boolean => simple(:boolean)) {
       Ast::BooleanValue.new(boolean)
     }

data/lib/kalc/version.rb

@@ -1,3 +1,3 @@
 module Kalc
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
 end

data/spec/interpreter_spec.rb

@@ -126,6 +126,14 @@ describe Kalc::Interpreter do
     it { expect(evaluate('ROUND(233.256,-2)')).to eq(200) }
   end
 
+  # https://github.com/mrcsparker/kalc/issues/9
+  # https://github.com/kschiess/parslet/issues/126
+  context 'empty strings' do
+    it { expect(evaluate('""')).to eq('') }
+    it { expect(evaluate('var1 := 1; var2 := 2; IF(var1=var2,"","ERROR")')).to eq('ERROR') }
+    it { expect(evaluate('var1 := 1; var2 := 1; IF(var1=var2,"","ERROR")')).to eq('') }
+  end
+
   private
   def evaluate(expression)
     g = @grammar.parse(expression)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kalc
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Chris Parker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2016-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: kalc
-rubygems_version: 2.4.5
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Small calculation language.
@@ -112,3 +112,4 @@ test_files:
 - spec/interpreter_spec.rb
 - spec/spec_helper.rb
 - spec/stdlib_spec.rb
+has_rdoc: