excel_to_code 0.1.8 → 0.1.10

data/src/compile/c/map_formulae_to_c.rb

@@ -51,6 +51,9 @@ class MapFormulaeToC < MapValuesToC
     'MIN' => 'min',
     'MOD' => 'mod',
     'PMT' => 'pmt',
+    'PV3' => 'pv_3',
+    'PV4' => 'pv_4',
+    'PV5' => 'pv_5',
     'ROUND' => 'excel_round',
     'ROUNDDOWN' => 'rounddown',
     'ROUNDUP' => 'roundup',
@@ -60,6 +63,7 @@ class MapFormulaeToC < MapValuesToC
     'SUMIF2' => 'sumif_2',
     'SUMIF3' => 'sumif',
     'SUMIFS' => 'sumifs',
+    'TEXT2' => 'text',
     'SUMPRODUCT' => 'sumproduct',
     'VLOOKUP3' => 'vlookup_3',
     'VLOOKUP4' => 'vlookup',

data/src/compile/c/map_sheet_names_to_c_names.rb

@@ -6,7 +6,7 @@ class MapSheetNamesToCNames
   
   def rewrite(input,output)
     c_names_assigned = {}
-    input.lines do |line|
+    input.each_line do |line|
       excel_worksheet_name = line.split("\t").first
       c_name = excel_worksheet_name.downcase.gsub(/[^a-z0-9]+/,'_')
       c_name = "s"+c_name if c_name[0] !~ /[a-z]/

data/src/compile/c/map_values_to_c.rb

@@ -65,7 +65,8 @@ class MapValuesToC
     "#VALUE!" => "VALUE",
     "#DIV/0!" => "DIV0",
     "#REF!" => "REF",
-    "#N/A" => "NA"
+    "#N/A" => "NA",
+    "#NUM!" => "NUM"
   }
   
   REVERSE_ERRORS = ERRORS.invert

data/src/compile/ruby/compile_to_ruby.rb

@@ -15,7 +15,7 @@ class CompileToRuby
     mapper.worksheet = worksheet
     mapper.sheet_names = Hash[sheet_names_file.readlines.map { |line| line.strip.split("\t")}]
     c_name = mapper.sheet_names[worksheet]
-    input.lines do |line|
+    input.each_line do |line|
       begin
         ref, formula = line.split("\t")
         name = c_name ? "#{c_name}_#{ref.downcase}" : ref.downcase
@@ -32,4 +32,4 @@ class CompileToRuby
     end
   end
   
-end
+end

data/src/compile/ruby/compile_to_ruby_unit_test.rb

@@ -17,7 +17,7 @@ class CompileToRubyUnitTest
   
   def rewrite(input, sloppy, c_name, refs_to_test, o)
     mapper = MapValuesToRuby.new
-    input.lines do |line|
+    input.each_line do |line|
       ref, formula = line.split("\t")
       next unless refs_to_test.include?(ref.upcase)
       ast = eval(formula)

data/src/compile/ruby/map_formulae_to_ruby.rb

@@ -19,6 +19,7 @@ class MapFormulaeToRuby < MapValuesToRuby
     'ABS' => 'abs',
     'AND' => 'excel_and',
     'AVERAGE' => 'average',
+    'CELL' => 'cell',
     'CHOOSE' => 'choose',
     'COSH' => 'cosh',
     'COUNT' => 'count',
@@ -32,10 +33,12 @@ class MapFormulaeToRuby < MapValuesToRuby
     'LEFT' => 'left',
     'MATCH' => 'excel_match',
     'MAX' => 'max',
+    'MID' => 'mid',
     'MIN' => 'min',
     'MOD' => 'mod',
     'PI' => 'pi',
     'PMT' => 'pmt',
+    'PV' => 'pv',
     'ROUND' => 'round',
     'ROUNDDOWN' => 'rounddown',
     'ROUNDUP' => 'roundup',
@@ -44,6 +47,8 @@ class MapFormulaeToRuby < MapValuesToRuby
     'SUMIF' => 'sumif',
     'SUMIFS' => 'sumifs',
     'SUMPRODUCT' => 'sumproduct',
+    'TEXT' => 'text',
+    'TRIM' => 'trim',
     'VLOOKUP' => 'vlookup',
     '^' => 'power'
   }

data/src/compile/ruby/map_values_to_ruby.rb

@@ -45,7 +45,8 @@ class MapValuesToRuby
     "#VALUE!" => ":value",
     "#DIV/0!" => ":div0",
     "#REF!" => ":ref",
-    "#N/A" => ":na"
+    "#N/A" => ":na",
+    "#NUM!" => ":num"
   }
   
   REVERSE_ERRORS = ERRORS.invert

