excel_to_code 0.0.6 → 0.0.7

data/src/commands/excel_to_c.rb

@@ -1,5 +1,6 @@
 # coding: utf-8
 require_relative 'excel_to_x'
+require 'ffi'
 
 class ExcelToC < ExcelToX
   
@@ -129,8 +130,9 @@ class ExcelToC < ExcelToX
     name = output_name.downcase
     
     # Target for shared library
-    o.puts "lib#{name}.dylib: #{name}.o"
-    o.puts "\tgcc -shared -o lib#{name}.dylib #{name}.o"
+    shared_library_name = FFI.map_library_name(name)
+    o.puts "#{shared_library_name}: #{name}.o"
+    o.puts "\tgcc -shared -o #{shared_library_name} #{name}.o"
     o.puts
     
     # Target for compiled version
@@ -141,7 +143,7 @@ class ExcelToC < ExcelToX
     # Target for cleaning
     o.puts "clean:"
     o.puts "\trm #{name}.o"
-    o.puts "\trm lib#{name}.dylib"
+    o.puts "\trm #{shared_library_name}"
     
     close(o)
   end

data/src/commands/excel_to_x.rb

@@ -114,6 +114,11 @@ class ExcelToX
     separate_formulae_elements
     replace_values_with_constants
     
+    # In case this hasn't been set by the user
+    if cells_that_can_be_set_at_runtime.empty?
+      create_a_good_set_of_cells_that_should_be_settable_at_runtime
+    end
+    
     # This actually creates the code (implemented in subclasses)
     write_code
     
@@ -553,6 +558,26 @@ class ExcelToX
     close(co)
   end
   
+  def create_a_good_set_of_cells_that_should_be_settable_at_runtime
+    references = all_formulae("formulae_inlined_pruned_with_sheets.ast")
+    counter = CountFormulaReferences.new
+    count = counter.count(references)
+
+    count.each do |sheet,keys|
+      keys.each do |ref,count|
+        ast = references[sheet][ref]
+        next unless ast
+        p ast.first
+        if [:blank,:number,:null,:string,:constant,:percentage,:error,:boolean_true,:boolean_false].include?(ast.first)
+          @cells_that_can_be_set_at_runtime[sheet] ||= []
+          @cells_that_can_be_set_at_runtime[sheet] << ref.upcase
+        end
+      end
+    end
+    p @cells_that_can_be_set_at_runtime
+    
+  end
+  
   # UTILITY FUNCTIONS
 
   def settable(name)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000 Z
+date: 2012-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
-  requirement: &70309715642480 !ruby/object:Gem::Requirement
+  requirement: &70200308259560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70309715642480
+  version_requirements: *70200308259560
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70309715641980 !ruby/object:Gem::Requirement
+  requirement: &70200305826260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70309715641980
+  version_requirements: *70200305826260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70309715641480 !ruby/object:Gem::Requirement
+  requirement: &70200305824320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70309715641480
+  version_requirements: *70200305824320
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &70309715641020 !ruby/object:Gem::Requirement
+  requirement: &70200305818740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 1.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *70309715641020
+  version_requirements: *70200305818740
 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