excel_to_code 0.3.5 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b7eaef5e426ea529d3b33d237e2d41adc37c305
-  data.tar.gz: ac576e8a20ca8bc58f9839c1018f45210cc9d0a6
+  metadata.gz: 7790188e924f5410d21cd2f4a25add63744f644a
+  data.tar.gz: 0467aff30ed411418ec3e7bcd7d8ea7fe7e7774f
 SHA512:
-  metadata.gz: adb264736922ee868d1890cc9c390e8d34e29e4f31aa6be954a3980f49f5d9a02510d609ab1e72436be78ec6ad79359b0d5868d0e202e8732ffa837f535557be
-  data.tar.gz: 4ce4a712b27076f76ae665dd158e0b7153ebdfea42643a8f8568bf4c8eeb58f0c7c7e6d84c4a33a13580f1a0781072f1bdff03a0406386998f304f6218f2c994
+  metadata.gz: d8252e23572c8d13b4a223404588ad457186fa5ce43e5f8727d573bf2377069a0b8abd8791d683991aca752f245bbee6490be19397927e96ed1950e16d1b5ef5
+  data.tar.gz: 84624066f10040b16124a07d1d94b0293685a44dec338ac06c8e29e5aca7d07c545b047523369ac1d3296316ef3de0699acc4ac48097164fdeaacb1166840ada

data/src/commands/excel_to_c.rb

@@ -409,7 +409,7 @@ END
   def run_tests
     return unless actually_run_tests
     log.info "Running the resulting tests"
-    if write_tests_as_c
+    if write_tests_in_c
       puts `cd #{File.join(output_directory)}; gcc "test_#{output_name.downcase}.c"; ./a.out`
     end
     puts `cd #{File.join(output_directory)}; ruby "test_#{output_name.downcase}.rb"`

data/src/compile/c/excel_to_c_runtime.c

@@ -65,6 +65,7 @@ static ExcelValue hlookup_3(ExcelValue lookup_value_v,ExcelValue lookup_table_v,
 static ExcelValue hlookup(ExcelValue lookup_value_v,ExcelValue lookup_table_v, ExcelValue row_number_v, ExcelValue match_type_v);
 static ExcelValue iferror(ExcelValue value, ExcelValue value_if_error);
 static ExcelValue iserr(ExcelValue value);
+static ExcelValue iserror(ExcelValue value);
 static ExcelValue excel_index(ExcelValue array_v, ExcelValue row_number_v, ExcelValue column_number_v);
 static ExcelValue excel_index_2(ExcelValue array_v, ExcelValue row_number_v);
 static ExcelValue excel_isnumber(ExcelValue number);
@@ -1095,6 +1096,15 @@ static ExcelValue iserr(ExcelValue value) {
   }
 }
 
