excel_to_code 0.0.5 → 0.0.6

data/src/commands/excel_to_c.rb

@@ -20,10 +20,7 @@ class ExcelToC < ExcelToX
     all_refs = all_formulae("formulae_inlined_pruned_replaced.ast")
     
     number_of_refs = 0
-    
-    # Probably a better way of getting the runtime file to be compiled with the created file
-    puts `cp #} #{File.join(output_directory,'excel_to_c_runtime.c')}`
-    
+        
     # Output the workbook preamble
     w = input("worksheet_c_names")
     o = output("#{output_name.downcase}.c")
@@ -219,7 +216,7 @@ END
     o.puts  "require 'test/unit'"
     o.puts  "require_relative '#{output_name.downcase}'"
     o.puts
-    o.puts "class Test#{name.capitalize} < Test::Unit::TestCase"
+    o.puts "class Test#{ruby_module_name} < Test::Unit::TestCase"
     o.puts "  def spreadsheet; @spreadsheet ||= init_spreadsheet; end"
     o.puts "  def init_spreadsheet; #{ruby_module_name} end"
     

data/src/commands/excel_to_ruby.rb

@@ -95,7 +95,7 @@ class ExcelToRuby < ExcelToX
     o.puts "require 'test/unit'"
     o.puts "require_relative '#{output_name.downcase}'"
     o.puts
-    o.puts "class Test#{output_name.capitalize} < Test::Unit::TestCase"
+    o.puts "class Test#{ruby_module_name} < Test::Unit::TestCase"
     o.puts "  def worksheet; @worksheet ||= #{ruby_module_name}.new; end"
     
     c = CompileToRubyUnitTest.new

data/src/commands/excel_to_x.rb

@@ -109,7 +109,6 @@ class ExcelToX
     # that are in the excel
     simplify_worksheets
     optimise_and_replace_indirect_loop
-    replace_blanks
     remove_any_cells_not_needed_for_outputs
     inline_formulae_that_are_only_used_once
     separate_formulae_elements
@@ -148,7 +147,8 @@ class ExcelToX
     if File.exists?(File.join(xml_directory,'xl','sharedStrings.xml'))
       extract ExtractSharedStrings, 'sharedStrings.xml', 'shared_strings'
     else
-      FileUtils.touch(File.join(intermediate_directory,'shared_strings'))
+      i = intermediate('shared_strings')
+      close(i)
     end
   end
   
@@ -326,17 +326,7 @@ class ExcelToX
       replace ReplaceRangesWithArrayLiterals, File.join(name,"formulae_no_table_references.ast"), File.join(name,"formulae_no_ranges.ast")
     end
   end
-  
-  def replace_blanks
-    references = all_formulae("formulae_no_indirects_optimised.ast")
-    r = ReplaceBlanks.new
-    r.references = references
-    worksheets("Replacing blanks") do |name,xml_filename|
-      r.default_sheet_name = name
-      replace r, File.join(name,"formulae_no_indirects_optimised.ast"),File.join(name,"formulae_no_blanks.ast")
-    end
-  end
-  
+    
   def optimise_and_replace_indirect_loop
     number_of_loops = 4
     1.upto(number_of_loops) do |pass|
@@ -441,7 +431,7 @@ class ExcelToX
     end
   end
   
-  def remove_any_cells_not_needed_for_outputs(formula_in = "formulae_no_blanks.ast", formula_out = "formulae_pruned.ast", values_in = "values_no_shared_strings.ast", values_out = "values_pruned.ast")
+  def remove_any_cells_not_needed_for_outputs(formula_in = "formulae_no_indirects_optimised.ast", formula_out = "formulae_pruned.ast", values_in = "values_no_shared_strings.ast", values_out = "values_pruned.ast")
     if cells_to_keep && !cells_to_keep.empty?
       identifier = IdentifyDependencies.new
       identifier.references = all_formulae(formula_in)
@@ -456,9 +446,16 @@ class ExcelToX
       end
       r = RemoveCells.new
       worksheets("Removing cells") do |name,xml_filename|
-          r.cells_to_keep = identifier.dependencies[name]
-          rewrite r, File.join(name, formula_in), File.join(name, formula_out)
-          rewrite r, File.join(name, values_in), File.join(name, values_out)
+        next if @cells_that_can_be_set_at_runtime[name] == :all
+        cells_to_keep = identifier.dependencies[name]
+        if @cells_that_can_be_set_at_runtime[name]
+          @cells_that_can_be_set_at_runtime[name].each do |ref|
+            cells_to_keep[ref] = true
+          end
+        end
+        r.cells_to_keep = cells_to_keep
+        rewrite r, File.join(name, formula_in), File.join(name, formula_out)
+        rewrite r, File.join(name, values_in), File.join(name, values_out)
       end
     else
       worksheets do |name,xml_filename|

data/src/simplify.rb

@@ -2,7 +2,6 @@ require_relative "simplify/replace_shared_strings"
 require_relative "simplify/replace_named_references"
 require_relative "simplify/replace_table_references"
 require_relative "simplify/replace_ranges_with_array_literals"
-require_relative "simplify/replace_blanks"
 require_relative "simplify/inline_formulae"
 require_relative "simplify/replace_formulae_with_calculated_values"
 require_relative "simplify/replace_indirects_with_references"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
-  requirement: &70225829675560 !ruby/object:Gem::Requirement
+  requirement: &70309715642480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70225829675560
+  version_requirements: *70309715642480
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70225829675060 !ruby/object:Gem::Requirement
+  requirement: &70309715641980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70225829675060
+  version_requirements: *70309715641980
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70225829674560 !ruby/object:Gem::Requirement
+  requirement: &70309715641480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70225829674560
+  version_requirements: *70309715641480
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70225829674100 !ruby/object:Gem::Requirement
+  requirement: &70309715641020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *70225829674100
+  version_requirements: *70309715641020
 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
@@ -187,7 +187,6 @@ files:
 - src/simplify/map_formulae_to_values.rb
 - src/simplify/remove_cells.rb
 - src/simplify/replace_arrays_with_single_cells.rb
-- src/simplify/replace_blanks.rb
 - src/simplify/replace_common_elements_in_formulae.rb
 - src/simplify/replace_formulae_with_calculated_values.rb
 - src/simplify/replace_indirects_with_references.rb

data/src/simplify/replace_blanks.rb

@@ -1,58 +0,0 @@
-class ReplaceBlanksAst
-  
-  attr_accessor :references, :default_sheet_name
-  
-  def initialize(references, default_sheet_name)
-    @references, @default_sheet_name = references, default_sheet_name
-  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 sheet_reference(sheet,reference)
-    if references[sheet].has_key?(reference.last.gsub('$',''))
-      [:sheet_reference,sheet,reference]
-    else
-      [:blank]
-    end
-  end
-  
-  def cell(reference)
-    if references[default_sheet_name].has_key?(reference.gsub('$',''))
-      [:cell,reference]
-    else
-      [:blank]
-    end
-  end
-  
-end
-  
-
-class ReplaceBlanks
-  
-  attr_accessor :references, :default_sheet_name
-  
-  def self.replace(*args)
-    self.new.replace(*args)
-  end
-  
-  def replace(input,output)
-    rewriter = ReplaceBlanksAst.new(references,default_sheet_name)
-    input.lines do |line|
-      # Looks to match lines with references
-      if line =~ /\[:cell/
-        ref, ast = line.split("\t")
-        output.puts "#{ref}\t#{rewriter.map(eval(ast)).inspect}"
-      else
-        output.puts line
-      end
-    end
-  end
-end