excel_to_code 0.2.15 → 0.2.16

data/src/simplify/replace_ranges_with_array_literals.rb

@@ -53,8 +53,8 @@ class ReplaceRangesWithArrayLiteralsAst
     check_range, criteria, sum_range = ast[2], ast[3], ast[4]
     return map_args(ast) unless [:area, :sheet_reference, :cell].include?(check_range.first)
     return map_args(ast) unless [:area, :sheet_reference, :cell].include?(sum_range.first)
-    check_area = area_for(check_range)
-    sum_area = area_for(sum_range)
+    check_area = area_for(check_range).unfix
+    sum_area = area_for(sum_range).unfix
 
     check_area.calculate_excel_variables
     sum_area.calculate_excel_variables

data/src/simplify/simplify_arithmetic.rb

@@ -1,11 +1,10 @@
 class SimplifyArithmeticAst
   
-  attr_accessor :map_count  
-
   def map(ast)
     @brackets_to_remove = []
     simplify_arithmetic(ast)
-    remove_brackets(ast)
+    remove_brackets
+    ast
   end
 
   def simplify_arithmetic(ast)
@@ -15,15 +14,13 @@ class SimplifyArithmeticAst
     when :arithmetic; arithmetic(ast)
     when :brackets; @brackets_to_remove << ast
     end
-    ast
   end
   
-  def remove_brackets(ast)
+  def remove_brackets
     @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
@@ -42,8 +39,6 @@ class SimplifyArithmeticAst
       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) }
         # Now create a new clause
         new_clause = [:arithmetic, *old_clause]
         # And insert it back into the ast

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.2.15
+  version: 0.2.16
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-06 00:00:00.000000000 Z
+date: 2014-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -149,6 +149,7 @@ files:
 - src/excel/excel_functions/count.rb
 - src/excel/excel_functions/counta.rb
 - src/excel/excel_functions/divide.rb
+- src/excel/excel_functions/ensure_is_number.rb
 - src/excel/excel_functions/excel_equal.rb
 - src/excel/excel_functions/excel_if.rb
 - src/excel/excel_functions/excel_match.rb