excel_to_code 0.2.25 → 0.2.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d72318213cf0081f534b5f4831a7a1e1835dbd3
-  data.tar.gz: 2700a1eef57c8edbc96432fa4140713b6a15c37f
+  metadata.gz: c64e8c6e7d12441b0f858d3a98aa97197eac5e52
+  data.tar.gz: 79afc6f86465ca664ce677be464572e87e170589
 SHA512:
-  metadata.gz: f2796806f37fff89494e84f60cc73305ab9cdcc19e44540954fbe9f9961d73914c82af786bafc01936aa1e1e2553fbc1b23fd9902950e70cefcafd007ada22ca
-  data.tar.gz: 9a15536fd266ac59fea374200645ff395b11dff32f45ae7acb85c158aa90dcb8486f1e03c8ba8312c034086606bbef41a8884fc0a65e91c713f9f3470e27aedf
+  metadata.gz: 8b512da456ba1a3634d9971ad27537ffe4f7ff4efea6d3b434f548d1412c96552ee147bd7e574d5bb38c38f31757d1fbc8eb080441aad5821a61bf6564159c0e
+  data.tar.gz: 217072420254652330cb7cdca81c9f3c0fdba46ef0dcebf8ba391a443408bc2c2143b6a33415e355a0e48102b867771960d897e2d7f0771477f0c474d1188050

data/src/commands/excel_to_x.rb

@@ -297,17 +297,17 @@ class ExcelToX
     # Then we parse them
     @named_references.each do |name, reference|
       begin
-      parsed = CachingFormulaParser.parse(reference)
-      if parsed
-        @named_references[name] = parsed
-      else
-        $stderr.puts "Named reference #{name} #{reference} not parsed"
-        exit
-      end
-    rescue Exception
+        parsed = CachingFormulaParser.parse(reference)
+        if parsed
+          @named_references[name] = parsed
+        else
+          $stderr.puts "Named reference #{name} #{reference} not parsed"
+          exit
+        end
+      rescue Exception
         $stderr.puts "Named reference #{name} #{reference} not parsed"
         raise
-    end
+      end
     end
     # Replace A$1:B2 with [A1, A2, B1, B2]
     @replace_ranges_with_array_literals_replacer ||= ReplaceRangesWithArrayLiteralsAst.new
@@ -678,22 +678,27 @@ class ExcelToX
     emergency_indirect_replacement_bodge.named_references = @named_references
     
     @formulae_array.each do |ref, details|
-      @shared_string_replacer.map(details.last)
-      emergency_indirect_replacement_bodge.current_sheet_name = ref.first
-      emergency_indirect_replacement_bodge.referring_cell = ref.last
-      emergency_indirect_replacement_bodge.replace(details.last)
-
-      named_reference_replacer.default_sheet_name = ref.first
-      named_reference_replacer.map(details.last)
-      table_reference_replacer.worksheet = ref.first
-      table_reference_replacer.referring_cell = ref.last
-      table_reference_replacer.map(details.last)
-      @replace_ranges_with_array_literals_replacer.map(details.last)
-      transpose_function_replacer.map(details.last)
-      simplify_arithmetic_replacer.map(details.last)
-      # FIXME: Seem to need to do this twice, second time to eliminate brackets?!
-      simplify_arithmetic_replacer.map(details.last)
-      expand_array_formulae_replacer.map(details.last)
+      begin
+        @shared_string_replacer.map(details.last)
+        emergency_indirect_replacement_bodge.current_sheet_name = ref.first
+        emergency_indirect_replacement_bodge.referring_cell = ref.last
+        emergency_indirect_replacement_bodge.replace(details.last)
+
+        named_reference_replacer.default_sheet_name = ref.first
+        named_reference_replacer.map(details.last)
+        table_reference_replacer.worksheet = ref.first
+        table_reference_replacer.referring_cell = ref.last
+        table_reference_replacer.map(details.last)
+        @replace_ranges_with_array_literals_replacer.map(details.last)
+        transpose_function_replacer.map(details.last)
+        simplify_arithmetic_replacer.map(details.last)
+        # FIXME: Seem to need to do this twice, second time to eliminate brackets?!
+        simplify_arithmetic_replacer.map(details.last)
+        expand_array_formulae_replacer.map(details.last)
+      rescue  Exception => e
+        log.fatal "Exception when expanding array formulae #{ref}: #{details}"
+        raise
+      end
     end
 
     log.info "Rewriting array formulae into conventional formulae"
