excel_to_code 0.2.13 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2baeee0267ce2b334f2a58d06c07ea645ac9b00a
-  data.tar.gz: de70db7cc308642cecbb59450abccbce7de38e54
+  metadata.gz: 5462c5420b1ec9bd0cb8fc6c2a6641475348f7b1
+  data.tar.gz: e5bd8eb39e00007be6ac7b847d7b3fabd3260dcf
 SHA512:
-  metadata.gz: 0edd4bbe16625ecde2c13964a6a58f674ce3cc24757be4aad48e87617ef9f9a11e9c9b3d637ece3cb7f577559350276ef1fd9672f887f2e99a257efa212e6607
-  data.tar.gz: 10971e850f558c03104b7b562364ce4f7ea117f58a2b2a8bcb2ae9f4cdd48452819bd96dd6922ff22d59583b86802ac78fd964a7cc5b637b023bf40f36e1dbf1
+  metadata.gz: 49e9dde17bb074100d96a2868a79f95bf1ec111dfe0bf6675759a272407980cd830110a7eda9db3c5257d2bb2ead0d889798b564fe0a82fcddc87d757298d6e3
+  data.tar.gz: 2e4da6cd7577fc93718190048457e08fcd0067a66d69ac45fdfff46b99622b58c20ae22591d0e76d99e40670cd8f2ded881f7dc6b544fcd447abb9e61c64357e

data/src/excel_to_code.rb

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

data/src/rewrite/ast_expand_array_formulae.rb

@@ -5,8 +5,11 @@ class AstExpandArrayFormulae
   def map(ast)
     return ast unless ast.is_a?(Array)
     operator = ast[0]
-    send(operator, ast) if respond_to?(operator)
-    ast.each {|a| map(a) }
+    if respond_to?(operator)
+      send(operator, ast) 
+    else
+      ast.each {|a| map(a) }
+    end
     ast
   end
 

data/src/simplify/inline_formulae.rb

@@ -22,9 +22,16 @@ class InlineFormulaeAst
   end
 
   def function(ast)
-    if ast[1] == :OFFSET && (ast[2][0] == :cell || ast[2][0] == :sheet_reference)
+    case ast[1]
+    when :OFFSET
       # Don't map the second argument - it should be left as a cell refernce
-      ast[3..-1].each {|a| map(a) }
+      if (ast[2][0] == :cell || ast[2][0] == :sheet_reference)
+        ast[3..-1].each {|a| map(a) }
+      else
+        ast.each { |a| map(a) }
+      end
+    when :COLUMN, :ROW
+      # Don't map any arguments
     else
       # Otherwise good to map all the other arguments
       ast.each { |a| map(a) }

data/src/simplify/replace_column_with_column_number.rb

@@ -16,8 +16,8 @@ class ReplaceColumnAndRowFunctionsAST
    
   def map(ast)
     return ast unless ast.is_a?(Array)
-    function(ast) if ast[0] == :function
     ast.each { |a| map(a) }
+    function(ast) if ast[0] == :function
     ast
   end
   
@@ -31,7 +31,7 @@ class ReplaceColumnAndRowFunctionsAST
       elsif ast[2][0] == :sheet_reference
         reference = Reference.for(ast[2][2][1])
       else
-        return
+        raise ExcelToCodeException.new("COLUMN/ROW not replaced in #{@current_reference} #{ast}")
       end
     else
       reference = Reference.for(@current_reference)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.2.13
+  version: 0.2.14
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-03 00:00:00.000000000 Z
+date: 2014-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg