excel_to_code 0.1.8 → 0.1.10

data/src/simplify/map_formulae_to_values.rb

@@ -4,13 +4,18 @@ require_relative '../util'
 
 class FormulaeCalculator
   include ExcelFunctions
+  attr_accessor :original_excel_filename
 end
 
 class MapFormulaeToValues
   
+  attr_accessor :original_excel_filename
+  attr_accessor :replacements_made_in_the_last_pass
+  
   def initialize
     @value_for_ast = MapValuesToRuby.new
     @calculator = FormulaeCalculator.new
+    @replacements_made_in_the_last_pass = 0
     @cache = {}
   end
 
@@ -21,6 +26,7 @@ class MapFormulaeToValues
   # FIXME: Caching works in the odd edge cases of long formula
   # but I really need to find the root cause of the problem
   def map(ast)
+    @calculator.original_excel_filename = original_excel_filename
     @cache[ast] ||= do_map(ast)
   end
 
@@ -33,7 +39,7 @@ class MapFormulaeToValues
       [operator,*ast[1..-1].map {|a| map(a) }]
     end
   end
-  
+
   def prefix(operator,argument)
     argument_value = value(map(argument))
     return [:prefix, operator, map(argument)] if argument_value == :not_a_value
@@ -52,7 +58,7 @@ class MapFormulaeToValues
   end
   
   alias :comparison :arithmetic
-  
+
   def percentage(number)
     ast_for_value(value([:percentage, number]))
   end
@@ -82,6 +88,12 @@ class MapFormulaeToValues
       end
     end
   end
+
+  def map_count(range)
+    return [:function, "COUNT", range] unless [:array, :cell, :sheet_reference].include?(range.first)
+    range = array_as_values(range)
+    ast_for_value(range.size * range.first.size)
+  end
   
   def map_index(array,row_number,column_number = :not_specified)
     return map_index_with_only_two_arguments(array,row_number) if column_number == :not_specified
@@ -96,7 +108,7 @@ class MapFormulaeToValues
     return  [:function, "INDEX", array_mapped, map(row_number), map(column_number)] unless array_as_values
 
     result = @calculator.send(MapFormulaeToRuby::FUNCTIONS["INDEX"],array_as_values,row_as_number,column_as_number)
-    result = ast_for_value(result) unless result.is_a?(Array)
+    result = ast_for_value(result)
     result    
   end
   
@@ -107,7 +119,7 @@ class MapFormulaeToValues
     array_as_values = array_as_values(array)
     return  [:function, "INDEX", array_mapped, map(row_number)] unless array_as_values
     result = @calculator.send(MapFormulaeToRuby::FUNCTIONS["INDEX"],array_as_values,row_as_number)
-    result = ast_for_value(result) unless result.is_a?(Array)
+    result = ast_for_value(result)
     result
   end
   
@@ -125,8 +137,6 @@ class MapFormulaeToValues
       nil
     end
   end
-  
-
     
   def value(ast)
     return extract_values_from_array(ast) if ast.first == :array
@@ -150,6 +160,8 @@ class MapFormulaeToValues
   end
   
   def ast_for_value(value)
+    return value if value.is_a?(Array) && value.first.is_a?(Symbol)
+    @replacements_made_in_the_last_pass += 1
     case value
     when Numeric; [:number,value.inspect]
     when true; [:boolean_true]

data/src/simplify/remove_cells.rb

@@ -8,7 +8,7 @@ class RemoveCells
   end
   
   def rewrite(input,output)
-    input.lines do |line|
+    input.each_line do |line|
       ref = line[/^(.*?)\t/,1]
       if cells_to_keep.has_key?(ref)
         output.puts line

data/src/simplify/replace_arrays_with_single_cells.rb

@@ -8,7 +8,7 @@ class ReplaceArraysWithSingleCells
   
   def replace(input,output)
   
