excel_to_code 0.3.16 → 0.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 17eac22412740a67afd06333f437ce950c03c32d
-  data.tar.gz: 1117fdcb2343478712dc0a72649c429d1b9dc8dd
+  metadata.gz: a6c7853f4e0ce66da8f073d561bbd0dabd2a390d
+  data.tar.gz: b9e44bda2488d15ede19254374a9b19fb1320762
 SHA512:
-  metadata.gz: 5023ee51c9f7a3909c7768ca58da98c368e3bec955a50e67c33df96387e2052e8c3c734f062c894b9102629509582232c7c08d62fd21b9fe718d1f678d6558fa
-  data.tar.gz: e34fd8293696f90562080eeb0f07db35a131d4132883baf62a5edf57f2fa37e36a699a16d355899e27c65c0a13dc262e143e30917593aed1a358868cc6108783
+  metadata.gz: aed1ca40db11c54a816035989e1f68427028dbd2ed3c7328e134efa225842b52c72e6db1df32090d75a45da8d95caa29102b52a028d413ff397ecd946d4dfed9
+  data.tar.gz: 87131c81c57f7d7705833b0f18f14e797fb553c304367f47c688c1c6593feaebd9589e278fbb92792add54442cdfa833508187ff090fd60169754f9332c0486a

data/src/commands/excel_to_x.rb

@@ -1051,6 +1051,7 @@ class ExcelToX
           raise
         end
       end
+      
 
       @named_references.each do |ref, ast|
         inline_replacer.current_sheet_name = ref.is_a?(Array) ? [ref.first] : []

data/src/compile/c/excel_to_c_runtime.c

@@ -85,6 +85,7 @@ static ExcelValue min(int number_of_arguments, ExcelValue *arguments);
 static ExcelValue mmult(ExcelValue a_v, ExcelValue b_v);
 static ExcelValue mod(ExcelValue a_v, ExcelValue b_v);
 static ExcelValue negative(ExcelValue a_v);
+static ExcelValue number_or_zero(ExcelValue maybe_number_v);
 static ExcelValue npv(ExcelValue rate, int number_of_arguments, ExcelValue *arguments);
 static ExcelValue pmt(ExcelValue rate_v, ExcelValue number_of_periods_v, ExcelValue present_value_v);
 static ExcelValue pmt_4(ExcelValue rate_v, ExcelValue number_of_periods_v, ExcelValue present_value_v, ExcelValue final_value_v);
@@ -341,6 +342,16 @@ static ExcelValue ensure_is_number(ExcelValue maybe_number_v) {
 	return EXCEL_NUMBER(maybe_number);
 }
 
+static ExcelValue number_or_zero(ExcelValue maybe_number_v) {
+  if(maybe_number_v.type == ExcelNumber) {
+    return maybe_number_v;
+  }
+  if(maybe_number_v.type == ExcelError) {
+    return maybe_number_v;
+  }
+  return ZERO;
+}
+
 static ExcelValue excel_log(ExcelValue number) {
   return excel_log_2(number, TEN);
 }

data/src/compile/c/excel_to_c_runtime_test.c

