excel_to_code 0.0.10 → 0.0.11

data/src/commands/excel_to_x.rb

@@ -232,6 +232,8 @@ class ExcelToX
       extract ExtractSharedFormulae, xml_filename, [name, 'Formulae (shared)']
       apply_rewrite RewriteFormulaeToAst, [name, 'Formulae (shared)']
 
+      extract ExtractSharedFormulaeTargets, xml_filename, [name, 'Formulae (shared targets)']
+
       extract ExtractArrayFormulae, xml_filename, [name, 'Formulae (array)']
       apply_rewrite RewriteFormulaeToAst, [name, 'Formulae (array)']
       
@@ -298,7 +300,7 @@ class ExcelToX
   end
   
   def rewrite_shared_formulae(name,xml_filename)
-    apply_rewrite RewriteSharedFormulae, [name, 'Formulae (shared)']
+    rewrite RewriteSharedFormulae, [name, 'Formulae (shared)'], [name, 'Formulae (shared targets)'], [name, 'Formulae (shared)']
   end
   
   def rewrite_array_formulae(name,xml_filename)
@@ -781,4 +783,4 @@ class ExcelToX
     File.expand_path(File.join(args))
   end
   
-end
+end

data/src/extract.rb

@@ -3,6 +3,7 @@ require_relative "extract/extract_array_formulae"
 require_relative "extract/extract_formulae"
 require_relative "extract/extract_relationships"
 require_relative "extract/extract_shared_formulae"
+require_relative "extract/extract_shared_formulae_targets"
 require_relative "extract/extract_shared_strings"
 require_relative "extract/extract_simple_formulae"
 require_relative "extract/extract_values"

data/src/extract/extract_shared_formulae_targets.rb

@@ -0,0 +1,15 @@
+require_relative 'extract_formulae'
+
+class ExtractSharedFormulaeTargets < ExtractFormulae
+  
+  def start_formula(type,attributes)
+    return unless type == 'shared'
+    @parsing = true
+  end
+  
+  def write_formula
+    output.write @ref
+    output.write "\n"
+  end
+  
+end

data/src/rewrite/rewrite_shared_formulae.rb

@@ -1,18 +1,19 @@
 require_relative 'ast_copy_formula'
 
 class RewriteSharedFormulae
-  def self.rewrite(input,output)
-    new.rewrite(input,output)
+  def self.rewrite(input, shared_targets, output)
+    new.rewrite(input, shared_targets, output)
   end
   
-  def rewrite(input,output)
+  def rewrite(input, shared_targets, output)
+    shared_targets = shared_targets.lines.map(&:strip).to_a
     input.lines do |line|
       ref, copy_range, formula = line.split("\t")
-      share_formula(ref,formula,copy_range,output)
+      share_formula(ref, formula, copy_range, shared_targets, output)
     end
   end
   
-  def share_formula(ref,formula,copy_range,output)
+  def share_formula(ref, formula, copy_range, shared_targets, output)
     shared_ast = eval(formula)
     copier = AstCopyFormula.new
     copy_range = Area.for(copy_range)
@@ -28,6 +29,7 @@ class RewriteSharedFormulae
     
     copy_range.offsets.each do |row,column|
       new_ref = start_reference.offset(row,column)
+      next unless shared_targets.include?(new_ref)
       copier.rows_to_move = row + offset_from_formula_to_start_rows
       copier.columns_to_move = column + offset_from_formula_to_start_columns
       ast = copier.copy(shared_ast)
@@ -35,4 +37,4 @@ class RewriteSharedFormulae
     end
   end
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
-  requirement: &70309378127240 !ruby/object:Gem::Requirement
+  requirement: &70307966168940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309378127240
+  version_requirements: *70307966168940
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70309378138820 !ruby/object:Gem::Requirement
+  requirement: &70307966167440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70309378138820
+  version_requirements: *70307966167440
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70309378136080 !ruby/object:Gem::Requirement
+  requirement: &70307966165300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70309378136080
+  version_requirements: *70307966165300
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70309378131980 !ruby/object:Gem::Requirement
+  requirement: &70307966164020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *70309378131980
+  version_requirements: *70307966164020
 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
@@ -84,7 +84,6 @@ files:
 - src/commands/excel_to_ruby.rb
 - src/commands/excel_to_x.rb
 - src/commands.rb
-- src/compile/c/a.out
 - src/compile/c/compile_to_c.rb
 - src/compile/c/compile_to_c_header.rb
 - src/compile/c/compile_to_c_unit_test.rb
@@ -158,6 +157,7 @@ files:
 - src/extract/extract_named_references.rb
 - src/extract/extract_relationships.rb
 - src/extract/extract_shared_formulae.rb
+- src/extract/extract_shared_formulae_targets.rb
 - src/extract/extract_shared_strings.rb
 - src/extract/extract_simple_formulae.rb
 - src/extract/extract_table.rb