-    input.lines do |line|
+    input.each_line do |line|
       # Looks to match shared string lines
       if line =~ /\[:array/
         content = line.split("\t")

data/src/simplify/replace_column_with_column_number.rb

@@ -0,0 +1,58 @@
+class ReplaceColumnWithColumnNumberAST
+    
+  attr_accessor :replacements_made_in_the_last_pass
+
+  def initialize
+    @replacements_made_in_the_last_pass = 0
+  end
+   
+  def map(ast)
+    return ast unless ast.is_a?(Array)
+    operator = ast[0]
+    if respond_to?(operator)
+      send(operator,*ast[1..-1])
+    else
+      [operator,*ast[1..-1].map {|a| map(a) }]
+    end
+  end
+  
+  def function(name,*args)
+    if name == "COLUMN" && args.size == 1 && [:cell, :sheet_reference].include?(args[0][0])
+      if args[0][0] == :cell
+        reference = Reference.for(args[0][1])
+      elsif args[0][0] == :sheet_reference
+        reference = Reference.for(args[0][2][1])
+      end
+      reference.calculate_excel_variables
+      @replacements_made_in_the_last_pass += 1
+      [:number, reference.excel_column_number.to_s]
+    else
+      [:function,name,*args.map { |a| map(a) }]
+    end
+  end
+
+end
+  
+
+class ReplaceColumnWithColumnNumber
+    
+  def self.replace(*args)
+    self.new.replace(*args)
+  end
+
+  attr_accessor :replacements_made_in_the_last_pass
+  
+  def replace(input,output)
+    rewriter = ReplaceColumnWithColumnNumberAST.new
+    input.each_line do |line|
+      # Looks to match lines with references
+      if line =~ /"COLUMN"/
+        ref, ast = line.split("\t")
+        output.puts "#{ref}\t#{rewriter.map(eval(ast)).inspect}"
+      else
+        output.puts line
+      end
+    end
+    @replacements_made_in_the_last_pass = rewriter.replacements_made_in_the_last_pass
+  end
+end

data/src/simplify/replace_common_elements_in_formulae.rb

@@ -12,7 +12,7 @@ class ReplaceCommonElementsInFormulae
       ref, element = a.split("\t")
       @common_elements[element.strip] = [:cell, ref]
     end
-    input.lines do |line|
+    input.each_line do |line|
       ref, formula = line.split("\t")
       output.puts "#{ref}\t#{replace_repeated_formulae(eval(formula)).inspect}"
     end

data/src/simplify/replace_formulae_with_calculated_values.rb

@@ -2,13 +2,18 @@ require_relative 'map_formulae_to_values'
 
 class ReplaceFormulaeWithCalculatedValues
     
+  attr_accessor :excel_file
+
   def self.replace(*args)
     self.new.replace(*args)
   end
+
+  attr_accessor :replacements_made_in_the_last_pass
   
   def replace(input,output)
     rewriter = MapFormulaeToValues.new
-    input.lines do |line|
+    rewriter.original_excel_filename = excel_file
+    input.each_line do |line|
       begin
         ref, ast = line.split("\t")
         output.puts "#{ref}\t#{rewriter.map(eval(ast)).inspect}"
@@ -18,5 +23,6 @@ class ReplaceFormulaeWithCalculatedValues
         raise
       end
     end
+    @replacements_made_in_the_last_pass = rewriter.replacements_made_in_the_last_pass
   end
 end

data/src/simplify/replace_indirects_with_references.rb

@@ -1,7 +1,13 @@
 require_relative '../excel/formula_peg'
 
 class ReplaceIndirectsWithReferencesAst
-    
+  
+  attr_accessor :replacements_made_in_the_last_pass
+
+  def initialize
+    @replacements_made_in_the_last_pass = 0
+  end
+   
   def map(ast)
     return ast unless ast.is_a?(Array)
     operator = ast[0]
@@ -13,8 +19,12 @@ class ReplaceIndirectsWithReferencesAst
   end
   
   def function(name,*args)
-    if name == "INDIRECT" && args.size == 1 && args[0][0] == :string
+    if name == "INDIRECT" && args[0][0] == :string
+      @replacements_made_in_the_last_pass += 1
       Formula.parse(args[0][1]).to_ast[1]
+    elsif name == "INDIRECT" && args[0][0] == :error
+      @replacements_made_in_the_last_pass += 1
+      args[0]
     else
       puts "indirect #{[:function,name,*args.map { |a| map(a) }].inspect} not replaced" if name == "INDIRECT"
       [:function,name,*args.map { |a| map(a) }]
@@ -28,10 +38,12 @@ class ReplaceIndirectsWithReferences
   def self.replace(*args)
     self.new.replace(*args)
   end
+
+  attr_accessor :replacements_made_in_the_last_pass
   
   def replace(input,output)
     rewriter = ReplaceIndirectsWithReferencesAst.new
-    input.lines do |line|
+    input.each_line do |line|
       # Looks to match lines with references
       if line =~ /"INDIRECT"/
         ref, ast = line.split("\t")
@@ -40,5 +52,6 @@ class ReplaceIndirectsWithReferences
         output.puts line
       end
     end
+    @replacements_made_in_the_last_pass = rewriter.replacements_made_in_the_last_pass
   end
 end

data/src/simplify/replace_named_references.rb

@@ -68,7 +68,7 @@ class ReplaceNamedReferences
   def replace(values,named_references,output)
     named_references = NamedReferences.new(named_references.readlines)
     rewriter = ReplaceNamedReferencesAst.new(named_references,sheet_name)
-    values.lines do |line|
+    values.each_line do |line|
       # Looks to match shared string lines
       if line =~ /\[:named_reference/
         cols = line.split("\t")

data/src/simplify/replace_offsets_with_references.rb

@@ -0,0 +1,66 @@
+class ReplaceOffsetsWithReferencesAst
+
+  attr_accessor :replacements_made_in_the_last_pass
+
+  def initialize
+    @replacements_made_in_the_last_pass = 0
+  end
+    
+  def map(ast)
+    return ast unless ast.is_a?(Array)
+    operator = ast[0]
+    if respond_to?(operator)
+      send(operator,*ast[1..-1])
+    else
+      [operator,*ast[1..-1].map {|a| map(a) }]
+    end
+  end
+  
+  def function(name,*args)
+    if name == "OFFSET" && args.size == 5 && args[0][0] == :cell && args[1][0] == :number && args[2][0] == :number && args[3][0] == :number && args[4][0] == :number 
+      replace_offset(args[0][1], args[1][1], args[2][1], args[3][1], args[4][1])
+    elsif name == "OFFSET" && args.size == 3 && args[0][0] == :cell && args[1][0] == :number && args[2][0] == :number
+      replace_offset(args[0][1], args[1][1], args[2][1])
+    else
+      puts "offset in #{[:function,name,*args.map { |a| map(a) }].inspect} not replaced" if name == "INDIRECT"
+      [:function,name,*args.map { |a| map(a) }]
+    end
+  end
+
+  def replace_offset(reference, row_offset, column_offset, height = 1, width = 1)
+    @replacements_made_in_the_last_pass += 1
+    reference = Reference.for(reference.gsub!("$",""))
+    start_reference = reference.offset(row_offset.to_i, column_offset.to_i)
+    end_reference = reference.offset(row_offset.to_i + height.to_i - 1, column_offset.to_i + width.to_i - 1)
+    if start_reference == end_reference
+      [:cell, start_reference]
+    else
+      [:area, start_reference, end_reference]
+    end
+  end
+
+end
+  
+
+class ReplaceOffsetsWithReferences
+    
+  def self.replace(*args)
+    self.new.replace(*args)
+  end
+  
+  attr_accessor :replacements_made_in_the_last_pass
+  
+  def replace(input,output)
+    rewriter = ReplaceOffsetsWithReferencesAst.new
+    input.each_line do |line|
+      # Looks to match lines with references
+      if line =~ /"OFFSET"/
+        ref, ast = line.split("\t")
+        output.puts "#{ref}\t#{rewriter.map(eval(ast)).inspect}"
+      else
+        output.puts line
+      end
+    end
+    @replacements_made_in_the_last_pass = rewriter.replacements_made_in_the_last_pass
+  end
+end

data/src/simplify/replace_ranges_with_array_literals.rb

@@ -39,7 +39,7 @@ class ReplaceRangesWithArrayLiterals
   def replace(input,output)
     rewriter = ReplaceRangesWithArrayLiteralsAst.new
   
-    input.lines do |line|
+    input.each_line do |line|
       # Looks to match shared string lines
       if line =~ /\[:area/
         content = line.split("\t")

data/src/simplify/replace_shared_strings.rb

@@ -36,7 +36,7 @@ class ReplaceSharedStrings
   # Rewrites ast with shared strings to strings
   def replace(values,shared_strings,output)
     rewriter = ReplaceSharedStringAst.new(shared_strings.readlines)
-    values.lines do |line|
+    values.each_line do |line|
       # Looks to match shared string lines
       if line =~ /\[:shared_string/
         ref, ast = line.split("\t")

data/src/simplify/replace_table_references.rb

@@ -49,7 +49,7 @@ class ReplaceTableReferences
         
     rewriter = ReplaceTableReferenceAst.new(tables,sheet_name)
   
-    input.lines do |line|
+    input.each_line do |line|
       # Looks to match shared string lines
       begin
         if line =~ /\[(:table_reference|:local_table_reference)/
@@ -68,4 +68,4 @@ class ReplaceTableReferences
     end
   end
   
-end
+end

data/src/simplify/replace_values_with_constants.rb

@@ -33,7 +33,7 @@ class ReplaceValuesWithConstants
   
   def replace(input,output)
     @rewriter ||= MapValuesToConstants.new
-    input.lines do |line|
+    input.each_line do |line|
       begin
         ref, ast = line.split("\t")
         output.puts "#{ref}\t#{rewriter.map(eval(ast)).inspect}"

data/src/simplify/simplify_arithmetic.rb

@@ -40,7 +40,7 @@ class SimplifyArithmetic
   
   def replace(input,output)
     rewriter = SimplifyArithmeticAst.new
-    input.lines do |line|
+    input.each_line do |line|
       # Looks to match lines with references
       if line =~ /:arithmetic/
         content = line.split("\t")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.10
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-05 00:00:00.000000000 Z
+date: 2013-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -123,6 +123,7 @@ files:
 - src/excel/excel_functions/and.rb
 - src/excel/excel_functions/apply_to_range.rb
 - src/excel/excel_functions/average.rb
+- src/excel/excel_functions/cell.rb
 - src/excel/excel_functions/choose.rb
 - src/excel/excel_functions/cosh.rb
 - src/excel/excel_functions/count.rb
@@ -140,6 +141,7 @@ files:
 - src/excel/excel_functions/less_than.rb
 - src/excel/excel_functions/less_than_or_equal.rb
 - src/excel/excel_functions/max.rb
+- src/excel/excel_functions/mid.rb
 - src/excel/excel_functions/min.rb
 - src/excel/excel_functions/mod.rb
 - src/excel/excel_functions/more_than.rb
@@ -151,6 +153,7 @@ files:
 - src/excel/excel_functions/pi.rb
 - src/excel/excel_functions/pmt.rb
 - src/excel/excel_functions/power.rb
+- src/excel/excel_functions/pv.rb
 - src/excel/excel_functions/round.rb
 - src/excel/excel_functions/rounddown.rb
 - src/excel/excel_functions/roundup.rb
@@ -161,6 +164,8 @@ files:
 - src/excel/excel_functions/sumif.rb
 - src/excel/excel_functions/sumifs.rb
 - src/excel/excel_functions/sumproduct.rb
+- src/excel/excel_functions/text.rb
+- src/excel/excel_functions/trim.rb
 - src/excel/excel_functions/vlookup.rb
 - src/excel/excel_functions.rb
 - src/excel/formula_peg.rb
@@ -206,10 +211,12 @@ files:
 - src/simplify/map_formulae_to_values.rb
 - src/simplify/remove_cells.rb
 - src/simplify/replace_arrays_with_single_cells.rb
+- src/simplify/replace_column_with_column_number.rb
 - src/simplify/replace_common_elements_in_formulae.rb
 - src/simplify/replace_formulae_with_calculated_values.rb
 - src/simplify/replace_indirects_with_references.rb
 - src/simplify/replace_named_references.rb
+- src/simplify/replace_offsets_with_references.rb
 - src/simplify/replace_ranges_with_array_literals.rb
 - src/simplify/replace_shared_strings.rb
 - src/simplify/replace_table_references.rb