@@ -955,7 +955,17 @@ int test_functions() {
   assert(ensure_is_number(EXCEL_STRING("1.3")).number == 1.3);
   assert(ensure_is_number(EXCEL_STRING("BASDASD")).type == ExcelError);
   assert(ensure_is_number(DIV0).type == ExcelError);
-
+  
+  // Tests ther NUMBER_OR_ZERO function
+  assert_equal(ZERO, number_or_zero(ZERO), "number_or_zero 0");
+  assert_equal(ONE, number_or_zero(ONE), "number_or_zero 1");
+  assert_equal(VALUE, number_or_zero(VALUE), "number_or_zero :error");
+  assert_equal(ZERO, number_or_zero(TRUE), "number_or_zero true");
+  assert_equal(ZERO, number_or_zero(FALSE), "number_or_zero false");
+  assert_equal(ZERO, number_or_zero(BLANK), "number_or_zero blank");
+  assert_equal(ZERO, number_or_zero(EXCEL_STRING("1.3")), "number_or_zero '1.3'");
+  assert_equal(ZERO, number_or_zero(EXCEL_STRING("Aasdfadsf")), "number_or_zero 'Asdfad'");
+  
   // RIGHT(string,[characters])
   // ... should return the right n characters from a string
   assert(strcmp(right_1(EXCEL_STRING("ONE")).string,"E") == 0);

data/src/compile/c/map_formulae_to_c.rb

@@ -69,6 +69,7 @@ class MapFormulaeToC < MapValuesToC
     :'MMULT' => 'mmult',
     :'MOD' => 'mod',
     :'NPV' => 'npv',
+    :'NUMBER_OR_ZERO' => 'number_or_zero',
     :'PMT3' => 'pmt',
     :'PMT4' => 'pmt_4',
     :'PMT5' => 'pmt_5',

data/src/compile/ruby/map_formulae_to_ruby.rb

@@ -55,6 +55,7 @@ class MapFormulaeToRuby < MapValuesToRuby
     :'MMULT' => 'mmult',
     :'MOD' => 'mod',
     :'NPV' => 'npv',
+    :'NUMBER_OR_ZERO' => 'number_or_zero',
     :'PI' => 'pi',
     :'PMT' => 'pmt',
     :'POWER' => 'power',

data/src/excel/excel_functions.rb

@@ -121,3 +121,5 @@ require_relative 'excel_functions/iserror'
 require_relative 'excel_functions/char'
 
 require_relative 'excel_functions/address'
+
+require_relative 'excel_functions/number_or_zero'

data/src/excel/excel_functions/number_argument.rb

@@ -21,7 +21,7 @@ module ExcelFunctions
     when Numeric
       return a
     when Array
-      return a[0][0]
+      return number_argument(a[0][0])
     else
       return :value
     end

data/src/excel/excel_functions/number_or_zero.rb

@@ -0,0 +1,9 @@
+module ExcelFunctions
+  
+  def number_or_zero(a)
+    return a if a.is_a?(Symbol)
+    return a if a.is_a?(Numeric)
+    0
+  end
+  
+end

data/src/excel_to_code.rb

@@ -1,5 +1,5 @@
 class ExcelToCode
-  def self.version() "0.3.16" end
+  def self.version() "0.3.17" end
 end
 
 require_relative 'commands'

data/src/simplify/map_formulae_to_values.rb

@@ -97,6 +97,11 @@ class MapFormulaeToValues
     return ast if ast[0] == :function && ast[1] == :ENSURE_IS_NUMBER
     [:function, :ENSURE_IS_NUMBER, ast]
   end
+  
+  def number_or_zero(ast)
+    return ast if ast[0] == :function && ast[1] == :NUMBER_OR_ZERO
+    [:function, :NUMBER_OR_ZERO, ast]
+  end
 
   def comparison(ast)
     left, operator, right = ast[1], ast[2], ast[3]
@@ -336,12 +341,12 @@ class MapFormulaeToValues
     # FIXME: Will I be haunted by this? What if doing a sum of something that isn't a number
     # and so what is expected is a VALUE error?. YES. This doesn't work well.
     elsif ast.length == 3 && [:cell, :sheet_reference].include?(ast[2].first)
-      new_ast = n(ast[2])
+      new_ast = number_or_zero(ast[2])
       if new_ast != ast
         @replacements_made_in_the_last_pass += 1
         ast.replace(new_ast)
       end
-    elsif ast.length == 3 && ast[2][0] == :function && ast[2][1] == :ENSURE_IS_NUMBER
+    elsif ast.length == 3 && ast[2][0] == :function && ast[2][1] == :NUMBER_OR_ZERO
       new_ast = ast[2]
       if new_ast != ast
         @replacements_made_in_the_last_pass += 1

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.3.16
+  version: 0.3.17
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-12 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -197,6 +197,7 @@ files:
 - src/excel/excel_functions/not_equal.rb
 - src/excel/excel_functions/npv.rb
 - src/excel/excel_functions/number_argument.rb
+- src/excel/excel_functions/number_or_zero.rb
 - src/excel/excel_functions/pi.rb
 - src/excel/excel_functions/pmt.rb
 - src/excel/excel_functions/power.rb