excel_to_code 0.2.11 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a444173d8318385277afd731b47cedcb7fe2b783
-  data.tar.gz: 13c5f6fa4d20cc45730c9c15f736c68c17a810af
+  metadata.gz: 2baeee0267ce2b334f2a58d06c07ea645ac9b00a
+  data.tar.gz: de70db7cc308642cecbb59450abccbce7de38e54
 SHA512:
-  metadata.gz: 201c1f56ae3807bce72ca38c48f78300f2c1c6a2857e2ddf58e111dfe9a64660d0cfc4bf453fe9eb817a8d5c1719e60fb19943b998f5342aea9f9d0873c5d79e
-  data.tar.gz: 9945c873cfc1d3e76f6fff18c8fd43ad38f3862efcd24c16e8eccc53670d247fe8d00792d920fd86efe8732f86c2be1b2cdb0db998af112f68ed10081bd6e358
+  metadata.gz: 0edd4bbe16625ecde2c13964a6a58f674ce3cc24757be4aad48e87617ef9f9a11e9c9b3d637ece3cb7f577559350276ef1fd9672f887f2e99a257efa212e6607
+  data.tar.gz: 10971e850f558c03104b7b562364ce4f7ea117f58a2b2a8bcb2ae9f4cdd48452819bd96dd6922ff22d59583b86802ac78fd964a7cc5b637b023bf40f36e1dbf1

data/src/commands/excel_to_x.rb

@@ -607,7 +607,7 @@ class ExcelToX
   # many cells. They are awkward. We try and replace them with conventional
   # formulae here.
   def rewrite_array_formulae
-    log.info "Rewriting array formulae"
+    log.info "Expanding #{@formulae_array.size} array formulae"
     # FIMXE: Refactor this
 
     named_reference_replacer = ReplaceNamedReferencesAst.new(@named_references)
@@ -638,6 +638,7 @@ class ExcelToX
       expand_array_formulae_replacer.map(details.last)
     end
 
+    log.info "Rewriting array formulae into conventional formulae"
     @formulae_array = RewriteArrayFormulae.rewrite(@formulae_array)
   end
 

data/src/excel_to_code.rb

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

data/src/rewrite/caching_formula_parser.rb

@@ -57,6 +57,10 @@ class CachingFormulaParser
     ast
   end
 
+  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.")
+  end
+
   def sheet_reference(ast)
     ast[1] = ast[1].to_sym
     ast[2] = map(ast[2])

data/src/simplify/simplify_arithmetic.rb

@@ -1,48 +1,61 @@
 class SimplifyArithmeticAst
-    
+  
+  attr_accessor :map_count  
+
   def map(ast)
+    @brackets_to_remove = []
+    simplify_arithmetic(ast)
+    remove_brackets(ast)
+  end
+
+  def simplify_arithmetic(ast)
     return ast unless ast.is_a?(Array)
+    ast.each { |a| simplify_arithmetic(a) }
     case ast[0]
-    when :brackets; brackets(ast)
     when :arithmetic; arithmetic(ast)
+    when :brackets; @brackets_to_remove << ast
     end
-    ast.each { |a| map(a) }
     ast
   end
   
-  def brackets(ast)
-    raise NotSupportedException.new("Multiple arguments not supported in brackets #{args.inspect}") if ast.size > 2
-    ast.replace(map(ast[1]))
+  def remove_brackets(ast)
+    @brackets_to_remove.uniq.each do |ast|
+      raise NotSupportedException.new("Multiple arguments not supported in brackets #{ast.inspect}") if ast.size > 2
+      ast.replace(ast[1])
+    end
+    ast
   end
+
+  # This sets the operator precedence
+  OPERATOR_PRECEDENCE = [
+    {:'^' => 1},
+    {:'*' => 2,:'/' => 2},
+    {:'+' => 3,:'-' => 3}
+  ]
   
   def arithmetic(ast)
-    case ast.size
-    when 2; return map(ast[1]) # Not really arithmetic
-    when 4; # Normal arithmetic that doesn't need re-arranging
-      ast.each { |a| map(a) }
-    else
-      # This sets the operator precedence
+    # If smaller than 4, will only be a simple operation (e.g., 1+1 or 2*4)
+    # If more than 4, will be like 1+2*3 and so needs turning into 1+(2*3)
+    return unless ast.size > 4
+    OPERATOR_PRECEDENCE.each do |op|
       i = nil
-      [{:'^' => 1},{:'*' => 2,:'/' => 2},{:'+' => 3,:'-' => 3}].each do |op|
-        i = ast.find_index { |a| a[0] == :operator && op.has_key?(a[1])}
-        break if i
-      end
-      if i
+      while i = ast.find_index { |a| a[0] == :operator && op.has_key?(a[1])}
         # Now we need to wrap that operation in its own arithmetic clause
         old_clause = ast[(i-1)..(i+1)]
         # Make sure we do any mapping
-        old_clause.each { |a| map(a) }
+        #old_clause.each { |a| map(a) }
         # Now create a new clause
         new_clause = [:arithmetic, *old_clause]
         # And insert it back into the ast
         ast[(i-1)..(i+1)]  = [new_clause]
         # Redo the mapping
-        map(ast)
       end
     end
-    ast.each { |a| map(a) }
+    # FIXME: this feels like a bodge
+    if ast.size == 2 && ast[0] == :arithmetic && ast[1].is_a?(Array) && ast[1][0] == :arithmetic
+      ast.replace(ast[1])
+    end
   end
-    
 end
   
 

metadata

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