excel_to_code 0.2.17 → 0.2.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dcc23d2c3bc1b795812df13662b81933f5c7f063
-  data.tar.gz: d62a97bca9808a673114f2169aeaa9e129a681fd
+  metadata.gz: 337fc100f3818bf193414bcd8fb3aaec557e1a6b
+  data.tar.gz: 34218ff7c787a63a1e0081b688ff328d1235316e
 SHA512:
-  metadata.gz: f3d4e6502be8a144b705bdc4848b174fca86136f8e59d96b1cbc1e70605ec96e6034542f336fff212df4fd818e63ad841567285d95e0569443d68dd5f1e5fbed
-  data.tar.gz: ef7aac9705e55a267e129a160a29614f1d24926fec23b4686e8eecca0d5c82a51ab8c91d8f3fdb68aee42de2686c86a075ca14403f43b6021f3fcb09bab5a751
+  metadata.gz: 10b5b04a5fe6ae0b5df092a010b5cbf0cad48025db71b99350da7a040e2992c5301c08f23652040b4eb340fcb2f064aa7bae7c02b765c53c8849e11480a66a71
+  data.tar.gz: 3ec3fbfbad7b341990559ae40d121dfdbd46839aa3f92f5a1b41b58ce597e43606d91de146bc940d5976b682320b593925bea0619463f9e183b98800f0b15a5c

data/src/commands/excel_to_x.rb

@@ -838,6 +838,7 @@ class ExcelToX
     @replace_arrays_with_single_cells_replacer ||= ReplaceArraysWithSingleCellsAst.new
     @replace_string_joins_on_ranges_replacer ||= ReplaceStringJoinOnRangesAST.new
     @sheetless_cell_reference_replacer ||= RewriteCellReferencesToIncludeSheetAst.new
+    @replace_references_to_blanks_with_zeros ||= ReplaceReferencesToBlanksWithZeros.new(@formulae, nil, inline_ast_decision)
 
     cells.each do |ref, ast|
       begin
@@ -858,6 +859,8 @@ class ExcelToX
         @replace_arithmetic_on_ranges_replacer.map(ast)
         @replace_string_joins_on_ranges_replacer.map(ast)
         @wrap_formulae_that_return_arrays_replacer.map(ast)
+        @replace_references_to_blanks_with_zeros.current_sheet_name = ref.first
+        @replace_references_to_blanks_with_zeros.map(ast)
       rescue  Exception => e
         log.fatal "Exception when simplifying #{ref}: #{ast}"
         raise

data/src/compile/c/excel_to_c_runtime.c

