excel_to_code 0.1.20 → 0.1.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbfac77ee7c479c1e3608dac1dad7892a8156e92
-  data.tar.gz: f474343c232b69a7b91a05a51fad658253af9991
+  metadata.gz: e4ebae76600b8d182956b7c1f6a0d98617cb7aeb
+  data.tar.gz: 07751fc9af519871db9f60f6011b8de21ee0e6f8
 SHA512:
-  metadata.gz: 20fe12e945146c0d0740e00b534a8474848231cf3d938f71a85fafff43ef977b233ba12cafc53d165a440ce0a3ed950d316ff70a53239af0a314ba1dace6884a
-  data.tar.gz: e6efe0d22d6f042633ea7885d83ba0319bcddda0ea00adb874784a8e05e7b90b115c6cd02c218b9d62960a99f3e0a9b6136054df623afddb048e123ebbb3e27d
+  metadata.gz: 46b666e419461ce012bf8e2f84e2c6b97996943c4d41590c3260e10bbf3de827b4ca6e96caa10f99d16afa80785fea8c6179dc36b0e7f3c58b1a3886f1853daf
+  data.tar.gz: e694dff8476a31eea15131fadb9fa44ddf8d77839ce3ab5e525d40a4ba4307d97ebbfa485a4b9bb4847a05663cbe2970db576d92ab52d21c327904f4f6df97d4

data/src/commands/excel_to_x.rb

@@ -415,7 +415,7 @@ class ExcelToX
     return @named_references if @named_references
     @named_references = {}
     i = input('Named references')
-    i.lines.each do |line|
+    i.each_line do |line|
       sheet, name, ref = *line.split("\t")
       key = sheet.size != 0 ? [sheet, name] : name
       @named_references[key] = eval(ref)
@@ -616,6 +616,7 @@ class ExcelToX
       # The result of the indirect might be a range, which we need to simplify
       replace ReplaceRangesWithArrayLiterals, [name, 'Formulae'],  [name, 'Formulae']
       replace ReplaceArithmeticOnRanges, [name, 'Formulae'],  [name, 'Formulae']
+      replace ReplaceStringJoinOnRanges, [name, 'Formulae'],  [name, 'Formulae']
       replace ReplaceArraysWithSingleCells, [name, 'Formulae'],  [name, 'Formulae']
       replace WrapFormulaeThatReturnArraysAndAReNotInArrays, [name, 'Formulae'],  [name, 'Formulae']
     end

data/src/compile/c/excel_to_c_runtime.c

