excel_to_code 0.3.17 → 0.3.18.beta.1

data/src/excel/excel_functions/sumifs.rb

@@ -4,7 +4,7 @@ module ExcelFunctions
     # Sort out the sum range
     range = [range] unless range.is_a?(Array)
     range = range.flatten
-    
+
     indexes = _filtered_range_indexes(range, *criteria)
     return indexes if indexes.is_a?(Symbol)
     range.values_at(*indexes)
@@ -21,17 +21,26 @@ module ExcelFunctions
     end
 
     filtered = []
-    
+
     # Work through each part of the sum range
     range.each_with_index do |potential,index|
       #next unless potential.is_a?(Numeric)
-      
+
       # If a criteria fails, this is set to false and no further criteria are evaluated
       pass = true
-      
+
       0.step(criteria.length-1,2).each do |i|
         check_range = criteria[i]
         required_value = criteria[i+1] || 0
+        if required_value.is_a?(String)
+          any_start = required_value.start_with?('*')
+          any_end = required_value.end_with?('*')
+          if any_start || any_end
+            required_value = ".*"+required_value[1..-1] if any_start
+            required_value = required_value[0..-2]+".*" if any_end
+            required_value = /^#{required_value}$/i
+          end
+        end
         return :value if index >= check_range.length
         check_value = check_range[index]
 
@@ -40,6 +49,8 @@ module ExcelFunctions
           case required_value
           when String
             check_value.downcase == required_value.downcase
+          when Regexp
+            check_value =~ required_value
           when Numeric
             begin
               Float(check_value) == required_value.to_f
@@ -72,19 +83,19 @@ module ExcelFunctions
         when Symbol
           check_value == required_value
         end # case check_value
-                
+
         break unless pass
       end # criteria loop
-      
+
       filtered << index if pass
     end
 
     return filtered
   end
-  
+
   def sumifs(range,*criteria)
     filtered = _filtered_range(range,*criteria)
     sum(*filtered)
   end
-  
+
 end

data/src/excel/excel_functions/text.rb

@@ -16,16 +16,16 @@ module ExcelFunctions
     return format if format.is_a?(Symbol)
 
     case format
-    when /^(0(\.0*)?)%/
+    when /^(0([.,]0*)?)%/
       text(number*100, $1)+"%"
     when /^(0+)$/
       sprintf("%0#{$1.length}.0f", number)
-    when /#,#+(0\.0+)?/
+    when /#[,.]#+(0[.,]0+)?/
       formated_with_decimals = text(number, $1 || "0")
       parts = formated_with_decimals.split('.')
       parts[0].gsub!(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,")
       parts.join('.')
-    when /0\.(0+)/
+    when /0[.,](0+)/
       sprintf("%.#{$1.length}f", number)
     else
       raise ExcelToCodeException.new("in TEXT function format #{format} not yet supported by excel_to_code")

data/src/excel/formula_peg.rb

@@ -27,7 +27,7 @@ class Formula < RubyPeg
   
   def function
     node :function do
-      terminal(/(LOG10)|[A-Z]+/) && ignore { terminal("(") } && space && optional { argument } && any_number_of { (space && ignore { terminal(",") } && space && argument) } && space && ignore { terminal(")") }
+      terminal(/[a-zA-Z_][a-zA-Z0-9.]+/) && ignore { terminal("(") } && space && optional { argument } && any_number_of { (space && ignore { terminal(",") } && space && argument) } && space && ignore { terminal(")") }
     end
   end
   

data/src/excel/formula_peg.txt

@@ -1,8 +1,8 @@
 formula                         := space? expression+
 expression                       = string_join | comparison | arithmetic | thing
-thing                            = percentage | function | array | brackets | any_reference | string | number | boolean | prefix | error | named_reference 
+thing                            = percentage | function | array | brackets | any_reference | string | number | boolean | prefix | error | named_reference
 argument                         = expression | null
-function                        := /(LOG10)|[A-Z]+/ `'(' space argument? (space `',' space argument)* space `')'
+function                        := /[a-zA-Z_][a-zA-Z0-9.]+/ `'(' space argument? (space `',' space argument)* space `')'
 brackets                        := `'(' space expression+ space `')'
 array							:= `'{' space  row ( space `';' space row )* space `'}'
 row								:= basic_type ( space `',' space basic_type )*