@@ -100,6 +100,7 @@ static ExcelValue sumif(ExcelValue check_range_v, ExcelValue criteria_v, ExcelVa
 static ExcelValue sumif_2(ExcelValue check_range_v, ExcelValue criteria_v);
 static ExcelValue sumproduct(int number_of_arguments, ExcelValue *arguments);
 static ExcelValue text(ExcelValue number_v, ExcelValue format_v);
+static ExcelValue value(ExcelValue string_v);
 static ExcelValue vlookup_3(ExcelValue lookup_value_v,ExcelValue lookup_table_v, ExcelValue column_number_v);
 static ExcelValue vlookup(ExcelValue lookup_value_v,ExcelValue lookup_table_v, ExcelValue column_number_v, ExcelValue match_type_v);
 
@@ -1716,6 +1717,11 @@ static ExcelValue filter_range(ExcelValue original_range_v, int number_of_argume
       value_to_be_checked = ((ExcelValue *) ((ExcelValue) criteria_range[i]).array)[j];
       comparison = criteria[i];
       comparator = comparison.comparator;
+
+      // For the purposes of comparison, treates a blank criteria as matching zeros.
+      if(comparator.type == ExcelEmpty) {
+        comparator = ZERO;
+      }
       
       switch(value_to_be_checked.type) {
         case ExcelError: // Errors match only errors
@@ -1737,7 +1743,6 @@ static ExcelValue filter_range(ExcelValue original_range_v, int number_of_argume
             if(strlen(comparator.string) != 0) passed = 0; // Empty strings match blanks.
             break;
           }
-          break;
         case ExcelNumber:
           if(comparator.type == ExcelNumber) {
             number = comparator.number;
@@ -1781,6 +1786,13 @@ static ExcelValue filter_range(ExcelValue original_range_v, int number_of_argume
               passed = 0;
               break;
             }
+
+            // Special case, empty strings don't match zeros here
+            if(strlen(value_to_be_checked.string) == 0) {
+              passed = 0;
+              break;
+            }
+
             number = number_from(value_to_be_checked);
             if(conversion_error == 1) {
               conversion_error = 0;
@@ -2080,3 +2092,11 @@ static ExcelValue hlookup(ExcelValue lookup_value_v,ExcelValue lookup_table_v, E
   }
   return NA;
 }
+
+
+static ExcelValue value(ExcelValue string_v) {
+	CHECK_FOR_PASSED_ERROR(string_v)
+	NUMBER(string_v, a)
+	CHECK_FOR_CONVERSION_ERROR
+	return new_excel_number(a);
+}

data/src/compile/c/excel_to_c_runtime_test.c

@@ -492,16 +492,25 @@ int test_functions() {
   ExcelValue sumifs_array_10f[] = { sumifs_array_3_v, new_excel_string(">=3")};
   assert(sumifs(sumifs_array_3_v,2, sumifs_array_10f).number == 17);
 
-  // ... should treat BLANK as an empty string when in the check_range, but not in the criteria
-  ExcelValue sumifs_array_11[] = { BLANK, new_excel_number(20)};
+  // ... BLANK in check range should match empty strings, BLANK in criteria should match zero
+  ExcelValue sumifs_array_11[] = { BLANK, new_excel_number(0)};
   assert(sumifs(new_excel_number(100),2,sumifs_array_11).number == 0);
 
-  ExcelValue sumifs_array_12[] = {BLANK, new_excel_string("")};
+  ExcelValue sumifs_array_11b[] = { BLANK, new_excel_string("")};
+  assert(sumifs(new_excel_number(100),2,sumifs_array_11b).number == 100);
+
+  ExcelValue sumifs_array_11c[] = { new_excel_string(""), BLANK};
+  assert(sumifs(new_excel_number(100),2,sumifs_array_11c).number == 0);
+
+  ExcelValue sumifs_array_12[] = {new_excel_number(0), BLANK};
   assert(sumifs(new_excel_number(100),2,sumifs_array_12).number == 100);
 
   ExcelValue sumifs_array_13[] = {BLANK, BLANK};
   assert(sumifs(new_excel_number(100),2,sumifs_array_13).number == 0);
 
+  ExcelValue sumifs_array_14[] = {new_excel_number(10), BLANK};
+  assert(sumifs(new_excel_number(100),2,sumifs_array_14).number == 0);
+
   // ... should return an error if range argument is an error
   assert(sumifs(REF,2,sumifs_array_13).type == ExcelError);
 
@@ -817,7 +826,7 @@ int test_functions() {
   ExcelValue averageifs_array_11[] = { BLANK, new_excel_number(20)};
   assert(averageifs(new_excel_number(100),2,averageifs_array_11).type == ExcelError);
 
-  ExcelValue averageifs_array_12[] = {BLANK, new_excel_string("")};
+  ExcelValue averageifs_array_12[] = {new_excel_number(0), BLANK};
   assert(averageifs(new_excel_number(100),2,averageifs_array_12).number == 100);
 
   ExcelValue averageifs_array_13[] = {BLANK, BLANK};
@@ -881,6 +890,16 @@ int test_functions() {
   assert(len(TRUE).number == 4);
   assert(len(FALSE).number == 5);
 
+
+  // VALUE(something)
+  assert(value(BLANK).type == ExcelNumber);
+  assert(value(BLANK).number == 0);
+  assert(value(ONE).type == ExcelNumber);
+  assert(value(ONE).number == 1);
+  assert(value(new_excel_string("1")).type == ExcelNumber);
+  assert(value(new_excel_string("1")).number == 1);
+  assert(value(new_excel_string("A1A")).type == ExcelError);
+
   // Release memory
   free_all_allocated_memory();
 

data/src/compile/c/map_formulae_to_c.rb

@@ -82,6 +82,7 @@ class MapFormulaeToC < MapValuesToC
     :'SUMIFS' => 'sumifs',
     :'TEXT2' => 'text',
     :'SUMPRODUCT' => 'sumproduct',
+    :'VALUE' => 'value',
     :'VLOOKUP3' => 'vlookup_3',
     :'VLOOKUP4' => 'vlookup',
     :'^' => 'power',

data/src/compile/ruby/map_formulae_to_ruby.rb

@@ -65,6 +65,7 @@ class MapFormulaeToRuby < MapValuesToRuby
     :'SUMPRODUCT' => 'sumproduct',
     :'TEXT' => 'text',
     :'TRIM' => 'trim',
+    :'VALUE' => 'value',
     :'VLOOKUP' => 'vlookup',
     :'^' => 'power'
   }

data/src/excel/excel_functions.rb

@@ -106,3 +106,5 @@ require_relative 'excel_functions/averageifs'
 require_relative 'excel_functions/forecast'
 
 require_relative 'excel_functions/ensure_is_number'
+
+require_relative 'excel_functions/value'

data/src/excel/excel_functions/sumifs.rb

@@ -31,10 +31,10 @@ module ExcelFunctions
       
       0.step(criteria.length-1,2).each do |i|
         check_range = criteria[i]
-        required_value = criteria[i+1]
+        required_value = criteria[i+1] || 0
         return :value if index >= check_range.length
         check_value = check_range[index]
-        
+
         pass = case check_value
         when String
           check_value.downcase == required_value.to_s.downcase

data/src/excel/excel_functions/value.rb

@@ -0,0 +1,7 @@
+module ExcelFunctions
+  
+  def value(a)
+     number_argument(a)
+  end
+  
+end

data/src/excel/formula_peg.rb

@@ -159,7 +159,7 @@ class Formula < RubyPeg
   
   def sheet_reference
     node :sheet_reference do
-      (single_quoted_string || terminal(/[\p{word}][\p{word}_.]+/)) && ignore { terminal("!") } && (sheetless_reference || named_reference)
+      (single_quoted_string || terminal(/[\p{word}][\p{word}_.]+/)) && ignore { terminal("!") } && (sheetless_reference || error || named_reference)
     end
   end
   

data/src/excel/formula_peg.txt

@@ -27,7 +27,7 @@ complex_structured_reference     = /\[[^\u005d]*\],\[[^\u005d]*\]/
 overly_structured_reference      = `'[' simple_structured_reference `']'
 simple_structured_reference      = /[^\u005d]*/
 named_reference                 := /[#\p{word}][\p{word}_.!]+/
-sheet_reference                 := (single_quoted_string | /[\p{word}][\p{word}_.]+/) `'!' (sheetless_reference | named_reference)
+sheet_reference                 := (single_quoted_string | /[\p{word}][\p{word}_.]+/) `'!' (sheetless_reference | error | named_reference)
 single_quoted_string             = `"'" /[^']*/ `"'"
 sheetless_reference              = column_range | row_range | area | cell
 column_range                    := column `':' column

data/src/excel_to_code.rb

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

data/src/rewrite/caching_formula_parser.rb

@@ -64,7 +64,13 @@ class CachingFormulaParser
   def sheet_reference(ast)
     ast[1] = ast[1].to_sym
     ast[2] = map(ast[2])
-    @sheet_reference_cache[ast] ||= ast
+    # We do this to deal with Control!#REF! style rerferences
+    # that occasionally pop up in named references
+    if ast[2].first == :error
+      return ast[2]
+    else
+      @sheet_reference_cache[ast] ||= ast
+    end
   end
 
   def cell(ast)

data/src/simplify.rb

@@ -21,3 +21,4 @@ require_relative "simplify/wrap_formulae_that_return_arrays_and_are_not_in_array
 require_relative "simplify/replace_string_join_on_ranges"
 require_relative "simplify/emergency_array_formula_replace_indirect_bodge.rb"
 require_relative "simplify/replace_transpose_function"
+require_relative "simplify/replace_references_to_blanks_with_zeros"

data/src/simplify/inline_formulae.rb

@@ -2,8 +2,6 @@ module BlankCell; end
 
 class InlineFormulaeAst
 
-  BLANK = [:inlined_blank]
-  
   attr_accessor :references, :current_sheet_name, :inline_ast
   attr_accessor :count_replaced
   
@@ -48,10 +46,9 @@ class InlineFormulaeAst
     ref = ast[2][1].to_s.upcase.gsub('$','').to_sym
     # FIXME: Need to check if valid worksheet and return [:error, "#REF!"] if not
     # Now check user preference on this
+    ast_to_inline = ast_to_inline(sheet, ref)
     return unless inline_ast.call(sheet,ref, references)
     @count_replaced += 1
-    ast_to_inline = references[[sheet, ref]]
-    return ast.replace(BLANK) unless ast_to_inline
     current_sheet_name.push(sheet)
     map(ast_to_inline)
     current_sheet_name.pop
@@ -62,10 +59,9 @@ class InlineFormulaeAst
   def cell(ast)
     sheet = current_sheet_name.last
     ref = ast[1].to_s.upcase.gsub('$', '').to_sym
+    ast_to_inline = ast_to_inline(sheet, ref)
     if inline_ast.call(sheet, ref, references)
       @count_replaced += 1
-      ast_to_inline = references[[sheet, ref]]
-      return ast.replace(BLANK) unless ast_to_inline
       map(ast_to_inline)
       ast.replace(ast_to_inline)
     # FIXME: Check - is this right? does it work recursively enough?
@@ -73,6 +69,14 @@ class InlineFormulaeAst
       ast.replace([:sheet_reference, sheet, ast.dup])
     end
   end
+
+  def ast_to_inline(sheet, ref)
+    ast_to_inline = references[[sheet, ref]]
+    return ast_to_inline if ast_to_inline
+    # Need to add a new blank cell and return ast for an inlined blank
+    references[[sheet, ref]] = [:blank]
+    [:inlined_blank]
+  end
     
 end
   

data/src/simplify/replace_references_to_blanks_with_zeros.rb

@@ -0,0 +1,43 @@
+class ReplaceReferencesToBlanksWithZeros
+
+  attr_accessor :references, :current_sheet_name, :inline_ast
+  attr_accessor :count_replaced
+  
+  def initialize(references = nil, current_sheet_name = nil, inline_ast = nil)
+    @references, @current_sheet_name, @inline_ast = references, [current_sheet_name], inline_ast
+    @count_replaced = 0
+    @inline_ast ||= lambda { |sheet, ref, references| true } # Default is to always inline
+  end
+  
+  def map(ast)
+    return ast unless ast.is_a?(Array)
+
+    sheet = nil
+    ref = nil
+
+    case ast.first
+    when :sheet_reference
+      return ast unless ast[2][0] == :cell
+      sheet = ast[1].to_sym
+      ref = ast[2][1].to_s.upcase.gsub('$','').to_sym
+    when :cell
+      sheet = current_sheet_name.last
+      ref = ast[1].to_s.upcase.gsub('$', '').to_sym
+    else
+      # We aren't interested
+      return ast
+    end
+
+    ast_to_inline = references[[sheet, ref]] || [:blank]
+    
+    return ast unless ast_to_inline == [:blank]
+
+    if inline_ast.call(sheet, ref, references)
+      ast.replace([:number, 0])
+    else
+      reference = [:sheet_reference, sheet, [:cell, ref]]
+      ast.replace([:function, :IF, [:function, :ISBLANK, reference], [:number, 0], reference])
+    end
+    ast
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.2.17
+  version: 0.2.18
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -199,6 +199,7 @@ files:
 - src/excel/excel_functions/sumproduct.rb
 - src/excel/excel_functions/text.rb
 - src/excel/excel_functions/trim.rb
+- src/excel/excel_functions/value.rb
 - src/excel/excel_functions/vlookup.rb
 - src/excel/formula_peg.rb
 - src/excel/formula_peg.txt
@@ -244,6 +245,7 @@ files:
 - src/simplify/replace_named_references.rb
 - src/simplify/replace_offsets_with_references.rb
 - src/simplify/replace_ranges_with_array_literals.rb
+- src/simplify/replace_references_to_blanks_with_zeros.rb
 - src/simplify/replace_shared_strings.rb
 - src/simplify/replace_string_join_on_ranges.rb
 - src/simplify/replace_table_references.rb