@@ -899,7 +904,6 @@ class ExcelToX
 
   # These types of cells don't conatain formulae and can therefore be skipped
   VALUE_TYPE = {:number => true, :string => true, :blank => true, :null => true, :error => true, :boolean_true => true, :boolean_false => true}
-  INLINE_TYPE = {:number => true, :string => true, :blank => true, :null => true, :error => true, :boolean_true => true, :boolean_false => true, :sheet_reference => true, :cell => true}
   
   def inline_ast_decision  
     @inline_ast_decision ||= lambda do |sheet, cell, references|
@@ -909,8 +913,14 @@ class ExcelToX
       else
         ast = references[[sheet,cell]]
         if ast
-          if INLINE_TYPE[ast.first]
-            true
+          case ast.first
+          when :number, :string; true
+          when :blank, :null; true
+          when :error; true
+          when :boolean_true, :boolean_false; true
+          when :cell; true
+          when :sheet_reference
+            ast[2][0] != :named_reference
           else
             false
           end

data/src/excel_to_code.rb

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

data/src/rewrite/ast_expand_array_formulae.rb

@@ -167,8 +167,10 @@ class AstExpandArrayFormulae
         [:function, ast[1], *args.map.with_index do |a,i|
           if ok_to_be_an_array[i]
             a
-          else
+          elsif a[row]
             a[row][column] || [:error, :"#N/A"]
+          else
+            [:error, :"#N/A"]
           end
         end]
       end]

data/src/simplify/identify_dependencies.rb

@@ -3,6 +3,7 @@ class IdentifyDependencies
   attr_accessor :references
   attr_accessor :dependencies
   attr_accessor :current_sheet
+  attr_accessor :circular_reference_check
   
   def initialize(references = {}, dependencies = {})
     @references = references
@@ -11,27 +12,48 @@ class IdentifyDependencies
       hash[key] = {}
     end
     @current_sheet = []
+    @circular_reference_check = [] 
   end
   
   def add_depedencies_for(sheet,cell = :all)
     if cell == :all
       references.each do |ref,ast|
         next unless ref.first == sheet
+        circular_reference_check.clear
         recursively_add_dependencies_for(sheet,ref.last)
       end
     else
+      circular_reference_check.clear
       recursively_add_dependencies_for(sheet,cell)
     end
   end
     
   def recursively_add_dependencies_for(sheet,cell)
-    return if dependencies[sheet].has_key?(cell)
-    dependencies[sheet][cell] = true
-    ast = references[[sheet,cell]]
-    return unless ast
-    current_sheet.push(sheet)
-    map(ast)
-    current_sheet.pop
+    return if circular_reference?([sheet, cell])
+    unless dependencies[sheet].has_key?(cell)
+      dependencies[sheet][cell] = true
+      ast = references[[sheet,cell]]
+      if ast
+        current_sheet.push(sheet)
+        begin
+          map(ast)
+        rescue ExcelToCodeException
+          puts "[:'#{sheet}', :#{cell}] => #{ast}"
+          raise
+        end
+        current_sheet.pop
+      end
+    end
+    circular_reference_check.pop
+  end
+
+  def circular_reference?(ref)
+    if circular_reference_check.include?(ref)
+      raise ExcelToCodeException.new("Possible circular reference in #{circular_reference_check} #{ref}")
+    else
+      circular_reference_check.push(ref)
+    end
+    false
   end
   
   def map(ast)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.2.25
+  version: 0.2.26
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg