excel_to_code 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f1988c086ef6a403614793934210ee23e3053b3
-  data.tar.gz: 94883836b8fc03b001359fef54c066908ecf5bce
+  metadata.gz: 7529040ce2d0f45b5a280ac08be87c8ac0df7a73
+  data.tar.gz: dd33604aada1850a86209407453eab32c1562f5a
 SHA512:
-  metadata.gz: e7cc4cc4002a58becf5abac81bd3da2be911468bbbf2391025314d893e776d21bfee5498d05544d0f90636e97ba4d07a0ef477476b0ecd3e3bc5c5f4a1831811
-  data.tar.gz: 27abf806472aa1328e0c5806d04c1bab8905ab0ab55330af95b7bbb74c7427794dad4b2cb3c733335836b63f39af6ee898e8d21bb869037557c4f3e2abd4d2ea
+  metadata.gz: 6adb53e38ffcc2326755175551c358fe223288b2dcd4ac1d23a7c75eca43b785c780836e9dadf39beb15ef5124c896e74af3b69bd510a4dfd9a143153bb13e2a
+  data.tar.gz: 22b7b90bc550f925c704a4087a496ed2e0754a1f93ce0243ddedf5b38367c3b6d21b2e9d268c10d522651aff8e45cd2967606e3e461ff5c8bacb7c03b3af32d0

data/src/commands/excel_to_x.rb

@@ -585,9 +585,10 @@ class ExcelToX
     @replace_ranges_with_array_literals_replacer ||= ReplaceRangesWithArrayLiteralsAst.new
     expand_array_formulae_replacer = AstExpandArrayFormulae.new
     simplify_arithmetic_replacer ||= SimplifyArithmeticAst.new
+    @shared_string_replacer ||= ReplaceSharedStringAst.new(@shared_strings)
+    transpose_function_replacer = ReplaceTransposeFunction.new
 
     # FIXME: THIS IS THE MOST HORRIFIC BODGE. I HATE IT.
-    @shared_string_replacer ||= ReplaceSharedStringAst.new(@shared_strings)
     emergency_indirect_replacement_bodge = EmergencyArrayFormulaReplaceIndirectBodge.new
     emergency_indirect_replacement_bodge.references = @values
     
@@ -602,6 +603,7 @@ class ExcelToX
       table_reference_replacer.referring_cell = ref.last
       table_reference_replacer.map(details.last)
       @replace_ranges_with_array_literals_replacer.map(details.last)
+      transpose_function_replacer.map(details.last)
       simplify_arithmetic_replacer.map(details.last)
       expand_array_formulae_replacer.map(details.last)
     end

data/src/simplify.rb

@@ -20,3 +20,4 @@ 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"
 require_relative "simplify/emergency_array_formula_replace_indirect_bodge.rb"
+require_relative "simplify/replace_transpose_function"

data/src/simplify/replace_transpose_function.rb

@@ -0,0 +1,34 @@
+class ReplaceTransposeFunction
+
+  def replace(ast)
+    map(ast)
+  end
+   
+  def map(ast)
+    return ast unless ast.is_a?(Array)
+    function(ast) if ast[0] == :function
+    ast.each { |a| map(a) }
+    ast
+  end
+  
+  def function(ast)
+    return unless ast[1] == :TRANSPOSE
+    array = array_ast_to_ruby_array(ast[2])
+    array = array.transpose
+    ast.replace(ruby_array_to_array_ast(array))
+    ast
+  end
+
+  def array_ast_to_ruby_array(array_ast)
+    return [[array_ast]] unless array_ast.first == :array
+    array_ast[1..-1].map do |row_ast|
+      row_ast[1..-1].map do |cell|
+        cell
+      end
+    end
+  end
+
+  def ruby_array_to_array_ast(ruby_array)
+    [:array].concat(ruby_array.map { |row| [:row].concat(row) })
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
@@ -244,6 +244,7 @@ files:
 - src/simplify/replace_shared_strings.rb
 - src/simplify/replace_string_join_on_ranges.rb
 - src/simplify/replace_table_references.rb
+- src/simplify/replace_transpose_function.rb
 - src/simplify/replace_values_with_constants.rb
 - src/simplify/simplify_arithmetic.rb
 - src/simplify/sort_into_calculation_order.rb