excel_to_code 0.1.23 → 0.2.0

data/src/simplify/wrap_formulae_that_return_arrays_and_are_not_in_arrays.rb

@@ -1,5 +1,21 @@
 require_relative '../excel'
 
+class WrapFormulaeThatReturnArraysAndAReNotInArraysAst
+  def map(ast)
+    return ast unless ast.is_a?(Array)
+    function(ast) if ast.first == :function
+    ast
+  end
+
+  # Only does MMULT at the moment
+  FORMULAE_THAT_RETURN_ARRAYS = { "MMULT" => true }
+  
+  def function(ast)
+    return unless FORMULAE_THAT_RETURN_ARRAYS.has_key?(ast[1])
+    ast.replace( [:function, "INDEX", ast.dup,  [:number, "1"], [:number, "1"]])
+  end
+end
+
 class WrapFormulaeThatReturnArraysAndAReNotInArrays
   
   def self.replace(*args)
@@ -7,21 +23,13 @@ class WrapFormulaeThatReturnArraysAndAReNotInArrays
   end
   
   def replace(input,output)
-  
+    r = WrapFormulaeThatReturnArraysAndAReNotInArraysAst.new
+
     input.each_line do |line|
       # Looks to match lines that contain formulae that return ranges, such as MMULT
-      if line =~ /"MMULT"/
-        content = line.split("\t")
-        ast = eval(content.pop)
-        if ast[0] == :function && ast[1] == "MMULT"
-          new_ast = [:function, "INDEX", ast, [:number, "1"], [:number, "1"]] 
-          output.puts "#{content.join("\t")}\t#{new_ast.inspect}"          
-        else
-          output.puts line
-        end
-      else
-        output.puts line
-      end
+      content = line.split("\t")
+      ast = eval(content.pop)
+      output.puts "#{content.join("\t")}\t#{r.map(ast).inspect}"          
     end
   end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.1.23
+  version: 0.2.0
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-04 00:00:00.000000000 Z
+date: 2013-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -66,6 +66,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.11
+- !ruby/object:Gem::Dependency
+  name: ox
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.12
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 2.0.12
 description: "# excel_to_code\n\nConverts some excel spreadsheets (.xlsx, not .xls)
   into some other programming languages (currently ruby or c).\nThis allows the excel
   spreadsheets to be run programatically, without excel.\n\nIts cannonical source
@@ -184,6 +198,7 @@ files:
 - src/excel_to_code.rb
 - src/extract/check_for_unknown_functions.rb
 - src/extract/extract_array_formulae.rb
+- src/extract/extract_everything.rb
 - src/extract/extract_formulae.rb
 - src/extract/extract_named_references.rb
 - src/extract/extract_relationships.rb
@@ -200,6 +215,7 @@ files:
 - src/extract.rb
 - src/rewrite/ast_copy_formula.rb
 - src/rewrite/ast_expand_array_formulae.rb
+- src/rewrite/caching_formula_parser.rb
 - src/rewrite/rewrite_array_formulae.rb
 - src/rewrite/rewrite_array_formulae_to_arrays.rb
 - src/rewrite/rewrite_cell_references_to_include_sheet.rb
@@ -213,6 +229,7 @@ files:
 - src/rewrite/rewrite_worksheet_names.rb
 - src/rewrite.rb
 - src/simplify/count_formula_references.rb
+- src/simplify/emergency_array_formula_replace_indirect_bodge.rb
 - src/simplify/identify_dependencies.rb
 - src/simplify/identify_repeated_formula_elements.rb
 - src/simplify/inline_formulae.rb