@@ -44,4 +44,3 @@ prefix                          := /[-+]/ thing
 space                            = `/[ \n\r]*/
 null                            := &','
 error                           := '#REF!' | '#NAME?' | '#VALUE!' | '#DIV/0!' | '#N/A' | '#NUM!'
-

data/src/excel/table.rb

@@ -2,17 +2,17 @@ require_relative '../excel'
 require_relative '../util'
 
 class Table
-  
+
   attr_accessor :name
-  
+
   def initialize(name,worksheet,reference,number_of_total_rows,*column_name_array)
     @name, @worksheet, @area, @number_of_total_rows, @column_name_array = name, worksheet.to_sym, Area.for(reference), number_of_total_rows.to_i, column_name_array.map { |c| c.strip.downcase }
-    @area.calculate_excel_variables    
+    @area.calculate_excel_variables
     @data_area = Area.for("#{@area.excel_start.offset(1,0)}:#{@area.excel_finish.offset(-@number_of_total_rows,0)}")
     @data_area.calculate_excel_variables
   end
-  
-  def reference_for(table_name,structured_reference,calling_worksheet,calling_cell)
+
+  def reference_for(table_name,structured_reference,calling_worksheet,calling_cell, must_be_area = false)
     raise NotSupportedException.new("Local table reference not supported in #{structured_reference.inspect}") unless table_name
 
     case structured_reference
@@ -45,7 +45,7 @@ class Table
 
     when /\[#Headers\],\[(.*?)\]/io
       column_number = column_number_for($1)
-      return ref_error unless column_number      
+      return ref_error unless column_number
       ast_for_cell @area.excel_start.offset(0,column_number)
 
     when /\[#Totals\],\[(.*?)\]/io
@@ -59,7 +59,7 @@ class Table
       row = r.excel_row_number
       column_number = column_number_for($1)
       return ref_error unless column_number
-      ast_for_cell @area.excel_start.offset(row - @area.excel_start.excel_row_number,column_number)      
+      ast_for_cell @area.excel_start.offset(row - @area.excel_start.excel_row_number,column_number)
 
     when /#Headers/io
       if calling_worksheet == @worksheet && @data_area.includes?(calling_cell)
@@ -92,14 +92,14 @@ class Table
       ast_for_area "#{@area.excel_start.excel_column}#{row}", "#{@area.excel_finish.excel_column}#{row}"
 
     else
-      if calling_worksheet == @worksheet && @data_area.includes?(calling_cell)
+      if !must_be_area && (calling_worksheet == @worksheet) && @data_area.includes?(calling_cell)
         r = Reference.for(calling_cell)
         r.calculate_excel_variables
         row = r.excel_row_number
         column_number = column_number_for(structured_reference)
         return ref_error unless column_number
-        ast_for_cell @area.excel_start.offset(row - @area.excel_start.excel_row_number,column_number)      
-      else        
+        ast_for_cell @area.excel_start.offset(row - @area.excel_start.excel_row_number,column_number)
+      else
         column_number = column_number_for(structured_reference)
         return ref_error unless column_number
         ast_for_area @area.excel_start.offset(1,column_number), @area.excel_start.offset(@area.height - @number_of_total_rows,column_number)
@@ -114,15 +114,15 @@ class Table
   def data
     ast_for_area @data_area.excel_start, @data_area.excel_finish
   end
-  
+
   def ast_for_area(start,finish)
     [:sheet_reference,@worksheet,[:area,start.to_sym,finish.to_sym]]
   end
-  
+
   def ast_for_cell(ref)
     [:sheet_reference,@worksheet,[:cell,ref.to_sym]]
   end
-  
+
   def ref_error
     [:error,"#REF!"]
   end
@@ -131,10 +131,10 @@ class Table
     name = name.strip.downcase.gsub("'#","#")
     @column_name_array.find_index(name)
   end
-  
+
   def includes?(sheet,reference)
     return false unless @worksheet == sheet
     @area.includes?(reference)
   end
-  
+
 end

data/src/excel_to_code.rb

@@ -1,7 +1,4 @@
-class ExcelToCode
-  def self.version() "0.3.17" end
-end
-
+require_relative 'version'
 require_relative 'commands'
 require_relative 'compile'
 require_relative 'excel'

data/src/extract/extract_data_from_worksheet.rb

@@ -3,6 +3,7 @@ require 'ox'
 class ExtractDataFromWorksheet < ::Ox::Sax
 
   attr_accessor :only_extract_values
+  attr_accessor :persevere
 
   attr_accessor :table_rids
   attr_accessor :worksheets_dimensions
@@ -85,7 +86,13 @@ class ExtractDataFromWorksheet < ::Ox::Sax
           ast = @fp.parse(formula_text)
         rescue ExcelToCodeException => e
           e.ref = key if e.respond_to?(:ref) # Attach the sheet and reference to the exception
-          raise
+          if persevere
+            $stderr.puts e.message
+            $stderr.puts "--persevere true, so setting #{key} to '#NAME?'"
+            ast = [:error, '#NAME?']
+          else
+            raise
+          end
         end
         unless ast
           $stderr.puts "Could not parse #{@sheet_name} #{@ref} #{formula_text}"

data/src/rewrite/ast_expand_array_formulae.rb

@@ -111,6 +111,10 @@ class AstExpandArrayFormulae
   def map_sumif(ast)
     array_map ast, true, false, true
   end
+
+  def map_countif(*args)
+    array_map args, 'COUNTIF', true, true
+  end
   
   def map_sumifs(ast)
     if ast.length > 5

data/src/rewrite/caching_formula_parser.rb

@@ -21,8 +21,8 @@ class ExternalReferenceException < ExcelToCodeException
     The formula was #{formula_text}
     Which was parsed to #{full_ast}
     Which seemed to have an external reference at #{reference_ast}
-    Note, the [0], [1], [2] ...  are the way Excel stores the names of the external files. 
-    
+    Note, the [0], [1], [2] ...  are the way Excel stores the names of the external files.
+
     Please remove the external reference from the Excel and try again.
 
     END
@@ -77,9 +77,11 @@ class CachingFormulaParser
     @comparator_cache = {}
     @sheet_reference_cache = {}
     @functions_used = {}
+    @treat_external_references_as_local = false
   end
 
-  def parse(text)
+  def parse(text, treat_external_references_as_local = false)
+    @treat_external_references_as_local = treat_external_references_as_local
     ast = Formula.parse(text)
     @text = text # Kept in case of Exception below
     if ast
@@ -95,17 +97,17 @@ class CachingFormulaParser
   def map(ast)
     return ast unless ast.is_a?(Array)
     if ast[0] == :function
-      ast[1] = ast[1].to_sym 
+      ast[1] = ast[1].to_sym
       @functions_used[ast[1]] = true
     end
     if respond_to?(ast[0])
-      ast = send(ast[0], ast) 
+      ast = send(ast[0], ast)
     else
-      ast.each.with_index do |a,i| 
+      ast.each.with_index do |a,i|
         next unless a.is_a?(Array)
-        
+
         if a[0] == :function
-          a[1] = a[1].to_sym 
+          a[1] = a[1].to_sym
           @functions_used[a[1]] = true
         end
 
@@ -117,14 +119,17 @@ class CachingFormulaParser
 
   # We can't deal with external references at the moment
   def external_reference(ast)
-    raise ExternalReferenceException.new(ast, @full_ast, @text)
+    raise ExternalReferenceException.new(ast, @full_ast, @text) unless @treat_external_references_as_local
+    # We sometimes treat the external reference as local in order to move on
+    return ast[2]
   end
 
   def sheet_reference(ast)
-    # Sheet names shouldn't start with [1], because those are 
+    # Sheet names shouldn't start with [1], because those are
     # external references
     if ast[1] =~ /^\[\d+\]/
-       raise ExternalReferenceException.new(ast, @full_ast, @text)
+       raise ExternalReferenceException.new(ast, @full_ast, @text) unless @treat_external_references_as_local
+       ast[1] = ast[1].gsub(/^\[\d+\]/,'')
     end
     ast[1] = ast[1].to_sym
     ast[2] = map(ast[2])

data/src/simplify.rb

@@ -6,6 +6,7 @@ require_relative "simplify/inline_formulae"
 require_relative "simplify/map_formulae_to_values"
 require_relative "simplify/replace_indirects_with_references"
 require_relative "simplify/replace_offsets_with_references"
+require_relative "simplify/replace_cell_addresses_with_references"
 require_relative "simplify/replace_column_with_column_number"
 require_relative "simplify/simplify_arithmetic"
 require_relative "simplify/identify_dependencies"

data/src/simplify/inline_formulae.rb

@@ -1,3 +1,19 @@
+class Array
+
+  def original
+    @original || self
+  end
+
+  alias_method :original_replace, :replace
+
+  def replace(new_array)
+    @original = self.dup
+    original_replace(new_array)
+  end
+end
+
+
+
 class InlineFormulaeAst
 
   attr_accessor :references, :current_sheet_name, :inline_ast

data/src/simplify/replace_arithmetic_on_ranges.rb

@@ -5,7 +5,7 @@ class ReplaceArithmeticOnRangesAst
     ast.each do |a| 
       next unless a.is_a?(Array)
       case ast.first
-      when :error, :null, :space, :prefix, :boolean_true, :boolean_false, :number, :string
+      when :error, :null, :space, :boolean_true, :boolean_false, :number, :string
         next
       when :sheet_reference, :table_reference, :local_table_reference
         next
@@ -15,6 +15,7 @@ class ReplaceArithmeticOnRangesAst
         map(a)
       end
     end
+    prefix(ast) if ast.first == :prefix
     arithmetic(ast) if ast.first == :arithmetic
     comparison(ast) if ast.first == :comparison
     ast
@@ -121,6 +122,18 @@ class ReplaceArithmeticOnRangesAst
       )
     end
   end
+  
+  # Format [:prefix, symbol, array] 
+  def prefix(ast)
+    symbol, array = ast[1], ast[2]
+    # array on the right next
+    return unless array.first == :array
+    ast.replace(
+      array_map(array) do |cell|
+        [:prefix, symbol, map(cell)]
+      end
+    )
+  end
 
   def array_map(array)
     array.map do |row|

data/src/simplify/replace_arrays_with_single_cells.rb

@@ -10,6 +10,7 @@ class ReplaceArraysWithSingleCellsAst
   def map(ast)
     @need_to_replace = false
     return unless ast.is_a?(Array)
+    map_if_required(ast)
     if ast.first == :array
       @need_to_replace = true
       new_ast = try_and_convert_array(ast)
@@ -29,6 +30,7 @@ class ReplaceArraysWithSingleCellsAst
 
   def do_map(ast)
     return ast unless ast.is_a?(Array)
+    map_if_required(ast)
     case ast.first
     when :arithmetic
       left, op, right = ast[1], ast[2], ast[3]
@@ -36,16 +38,25 @@ class ReplaceArraysWithSingleCellsAst
         left = try_and_convert_array(left)
         right = try_and_convert_array(right)
         ast.replace([:arithmetic, left, op, right])
-      else
-        map_if_required(ast)
+      end
+    when :comparison
+      left, op, right = ast[1], ast[2], ast[3]
+      if left.first == :array || right.first == :array
+        left = try_and_convert_array(left)
+        right = try_and_convert_array(right)
+        ast.replace([:comparison, left, op, right])
+      end
+    when :prefix
+      op, left = ast[1], ast[2]
+      if left.first == :array
+        left = try_and_convert_array(left)
+        ast.replace([:prefix, op, left])
       end
     when :string_join
       strings = ast[1..-1]
       if strings.any? { |s| s.first == :array }
         strings = strings.map { |s| try_and_convert_array(s) }
         ast.replace([:string_join, *strings])
-      else
-        map_if_required(strings)
       end
     when :function
       if ast[1] == :SUMIF && ast[3].first == :array
@@ -56,11 +67,9 @@ class ReplaceArraysWithSingleCellsAst
         # Replacement made in check_match function
       elsif ast[1] == :INDIRECT && check_indirect(ast)
         # Replacement made in check function
-      else
-        map_if_required(ast)
+      elsif ast[0] == :function && ast[1] == :INDEX && check_index(ast)
+        # Replacement made in check
       end
-    else
-      map_if_required(ast)
     end
   end
 
@@ -71,7 +80,7 @@ class ReplaceArraysWithSingleCellsAst
     arguments.each do |a|
       next unless a.is_a?(Array)
       case a.first
-      when :error, :null, :space, :prefix, :boolean_true, :boolean_false, :number, :string
+      when :error, :null, :space, :boolean_true, :boolean_false, :number, :string
         next
       when :sheet_reference, :table_reference, :local_table_reference
         next
@@ -94,17 +103,35 @@ class ReplaceArraysWithSingleCellsAst
     replacement_made
   end
 
+  def check_index(ast)
+    replacement_made = false
+    if ast[3] && ast[3].first == :array
+      replacement_made = true
+      ast[3] = try_and_convert_array(ast[3])
+    end
+    if ast[4] && ast[4].first == :array
+      replacement_made = true
+      ast[4] = try_and_convert_array(ast[4])
+    end
+    replacement_made
+  end
+
   def check_if(ast)
     replacement_made = false
+    if ast[2] && ast[2].first == :array
+      replacement_made = true
+      ast[2] = try_and_convert_array(ast[2])
+    end
     if ast[3] && ast[3].first == :array
       replacement_made = true
       ast[3] = try_and_convert_array(ast[3])
     end
     if ast[4] && ast[4].first == :array
       replacement_made = true
-      ast[4] = try_and_convert_array(ast[3])
+      ast[4] = try_and_convert_array(ast[4])
     end
     replacement_made
+
   end
 
   def check_match(ast)
@@ -149,7 +176,7 @@ class ReplaceArraysWithSingleCellsAst
   def all_references?(ast)
     ast[1..-1].all? do |row|
       row[1..-1].all? do |cell|
-        cell.first == :sheet_reference
+        cell.original.first == :sheet_reference
       end
     end
   end
@@ -162,8 +189,8 @@ class ReplaceArraysWithSingleCellsAst
 
     cells = ast[1][1..-1]
     match = cells.find do |cell|
-      s = cell[1]
-      c = cell[2][1][/([A-Za-z]{1,3})/,1]
+      s = cell.original[1]
+      c = cell.original[2][1][/([A-Za-z]{1,3})/,1]
       sheet == s && column == c
     end
 
@@ -178,8 +205,8 @@ class ReplaceArraysWithSingleCellsAst
 
     cells = ast[1..-1].map { |row| row.last }
     match = cells.find do |cell|
-      s = cell[1]
-      r = cell[2][1][/([A-Za-z]{1,3})(\d+)/,2]
+      s = cell.original[1]
+      r = cell.original[2][1][/([A-Za-z]{1,3})(\d+)/,2]
       sheet == s && row == r
     end