data/src/excel/excel_functions.rb

@@ -69,3 +69,13 @@ require_relative 'excel_functions/int'
 
 # Other functions
 
+
+require_relative 'excel_functions/cell'
+
+require_relative 'excel_functions/trim'
+
+require_relative 'excel_functions/mid'
+
+require_relative 'excel_functions/pv'
+
+require_relative 'excel_functions/text'

data/src/excel/excel_functions/cell.rb

@@ -0,0 +1,14 @@
+module ExcelFunctions
+  
+  def cell(info_type, reference = nil)
+    return info_type if info_type.is_a?(Symbol)
+    return :value unless info_type.is_a?(String)
+    case info_type.downcase
+    when 'filename'
+      original_excel_filename
+    else
+      :value
+    end
+  end
+  
+end

data/src/excel/excel_functions/mid.rb

@@ -0,0 +1,20 @@
+module ExcelFunctions
+  
+  def mid(text, start_num, num_chars)
+    start_num = number_argument(start_num)
+    num_chars = number_argument(num_chars)
+
+    return text if text.is_a?(Symbol)
+    return start_num if start_num.is_a?(Symbol)
+    return num_chars if num_chars.is_a?(Symbol)
+
+    text = text.to_s
+
+    return :value if start_num < 1
+    return :value if num_chars < 0
+
+    return "" if start_num > text.length
+    text[start_num - 1, num_chars]
+  end
+  
+end

data/src/excel/excel_functions/negative.rb

@@ -1,6 +1,8 @@
 module ExcelFunctions
   
   def negative(a)
+    return a.map { |c| negative(c) } if a.is_a?(Array)
+
     a = number_argument(a)
   
     return a if a.is_a?(Symbol)

data/src/excel/excel_functions/pv.rb

@@ -0,0 +1,37 @@
+module ExcelFunctions
+  
+  def pv(rate, nper, pmt, fv = nil, type = nil)
+    # Turn the remainder into numbers
+    rate = number_argument(rate)
+    nper = number_argument(nper)
+    pmt = number_argument(pmt)
+    fv = number_argument(fv)
+    type = number_argument(type)
+
+    # Check for errors
+    return rate if rate.is_a?(Symbol)
+    return nper if nper.is_a?(Symbol)
+    return pmt if pmt.is_a?(Symbol)
+    return fv if fv.is_a?(Symbol)
+
+    return :value unless (type == 1 || type == 0)
+    return :value unless rate >= 0
+
+    # Sum the payments
+    if rate > 0
+      present_value = -pmt * ((1 - ((1 + rate)**-nper))/rate)
+    else
+      present_value = -pmt * nper
+    end
+
+    # Adjust for the type, which governs whether payments at the beginning or end of the period
+    present_value = present_value * ( 1 + rate) if type == 1
+
+    # Add on the final value
+    present_value += -fv / ((1 + rate)**(nper))
+
+    # Return the answer
+    present_value
+  end
+  
+end

data/src/excel/excel_functions/text.rb

@@ -0,0 +1,25 @@
+module ExcelFunctions
+  
+  def text(number, format)
+    number ||= 0
+    return "" unless format
+
+    if number.is_a?(String)
+      begin
+        number = Float(number)
+      rescue ArgumentError => e
+        # Ignore
+      end
+    end
+    return number unless number.is_a?(Numeric)
+    return format if format.is_a?(Symbol)
+
+    case format
+    when '0%'
+      "#{(number * 100).round}%"
+    else
+      format
+    end
+  end
+  
+end

data/src/excel/excel_functions/trim.rb

@@ -0,0 +1,8 @@
+module ExcelFunctions
+  
+  def trim(text)
+    return text unless text.is_a?(String)
+    text.strip.gsub(/ +/,' ')
+  end
+  
+end

data/src/excel/table.rb

@@ -9,6 +9,7 @@ class Table
     @name, @worksheet, @area, @number_of_total_rows, @column_name_array = name, worksheet, Area.for(reference), number_of_total_rows.to_i, column_name_array.map { |c| c.strip.downcase }
     @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)

data/src/extract/check_for_unknown_functions.rb

@@ -10,7 +10,7 @@ class CheckForUnknownFunctions
   
   def check(input,output)
     self.settable ||= lambda { |ref| false }