@@ -60,6 +60,7 @@ static ExcelValue hlookup(ExcelValue lookup_value_v,ExcelValue lookup_table_v, E
 static ExcelValue iferror(ExcelValue value, ExcelValue value_if_error);
 static ExcelValue excel_index(ExcelValue array_v, ExcelValue row_number_v, ExcelValue column_number_v);
 static ExcelValue excel_index_2(ExcelValue array_v, ExcelValue row_number_v);
+static ExcelValue excel_isnumber(ExcelValue number);
 static ExcelValue large(ExcelValue array_v, ExcelValue k_v);
 static ExcelValue left(ExcelValue string_v, ExcelValue number_of_characters_v);
 static ExcelValue left_1(ExcelValue string_v);
@@ -503,6 +504,14 @@ static ExcelValue not_equal(ExcelValue a_v, ExcelValue b_v) {
 	return result;
 }
 
+static ExcelValue excel_isnumber(ExcelValue potential_number) {
+  if(potential_number.type == ExcelNumber) {
+    return TRUE;
+  } else {
+    return FALSE;
+  }
+}
+
 static ExcelValue excel_if(ExcelValue condition, ExcelValue true_case, ExcelValue false_case ) {
 	CHECK_FOR_PASSED_ERROR(condition)
 	
@@ -2588,6 +2597,15 @@ int test_functions() {
   assert(rank(THREE, rank_2_v, ZERO).type == ExcelError);
 
 
+  // Test the ISNUMBER function
+  assert(excel_isnumber(ONE).type == ExcelBoolean);
+  assert(excel_isnumber(ONE).number == 1);
+  assert(excel_isnumber(BLANK).type == ExcelBoolean);
+  assert(excel_isnumber(BLANK).number == 0);
+  assert(excel_isnumber(new_excel_string("Hello")).type == ExcelBoolean);
+  assert(excel_isnumber(new_excel_string("Hello")).number == 0);
+  assert(excel_isnumber(TRUE).type == ExcelBoolean);
+  assert(excel_isnumber(TRUE).number == 0);
 
   // Release memory
   free_all_allocated_memory();

data/src/compile/c/map_formulae_to_c.rb

@@ -45,6 +45,7 @@ class MapFormulaeToC < MapValuesToC
     'INDEX2' => 'excel_index_2',
     'INDEX3' => 'excel_index',
     'INT' => 'excel_int',
+    'ISNUMBER' => 'excel_isnumber',
     'LARGE' => 'large',
     'LEFT1' => 'left_1',
     'LEFT2' => 'left',

data/src/compile/ruby/map_formulae_to_ruby.rb

@@ -31,6 +31,7 @@ class MapFormulaeToRuby < MapValuesToRuby
     'IFERROR' => 'iferror',
     'INDEX' => 'index',
     'INT' => 'int',
+    'ISNUMBER' => 'isnumber',
     'LARGE' => 'large',
     'LEFT' => 'left',
     'LOG' => 'log',

data/src/excel/excel_functions.rb

@@ -87,3 +87,5 @@ require_relative 'excel_functions/log'
 require_relative 'excel_functions/mmult'
 
 require_relative 'excel_functions/rank'
+
+require_relative 'excel_functions/isnumber'

data/src/excel/excel_functions/isnumber.rb

@@ -0,0 +1,8 @@
+module ExcelFunctions
+  
+  def isnumber(a)
+    return true if a.is_a?(Numeric)
+    false
+  end
+  
+end

data/src/excel/formula_peg.rb

@@ -117,13 +117,13 @@ class Formula < RubyPeg
   
   def table_reference
     node :table_reference do
-      table_name && ignore { terminal("[") } && (range_structured_reference || complex_structured_reference || simple_structured_reference) && ignore { terminal("]") }
+      table_name && ignore { terminal("[") } && (range_structured_reference || short_range_structured_reference || complex_structured_reference || overly_structured_reference || simple_structured_reference) && ignore { terminal("]") }
     end
   end
   
   def local_table_reference
     node :local_table_reference do
-      ignore { terminal("[") } && (range_structured_reference || complex_structured_reference || overly_structured_reference || simple_structured_reference) && ignore { terminal("]") }
+      ignore { terminal("[") } && (range_structured_reference || short_range_structured_reference || complex_structured_reference || overly_structured_reference || simple_structured_reference) && ignore { terminal("]") }
     end
   end
   
@@ -135,6 +135,10 @@ class Formula < RubyPeg
     terminal(/\[[^\u005d]*\],\[[^\u005d]*\]:\[[^\u005d]*\]/)
   end
   
+  def short_range_structured_reference
+    terminal(/\[[^\u005d]*\]:\[[^\u005d]*\]/)
+  end
+  
   def complex_structured_reference
     terminal(/\[[^\u005d]*\],\[[^\u005d]*\]/)
   end

data/src/excel/formula_peg.txt

@@ -18,10 +18,11 @@ percentage                      := /[-+]?[0-9]+\.?[0-9]*/ `'%'
 number                          := /[-+]?[0-9]+\.?[0-9]*([eE][-+]?[0-9]+)?/
 operator                        := '+' | '-' | '/' | '*' | '^'
 external_reference              := /\[\d+\]!?/ any_internal_reference
-table_reference                 := table_name `'[' (range_structured_reference | complex_structured_reference | simple_structured_reference) `']'
-local_table_reference           := `'[' (range_structured_reference | complex_structured_reference | overly_structured_reference | simple_structured_reference) `']'
+table_reference                 := table_name `'[' (range_structured_reference | short_range_structured_reference | complex_structured_reference | overly_structured_reference | simple_structured_reference) `']'
+local_table_reference           := `'[' (range_structured_reference | short_range_structured_reference | complex_structured_reference | overly_structured_reference | simple_structured_reference) `']'
 table_name                       = /[.\p{Word}_]+/
 range_structured_reference       = /\[[^\u005d]*\],\[[^\u005d]*\]:\[[^\u005d]*\]/
+short_range_structured_reference = /\[[^\u005d]*\]:\[[^\u005d]*\]/
 complex_structured_reference     = /\[[^\u005d]*\],\[[^\u005d]*\]/
 overly_structured_reference      = `'[' simple_structured_reference `']'
 simple_structured_reference      = /[^\u005d]*/

data/src/excel/table.rb

@@ -14,17 +14,20 @@ class Table
   
   def reference_for(table_name,structured_reference,calling_worksheet,calling_cell)
     raise NotSupportedException.new("Local table reference not supported in #{structured_reference.inspect}") unless table_name
+
     case structured_reference
     when /\[#Headers\],\[(.*?)\]:\[(.*?)\]/io
       column_number_start = @column_name_array.find_index($1.strip.downcase)
       column_number_finish = @column_name_array.find_index($2.strip.downcase)
       return ref_error unless column_number_start && column_number_finish
       ast_for_area @area.excel_start.offset(0,column_number_start), @area.excel_start.offset(0,column_number_finish)
+
     when /\[#Totals\],\[(.*?)\]:\[(.*?)\]/io
       column_number_start = @column_name_array.find_index($1.strip.downcase)
       column_number_finish = @column_name_array.find_index($2.strip.downcase)
       return ref_error unless column_number_start && column_number_finish
       ast_for_area @area.excel_start.offset(@area.height,column_number_start), @area.excel_start.offset(@area.height,column_number_finish)
+
     when /\[#This Row\],\[(.*?)\]:\[(.*?)\]/io
       r = Reference.for(calling_cell)
       r.calculate_excel_variables
@@ -32,15 +35,24 @@ class Table
       column_number_start = @column_name_array.find_index($1.strip.downcase)
       column_number_finish = @column_name_array.find_index($2.strip.downcase)
       return ref_error unless column_number_start && column_number_finish
-      ast_for_area @area.excel_start.offset(row - @area.excel_start.excel_row_number,column_number_start), @area.excel_start.offset(row - @area.excel_start.excel_row_number,column_number_finish)      
+      ast_for_area @area.excel_start.offset(row - @area.excel_start.excel_row_number,column_number_start), @area.excel_start.offset(row - @area.excel_start.excel_row_number,column_number_finish)
+
+    when /\[(.*?)\]:\[(.*?)\]/io
+      column_number_start = @column_name_array.find_index($1.strip.downcase)
+      column_number_finish = @column_name_array.find_index($2.strip.downcase)
+      return ref_error unless column_number_start && column_number_finish
+      ast_for_area @area.excel_start.offset(1,column_number_start), @area.excel_start.offset(@area.height - @number_of_total_rows,column_number_finish)
+
     when /\[#Headers\],\[(.*?)\]/io
       column_number = @column_name_array.find_index($1.strip.downcase)
       return ref_error unless column_number      
       ast_for_cell @area.excel_start.offset(0,column_number)
+
     when /\[#Totals\],\[(.*?)\]/io
       column_number = @column_name_array.find_index($1.strip.downcase)
       return ref_error unless column_number
       ast_for_cell @area.excel_start.offset(@area.height,column_number)
+
     when /\[#This Row\],\[(.*?)\]/io
       r = Reference.for(calling_cell)
       r.calculate_excel_variables
@@ -48,6 +60,7 @@ class Table
       column_number = @column_name_array.find_index($1.strip.downcase)
       return ref_error unless 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)
         r = Reference.for(calling_cell)
@@ -56,6 +69,7 @@ class Table
       else
         ast_for_area @area.excel_start.offset(0,0), @area.excel_start.offset(0,@area.width)
       end
+
     when /#Totals/io
       if calling_worksheet == @worksheet && @data_area.includes?(calling_cell)
         r = Reference.for(calling_cell)
@@ -64,15 +78,19 @@ class Table
       else
         ast_for_area @area.excel_start.offset(@area.height,0), @area.excel_start.offset(@area.height,@area.width)
       end
+
     when /#Data/io, ""
       ast_for_area @data_area.excel_start, @data_area.excel_finish
+
     when /#All/io, ""
       ast_for_area @area.excel_start, @area.excel_finish
+
     when /#This Row/io
       r = Reference.for(calling_cell)
       r.calculate_excel_variables
       row = r.excel_row_number
       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)
         r = Reference.for(calling_cell)

data/src/simplify.rb

@@ -18,3 +18,4 @@ require_relative "simplify/replace_values_with_constants"
 require_relative "simplify/sort_into_calculation_order"
 require_relative "simplify/replace_arithmetic_on_ranges"
 require_relative "simplify/wrap_formulae_that_return_arrays_and_are_not_in_arrays"
+require_relative "simplify/replace_string_join_on_ranges"

data/src/simplify/replace_offsets_with_references.rb

@@ -17,19 +17,39 @@ class ReplaceOffsetsWithReferencesAst
   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])
+    if name == "OFFSET"
+      try_to_replace_offset(*args)
     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)
+  def try_to_replace_offset(reference, row_offset, column_offset, height = [:number, 1], width = [:number, 1])
+    if [row_offset, column_offset, height, width].all? { |a| a.first == :number }
+      if reference.first == :cell
+        offset_cell(reference, row_offset, column_offset, height, width)
+      elsif reference.first == :sheet_reference && reference[2].first == :cell
+        [:sheet_reference, reference[1], offset_cell(reference[2], row_offset, column_offset, height, width)]
+      else
+        puts "#{[:function, "OFFSET", reference, row_offset, column_offset, height, width]} not replaced"
+        [:function, "OFFSET", reference, row_offset, column_offset, height, width]
+      end
+    else
+        puts "#{[:function, "OFFSET", reference, row_offset, column_offset, height, width]} not replaced"
+        [:function, "OFFSET", reference, row_offset, column_offset, height, width]
+    end
+  end
+
+  def offset_cell(reference, row_offset, column_offset, height, width)
+
+    reference = reference[1]
+    row_offset = row_offset[1].to_i
+    column_offset = column_offset[1].to_i
+    height = height[1].to_i
+    width = width[1].to_i
+
     @replacements_made_in_the_last_pass += 1
-    reference = Reference.for(reference.gsub!("$",""))
+    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

data/src/simplify/replace_string_join_on_ranges.rb

@@ -0,0 +1,75 @@
+class ReplaceStringJoinOnRangesAST
+    
+  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 string_join(*strings)
+    # Make sure there is actually a conversion to do
+    return [:string_join, *strings] unless strings.any? { |s| s.first == :array }
+    # Now work out the largest dimensions
+    # Arrays look like this [:array, [:row, 1, 2, 3], [:row, 4, 5, 6]]
+    max_rows = 0
+    max_columns = 0
+    strings.each do |s|
+      next unless s.first == :array
+      r = s.length - 1 # -1 beause first element is :array
+      c = r > 0 ? s[1].length - 1 : 0 # check if rows, if there are, columns is length of that array -1 for initial :row symbol
+      max_columns = c if c > max_columns
+      max_rows = r if r > max_rows
+    end
+
+    result = [:array]
+    (0...max_rows).each do |row_index|
+      row = [:row]
+      (0...max_columns).each do |column_index|
+        column = [:string_join]
+        strings.each do |string|
+          column << select_from(string, row_index, column_index)
+        end
+        row << column
+      end
+      result << row
+    end
+    result       
+  end
+
+  def select_from(maybe_array, row_index, column_index)
+    return map(maybe_array) unless maybe_array.first == :array
+    row = maybe_array[row_index+1]
+    return [:error, "#VALUE!"] unless row
+    cell = row[column_index+1]
+    return [:error, "#VALUE!"] unless cell
+    map(cell)
+  end
+
+    
+end
+  
+
+class ReplaceStringJoinOnRanges
+    
+  def self.replace(*args)
+    self.new.replace(*args)
+  end
+  
+  def replace(input,output)
+    rewriter = ReplaceStringJoinOnRangesAST.new
+    input.each_line do |line|
+      # Looks to match lines with references
+      if line =~ /:string_join/ && line =~ /:array/
+        content = line.split("\t")
+        ast = eval(content.pop)
+        output.puts "#{content.join("\t")}\t#{rewriter.map(ast).inspect}"
+      else
+        output.puts line
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.1.20
+  version: 0.1.21
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -137,6 +137,7 @@ files:
 - src/excel/excel_functions/iferror.rb
 - src/excel/excel_functions/index.rb
 - src/excel/excel_functions/int.rb
+- src/excel/excel_functions/isnumber.rb
 - src/excel/excel_functions/large.rb
 - src/excel/excel_functions/left.rb
 - src/excel/excel_functions/less_than.rb
@@ -224,6 +225,7 @@ files:
 - src/simplify/replace_offsets_with_references.rb
 - src/simplify/replace_ranges_with_array_literals.rb
 - src/simplify/replace_shared_strings.rb
+- src/simplify/replace_string_join_on_ranges.rb
 - src/simplify/replace_table_references.rb
 - src/simplify/replace_values_with_constants.rb
 - src/simplify/simplify_arithmetic.rb