excel_to_code 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ca693af405aeeb0685579ce213a0b8f1fa776403
-  data.tar.gz: 3e83af580291765c4aaf0834b8eb28a6028e0f8a
+  metadata.gz: 0f1f2fd79b3625aa813b46493b34cae10d4455b3
+  data.tar.gz: 3d5c4b5065c321940d108565458ceb6426c10595
 SHA512:
-  metadata.gz: a06a537725eca97fa804b9b94532762d4fb91906bde7cf4cde3d06d0b39f111bf25ff15a3c5a696957273cab1d57335ff17fa5d162d694e538c72c6cbace829d
-  data.tar.gz: c186227348931f515bd5ba5b8b8bb5c6ece9d553a1b8e9e3b5df48647ab3f4a87478d295cdd2f7ac5f2f7a0c4eab2d71e03963320c4820233df0edbda0cff0f6
+  metadata.gz: cbb44e22f54c3d0d086cd8fae0e82cdd717ef22ad0f72acf1bc577db80aaaf3c7516e38bf3e6c28d7a3df3a173d94c8d0adcd44fe071b048206810ca6a0ff2f3
+  data.tar.gz: b865adf4a4797e207e50ba43134599321b1b54bbd1ba28dabe9c882870504d6f2d773f5f7eaa17846b69d1d7c2ced7fbb1dff781b2d8ae23509aca7a21b26ec0

data/README.md