-    input.lines do |line|
+    input.each_line do |line|
       line.scan(/\[:function, "(.*?)"/).each do |match|
         output.puts $1 unless MapFormulaeToRuby::FUNCTIONS.has_key?($1)
       end

data/src/rewrite/ast_expand_array_formulae.rb

@@ -114,13 +114,11 @@ class AstExpandArrayFormulae
   
   private
   
-  def no_need_to_array?(args,ok_to_be_an_array)
+  def no_need_to_array?(args, ok_to_be_an_array)
     ok_to_be_an_array.each_with_index do |array_ok,i|
-      unless array_ok
-        if args[i].first == :array
-          return false
-        end
-      end
+      next if array_ok
+      break unless args[i]
+      return false if args[i].first == :array
     end
     true
   end

data/src/rewrite/rewrite_array_formulae.rb

@@ -45,7 +45,7 @@ class RewriteArrayFormulae
   end
   
   def rewrite(input,output)
-    input.lines do |line|
+    input.each_line do |line|
       ref, array_range, formula = line.split("\t")
       array_formula(formula,array_range,output)
     end
@@ -68,4 +68,4 @@ class RewriteArrayFormulae
     end
   end
   
-end
+end

data/src/rewrite/rewrite_array_formulae_to_arrays.rb

@@ -8,7 +8,7 @@ class RewriteArrayFormulaeToArrays
   
   def rewrite(input,output)
     mapper = AstExpandArrayFormulae.new
-    input.lines do |line|
+    input.each_line do |line|
       content = line.split("\t")
       ast = eval(content.pop)
       output.puts "#{content.join("\t")}\t#{mapper.map(ast).inspect}"

data/src/rewrite/rewrite_cell_references_to_include_sheet.rb

@@ -42,7 +42,7 @@ class RewriteCellReferencesToIncludeSheet
   def rewrite(input,output)
     mapper = RewriteCellReferencesToIncludeSheetAst.new
     mapper.worksheet = worksheet
-    input.lines do |line|
+    input.each_line do |line|
       if line =~ /(:area|:cell)/
         content = line.split("\t")
         ast = eval(content.pop)

data/src/rewrite/rewrite_formulae_to_ast.rb

@@ -9,7 +9,7 @@ class RewriteFormulaeToAst
   # input should be in the form: 'thing\tthing\tformula\n' where the last field is always a forumla
   # output will be in the form 'thing\tthing\tast\n'
   def rewrite(input,output)
-    input.lines.with_index do |line,i|
+    input.each_line.with_index do |line,i|
       line =~ /^(.*\t)(.*?)$/
       output.write $1
       ast =  Formula.parse($2)

data/src/rewrite/rewrite_merge_formulae_and_values.rb

@@ -12,7 +12,7 @@ class RewriteMergeFormulaeAndValues
     array_formula = Hash[array_formula.readlines.map { |line| [line[/(.*?)\t/,1],line]}]
     simple_formulae = Hash[simple_formulae.readlines.map { |line| [line[/(.*?)\t/,1],line]}]
         
-    values.lines do |line|
+    values.each_line do |line|
       ref = line[/(.*?)\t/,1]
       @references_to_add_if_they_are_not_already_present.delete(ref)
       output.puts simple_formulae[ref] || array_formula[ref] || shared_formulae[ref] || line
@@ -23,4 +23,4 @@ class RewriteMergeFormulaeAndValues
   end
   
 end
-  
+  

data/src/rewrite/rewrite_named_reference_names.rb

@@ -16,7 +16,7 @@ class RewriteNamedReferenceNames
     worksheet_names = Hash[worksheet_names.readlines.map { |line| line.strip.split("\t")}]
     c_names_assigned = worksheet_names.invert
 
-    named_references.lines do |line|
+    named_references.each_line do |line|
       sheet, name, reference = line.split("\t")
       sheet = worksheet_names[sheet]
       if sheet

data/src/rewrite/rewrite_relationship_id_to_filename.rb

@@ -7,7 +7,7 @@ class RewriteRelationshipIdToFilename
   def rewrite(input, relationships_file, output)
     relationships_file.rewind
     relationships = Hash[relationships_file.readlines.map { |line| line.split("\t")}]
-    input.lines do |line|
+    input.each_line do |line|
       parts = line.split("\t")
       rid = parts.pop.strip
       if relationships.has_key?(rid)

data/src/rewrite/rewrite_shared_formulae.rb

@@ -6,8 +6,8 @@ class RewriteSharedFormulae
   end
   
   def rewrite(input, shared_targets, output)
-    shared_targets = shared_targets.lines.map(&:strip).to_a
-    input.lines do |line|
+    shared_targets = shared_targets.each_line.map(&:strip).to_a
+    input.each_line do |line|
       ref, copy_range, formula = line.split("\t")
       share_formula(ref, formula, copy_range, shared_targets, output)
     end

data/src/rewrite/rewrite_values_to_ast.rb

@@ -9,7 +9,7 @@ class RewriteValuesToAst
   # input should be in the form: 'thing\tthing\tformula\n' where the last field is always a forumla
   # output will be in the form 'thing\tthing\tast\n'
   def rewrite(input,output)
-    input.lines do |line|
+    input.each_line do |line|
       line =~ /^(.*?)\t(.*?)\t(.*)\n/
       ref, type, value = $1, $2, $3
       ast = case type

data/src/rewrite/rewrite_whole_row_column_references_to_areas.rb

@@ -74,7 +74,7 @@ class RewriteWholeRowColumnReferencesToAreas
   end
   
   def rewrite(input,output)
-    input.lines do |line|
+    input.each_line do |line|
       if line =~ /(:column_range|:row_range)/
         content = line.split("\t")
         ast = eval(content.pop)
@@ -97,4 +97,4 @@ class RewriteWholeRowColumnReferencesToAreas
     @mapper ||= MapColumnAndRowRangeAst.new(sheet_name,dimensions)
   end
   
-end
+end

data/src/rewrite/rewrite_worksheet_names.rb

@@ -10,11 +10,14 @@ class RewriteWorksheetNames
   # relationship_id\tfilename\n
   # Outputs worksheet names in the form:
   # name\tfilename\n
+  # Only includes actual worksheets (ignores chartsheets and the like)
   def rewrite(worksheet_names,relationships,output)
     relationships = Hash[relationships.readlines.map { |line| line.split("\t")}]
-    worksheet_names.lines do |line|
+    worksheet_names.each_line do |line|
       rid, name = line.split("\t")
-      output.puts "#{name.strip}\t#{relationships[rid].strip}"
+      filename = relationships[rid].strip
+      next unless filename =~ /^worksheets/i
+      output.puts "#{name.strip}\t#{filename}"
     end
   end
-end
+end

data/src/simplify.rb

@@ -5,6 +5,8 @@ require_relative "simplify/replace_ranges_with_array_literals"
 require_relative "simplify/inline_formulae"
 require_relative "simplify/replace_formulae_with_calculated_values"
 require_relative "simplify/replace_indirects_with_references"
+require_relative "simplify/replace_offsets_with_references"
+require_relative "simplify/replace_column_with_column_number"
 require_relative "simplify/simplify_arithmetic"
 require_relative "simplify/identify_dependencies"
 require_relative "simplify/remove_cells"

data/src/simplify/inline_formulae.rb

@@ -1,9 +1,11 @@
 class InlineFormulaeAst
   
   attr_accessor :references, :current_sheet_name, :inline_ast
+  attr_accessor :replacements_made_in_the_last_pass
   
   def initialize(references, current_sheet_name, inline_ast = nil)
     @references, @current_sheet_name, @inline_ast = references, [current_sheet_name], inline_ast
+    @replacements_made_in_the_last_pass = 0
     @inline_ast ||= lambda { |sheet,reference,references| true }
   end
   
@@ -16,9 +18,20 @@ class InlineFormulaeAst
       [operator,*ast[1..-1].map {|a| map(a) }]
     end
   end
+
+  def function(name,*args)
+    case name
+    when 'OFFSET'
+      [:function, name, args.shift, *args.map { |a| map(a) }]
+    else
+      [:function, name, *args.map { |a| map(a) }]
+    end
+  end
   
   def sheet_reference(sheet,reference)
+    return [:error, '#REF!'] unless references[sheet]
     if inline_ast.call(sheet,reference.last.upcase.gsub('$',''),references)
+      @replacements_made_in_the_last_pass += 1
       ast = references[sheet][reference.last.upcase.gsub('$','')]
       if ast
         current_sheet_name.push(sheet)
@@ -36,6 +49,7 @@ class InlineFormulaeAst
   # TODO: Optimize by replacing contents of references hash with the inlined version
   def cell(reference)
     if inline_ast.call(current_sheet_name.last,reference.upcase.gsub('$',''),references)
+      @replacements_made_in_the_last_pass += 1
       ast = references[current_sheet_name.last][reference.upcase.gsub('$','')]
       if ast
         map(ast)
@@ -61,10 +75,12 @@ class InlineFormulae
   def self.replace(*args)
     self.new.replace(*args)
   end
+
+  attr_accessor :replacements_made_in_the_last_pass
   
   def replace(input,output)
     rewriter = InlineFormulaeAst.new(references, default_sheet_name, inline_ast)
-    input.lines do |line|
+    input.each_line do |line|
       # Looks to match lines with references
       if line =~ /\[:cell/
         ref, ast = line.split("\t")
@@ -73,5 +89,6 @@ class InlineFormulae
         output.puts line
       end
     end
+    @replacements_made_in_the_last_pass = rewriter.replacements_made_in_the_last_pass
   end
 end