+static ExcelValue iserror(ExcelValue value) {
+	if(value.type == ExcelError) {
+    return TRUE;
+  } else {
+    return FALSE;
+  }
+}
+
+
 
 // Order is TRUE, FALSE, String, Number; Blank is zero
 static ExcelValue more_than(ExcelValue a_v, ExcelValue b_v) {

data/src/compile/c/excel_to_c_runtime_test.c

@@ -252,6 +252,18 @@ int test_functions() {
   assert(iserr(ONE).number == 0);
   assert(iserr(EXCEL_STRING("Hello")).number == 0);
   assert(iserr(EXCEL_STRING("Hello")).number == 0);
+  
+  // Test the ISERROR function
+  assert_equal(iserror(NA), TRUE, "ISERROR(NA)");
+  assert_equal(iserror(DIV0), TRUE, "ISERROR(DIV0)");
+  assert_equal(iserror(REF), TRUE, "ISERROR(REF)");
+  assert_equal(iserror(VALUE), TRUE, "ISERROR(VALUE)");
+  assert_equal(iserror(NAME), TRUE, "ISERROR(NAME)");
+  assert_equal(iserror(BLANK), FALSE, "ISERROR(BLANK)");
+  assert_equal(iserror(TRUE), FALSE, "ISERROR(TRUE)");
+  assert_equal(iserror(FALSE), FALSE, "ISERROR(FALSE)");
+  assert_equal(iserror(ONE), FALSE, "ISERROR(ONE)");
+  assert_equal(iserror(EXCEL_STRING("Hello")), FALSE, "ISERROR('Hello')");
 
   // Test the INDEX function
   ExcelValue index_array_1[] = { EXCEL_NUMBER(10), EXCEL_NUMBER(20), BLANK };

data/src/compile/c/map_formulae_to_c.rb

@@ -47,6 +47,7 @@ class MapFormulaeToC < MapValuesToC
     :'IF3' => 'excel_if',
     :'IFERROR' => 'iferror',
     :'ISERR' => 'iserr',
+    :'ISERROR' => 'iserror',
     :'INDEX2' => 'excel_index_2',
     :'INDEX3' => 'excel_index',
     :'INT' => 'excel_int',

data/src/compile/ruby/map_formulae_to_ruby.rb

@@ -37,6 +37,7 @@ class MapFormulaeToRuby < MapValuesToRuby
     :'INT' => 'int',
     :'ISBLANK' => 'isblank',
     :'ISERR' => 'iserr',
+    :'ISERROR' => 'iserror',
     :'ISNUMBER' => 'isnumber',
     :'LARGE' => 'large',
     :'LEFT' => 'left',

data/src/excel/excel_functions.rb

@@ -115,3 +115,5 @@ require_relative 'excel_functions/ln'
 require_relative 'excel_functions/iserr'
 
 require_relative 'excel_functions/npv'
+
+require_relative 'excel_functions/iserror'

data/src/excel/excel_functions/iserror.rb

@@ -0,0 +1,8 @@
+module ExcelFunctions
+  
+  def iserror(a)
+    return true if a.is_a?(Symbol)
+    false
+  end
+  
+end

data/src/excel_to_code.rb

@@ -1,5 +1,5 @@
 class ExcelToCode
-  def self.version() "0.3.5" end
+  def self.version() "0.3.7" end
 end
 
 require_relative 'commands'

data/src/extract/extract_data_from_worksheet.rb

@@ -80,8 +80,13 @@ class ExtractDataFromWorksheet < ::Ox::Sax
       return if only_extract_values
 
       unless @formula.empty?
-        formula_text = @formula.join.gsub(/[\r\n]+/,'')
-        ast = @fp.parse(formula_text)
+        begin
+          formula_text = @formula.join.gsub(/[\r\n]+/,'')
+          ast = @fp.parse(formula_text)
+        rescue ExternalReferenceException => e
+          e.ref = key # Attach the sheet and reference to the exception
+          raise
+        end
         unless ast
           $stderr.puts "Could not parse #{@sheet_name} #{@ref} #{formula_text}"
           exit

data/src/rewrite/caching_formula_parser.rb

@@ -1,5 +1,32 @@
 require 'singleton'
 
+class ExternalReferenceException < ExcelToCodeException
+
+  attr_accessor :reference_ast
+  attr_accessor :full_ast
+  attr_accessor :formula_text
+  attr_accessor :ref
+
+  def initialize(reference_ast, full_ast, formula_text)
+    @reference_ast, @full_ast, @formula_text = reference_ast, full_ast, formula_text
+  end
+
+  def message
+    <<-END
+
+    Sorry, ExcelToCode can't handle external references
+
+    It found one at #{ref}
+    The full formula was #{formula_text}
+    Which was parsed to #{full_ast}
+    Which seemed to have an external reference at #{reference_ast}
+    
+    Please remove the external reference from the Excel and try again"
+
+    END
+  end
+end
+
 class CachingFormulaParser
   include Singleton
 
@@ -26,6 +53,8 @@ class CachingFormulaParser
 
   def parse(text)
     ast = Formula.parse(text)
+    @text = text # Kept in case of Exception below
+    @full_ast = ast # Kept in case of Exception below
     if ast
       map(ast.to_ast[1])
     else
@@ -57,8 +86,9 @@ class CachingFormulaParser
     ast
   end
 
+  # We can't deal with external references at the moment
   def external_reference(ast)
-    raise ExcelToCodeException.new("Sorry, ExcelToCode cannot cope with external references (#{ast.inspect}. Please strip them from the workbook before attempting to compile it.")
+    raise ExternalReferenceException.new(ast, @full_ast, @text)
   end
 
   def sheet_reference(ast)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.7
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-01-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -173,6 +173,7 @@ files:
 - src/excel/excel_functions/int.rb
 - src/excel/excel_functions/isblank.rb
 - src/excel/excel_functions/iserr.rb
+- src/excel/excel_functions/iserror.rb
 - src/excel/excel_functions/isnumber.rb
 - src/excel/excel_functions/large.rb
 - src/excel/excel_functions/left.rb