@@ -28,6 +28,11 @@ this should work:
 3. bundle
 4. rspec spec/*
 
+To test the C runtime:
+1. cd src/compile/c
+2. cc excel_to_c_runtime
+3. ./a.out
+
 # Hacking excel_to_code
 
 There are some how to guides in the doc folder. 
@@ -37,6 +42,6 @@ There are some how to guides in the doc folder.
 1. Not tested at all on Windows
 2. INDIRECT formula must be convertable at runtime into a standard formula
 3. Doesn't implement all functions (see doc/Which_functions_are_implemented.md)
-4. Doesn't implement references that involve range unions and lists
+4. Doesn't implement references that involve range unions and lists (but does implement standard ranges)
 5. Sometimes gives cells as being empty, when excel would give the cell as having a numeric value of zero
 6. The generated C version does not multithread and will give bad results if you try

data/src/commands/excel_to_c.rb

@@ -214,7 +214,10 @@ class #{ruby_module_name}Shim
 
   def get(name)
     return 0 unless #{ruby_module_name}.respond_to?(name)
-    excel_value = #{ruby_module_name}.send(name)
+    ruby_value_from_excel_value(#{ruby_module_name}.send(name))
+  end
+
+  def ruby_value_from_excel_value(excel_value)
     case excel_value[:type]
     when :ExcelNumber; excel_value[:number]
     when :ExcelString; excel_value[:string].read_string.force_encoding("utf-8")
@@ -228,7 +231,7 @@ class #{ruby_module_name}Shim
       a = Array.new(r) { Array.new(c) }
       (0...r).each do |row|
         (0...c).each do |column|
-          a[row][column] = ruby_from_excel_value(#{ruby_module_name}::ExcelValue.new(p + (((row*c)+column)*s)))
+          a[row][column] = ruby_value_from_excel_value(#{ruby_module_name}::ExcelValue.new(p + (((row*c)+column)*s)))
         end
       end 
       return a

data/src/commands/excel_to_x.rb

@@ -143,6 +143,11 @@ class ExcelToX
     extract_data_from_worksheets
     merge_table_files
     
+    # This turns named references that are specified as getters and setters
+    # into a series of required cell references
+    transfer_named_references_to_keep_into_cells_to_keep
+    transfer_named_references_that_can_be_set_at_runtime_into_cells_that_can_be_set_at_runtime
+    
     # These perform some translations to simplify the excel
     # Including:
     # * Turning row and column references (e.g., A:A) to areas, based on the size of the worksheet
@@ -157,9 +162,6 @@ class ExcelToX
     # that are in the excel.
     simplify_worksheets # Replacing shared strings and named references with their actual values, tidying arithmetic
 
-    transfer_named_references_to_keep_into_cells_to_keep
-    transfer_named_references_that_can_be_set_at_runtime_into_cells_that_can_be_set_at_runtime
-    
     # In case this hasn't been set by the user
     if cells_that_can_be_set_at_runtime.empty?
       log.info "Creating a good set of cells that should be settable"

data/src/compile/c/excel_to_c_runtime.c

@@ -5,6 +5,9 @@
 #include <ctype.h>
 #include <math.h>
 
+// To run the tests at the end of this file
+// cc excel_to_c_runtime; ./a.out
+
 // FIXME: Extract a header file
 
 // I predefine an array of ExcelValues to store calculations
@@ -469,8 +472,6 @@ static ExcelValue not_equal(ExcelValue a_v, ExcelValue b_v) {
 
 static ExcelValue excel_if(ExcelValue condition, ExcelValue true_case, ExcelValue false_case ) {
 	CHECK_FOR_PASSED_ERROR(condition)
-	CHECK_FOR_PASSED_ERROR(true_case)
-	CHECK_FOR_PASSED_ERROR(false_case)
 	
 	switch (condition.type) {
   	  case ExcelBoolean:
@@ -1586,6 +1587,8 @@ int test_functions() {
 	assert(excel_if(FALSE,new_excel_number(10),new_excel_number(20)).type == ExcelNumber);
 	assert(excel_if(FALSE,new_excel_number(10),new_excel_number(20)).number == 20);
 	assert(excel_if(NA,new_excel_number(10),new_excel_number(20)).type == ExcelError);
+	assert(excel_if(TRUE,new_excel_number(10),NA).type == ExcelNumber);
+	assert(excel_if(TRUE,new_excel_number(10),NA).number == 10);
 	
 	// Test excel_match
 	ExcelValue excel_match_array_1[] = { new_excel_number(10), new_excel_number(100) };

data/src/simplify/map_formulae_to_values.rb

@@ -11,9 +11,20 @@ class MapFormulaeToValues
   def initialize
     @value_for_ast = MapValuesToRuby.new
     @calculator = FormulaeCalculator.new
+    @cache = {}
   end
-  
+
+  def reset
+    @cache = {}
+  end
+
+  # FIXME: Caching works in the odd edge cases of long formula
+  # but I really need to find the root cause of the problem
   def map(ast)
+    @cache[ast] ||= do_map(ast)
+  end
+
+  def do_map(ast)
     return ast unless ast.is_a?(Array)
     operator = ast[0]
     if respond_to?(operator)

data/src/simplify/replace_formulae_with_calculated_values.rb

@@ -12,6 +12,7 @@ class ReplaceFormulaeWithCalculatedValues
       begin
         ref, ast = line.split("\t")
         output.puts "#{ref}\t#{rewriter.map(eval(ast)).inspect}"
+        rewriter.reset
       rescue Exception => e
         puts "Exception at line #{line}"
         raise

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-19 00:00:00.000000000 Z
+date: 2013-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -76,13 +76,15 @@ description: "# excel_to_code\n\nConverts some excel spreadsheets (.xlsx, not .x
   worksheet> --prune-except <name of output worksheet> <excel file name> \n\t\nthis
   should work:\n\n\t./bin/excel_to_c --help\n\n# Testing excel_to_code\n\n1. Make
   sure you have ruby 1.9.2 or later installed\n2. gem install bundler # May need to
-  use sudo\n3. bundle\n4. rspec spec/*\n\n# Hacking excel_to_code\n\nThere are some
-  how to guides in the doc folder. \n\n# Limitations\n\n1. Not tested at all on Windows\n2.
+  use sudo\n3. bundle\n4. rspec spec/*\n\nTo test the C runtime:\n1. cd src/compile/c\n2.
+  cc excel_to_c_runtime\n3. ./a.out\n\n# Hacking excel_to_code\n\nThere are some how
+  to guides in the doc folder. \n\n# Limitations\n\n1. Not tested at all on Windows\n2.
   INDIRECT formula must be convertable at runtime into a standard formula\n3. Doesn't
   implement all functions (see doc/Which_functions_are_implemented.md)\n4. Doesn't
-  implement references that involve range unions and lists\n5. Sometimes gives cells
-  as being empty, when excel would give the cell as having a numeric value of zero\n6.
-  The generated C version does not multithread and will give bad results if you try\n"
+  implement references that involve range unions and lists (but does implement standard
+  ranges)\n5. Sometimes gives cells as being empty, when excel would give the cell
+  as having a numeric value of zero\n6. The generated C version does not multithread
+  and will give bad results if you try\n"
 email: tamc@greenonblack.com
 executables:
 - excel_to_c
@@ -96,6 +98,7 @@ 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_named_reference_setters.rb
 - src/compile/c/compile_to_c.rb
 - src/compile/c/compile_to_c_header.rb