excel_to_code 0.3.13 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8913cb43d387cfb52e6a6ad5ef5a8554758164ef
-  data.tar.gz: c305a04d9de3fd7b1f6c3608787820db3ec47601
+  metadata.gz: 4708f58031f15c26a9b1f63bafefb4f1188044a6
+  data.tar.gz: 384d5599d104b8591a1dd38344da83e1d118efab
 SHA512:
-  metadata.gz: 76e98bfafc8a0ee0832b4e735c8b9eb49658e36dcc7f2d4063bc1e945ed55e45e6e8422ee20659b513ce59c881ff60c3d11159dabb38c052162a48774187fb4a
-  data.tar.gz: a43591e548cd6ee59e1ef907a109fa77151bbd017f8027f1cd2351882e641f8fca05461b5070a7a6e7534ce30c031b380f8fc8f25e2a460f837b341b114b1826
+  metadata.gz: 5a6c02501134cc3e84a4814e403add71e6bed25d8252f16ea93c8e4e964a21f3a192b644759fcc0409c91f2bb72de87a3b77292e10c542bd8ff546b636869e57
+  data.tar.gz: 0f37ecbf4955e480e421f24eedb74b2f88b641ac82202a817e6052ba021493d1a15ec41bd37e347bea6c2652ca5887040843285f7aa1b80909fd70d21e24bcd8

data/README.md

@@ -45,7 +45,6 @@ There are some how to guides in the doc folder.
 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
-7. Newlines are removed from strings
-8. The generated code uses floating point, rather than fully precise arithmetic, so results can differ slightly
-9. The generated code uses the sprintf approach to rounding (even-odd) rather than excel's 0.5 rounds away from zero.
-10. Ranges like this: Sheet1!A10:Sheet1!B20 and 3D ranges don't work
+7. The generated code uses floating point, rather than fully precise arithmetic, so results can differ slightly
+8. The generated code uses the sprintf approach to rounding (even-odd) rather than excel's 0.5 rounds away from zero.
+90. Ranges like this: Sheet1!A10:Sheet1!B20 and 3D ranges don't work

data/src/commands/excel_to_c.rb

@@ -239,7 +239,7 @@ class #{ruby_module_name}
         end
       end 
       return a
-    when :ExcelError; [:value,:name,:div0,:ref,:na][excel_value[:number]]
+    when :ExcelError; [:value,:name,:div0,:ref,:na,:num][excel_value[:number]]
     else
       raise Exception.new("ExcelValue type \u0023{excel_value[:type].inspect} not recognised")
     end

data/src/excel/excel_functions/pmt.rb

@@ -8,6 +8,7 @@ module ExcelFunctions
     return rate if rate.is_a?(Symbol)
     return number_of_periods if number_of_periods.is_a?(Symbol)
     return present_value if present_value.is_a?(Symbol)
+    return :num if number_of_periods == 0
     
     return -(present_value / number_of_periods) if rate == 0
     -present_value*(rate*((1+rate)**number_of_periods))/(((1+rate)**number_of_periods)-1)

data/src/excel/excel_functions/power.rb

@@ -11,7 +11,7 @@ module ExcelFunctions
     return b if b.is_a?(Symbol)
 
     return 1 if b ==0 # Special case so can do the following negative number check
-    return :num if a < 1 && b < 1
+    return :num if a < 0 && b < 1
     
     a**b
   end

data/src/excel_to_code.rb

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

data/src/extract/extract_data_from_worksheet.rb

@@ -69,7 +69,7 @@ class ExtractDataFromWorksheet < ::Ox::Sax
       when 's'; [:shared_string, value.to_i]
       when 'n'; [:number, value.to_f]
       when 'e'; [:error, value.to_sym]
-      when 'str'; [:string, value.gsub(/_x[0-9A-F]{4}_/,'').freeze]
+      when 'str'; [:string, convert_excels_unicode_escaping(value).freeze]
       else
         $stderr.puts "Value of type #{@value_type} not known #{@sheet_name} #{@ref}"
         exit
@@ -146,4 +146,13 @@ class ExtractDataFromWorksheet < ::Ox::Sax
     end
   end
 
+  # Excel encodes unicode as _x000D_ where the 000D
+  # is the unicode codepoint
+  def convert_excels_unicode_escaping(excel_string)
+    excel_string.gsub(/_x([0-9A-F]{4})_/) do 
+      unicode_codepoint = $1
+      [unicode_codepoint.hex].pack("U")
+    end
+  end
+
 end

data/src/rewrite/caching_formula_parser.rb

@@ -94,6 +94,11 @@ class CachingFormulaParser
   end
 
   def sheet_reference(ast)
+    # Sheet names shouldn't start with [1], because those are 
+    # external references
+    if ast[1] =~ /^\[\d+\]/
+       raise ExternalReferenceException.new(ast, @full_ast, @text)
+    end
     ast[1] = ast[1].to_sym
     ast[2] = map(ast[2])
     # We do this to deal with Control!#REF! style rerferences

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -102,11 +102,11 @@ description: "# excel_to_code\n\nConverts some excel spreadsheets (.xlsx, not .x
   Doesn't 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\n7. Newlines are removed from strings\n8.
-  The generated code uses floating point, rather than fully precise arithmetic, so
-  results can differ slightly\n9. The generated code uses the sprintf approach to
-  rounding (even-odd) rather than excel's 0.5 rounds away from zero.\n10. Ranges like
-  this: Sheet1!A10:Sheet1!B20 and 3D ranges don't work\n"
+  multithread and will give bad results if you try\n7. The generated code uses floating
+  point, rather than fully precise arithmetic, so results can differ slightly\n8.
+  The generated code uses the sprintf approach to rounding (even-odd) rather than
+  excel's 0.5 rounds away from zero.\n90. Ranges like this: Sheet1!A10:Sheet1!B20
+  and 3D ranges don't work\n"
 email: tamc@greenonblack.com
 executables:
 - excel_to_c