excel_to_code 0.2.24 → 0.2.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb603a0eac62f0611930a0d26b0d2b7ce01da651
-  data.tar.gz: 7c294156828d74582d15e48654ab5b815f6b908a
+  metadata.gz: 3d72318213cf0081f534b5f4831a7a1e1835dbd3
+  data.tar.gz: 2700a1eef57c8edbc96432fa4140713b6a15c37f
 SHA512:
-  metadata.gz: da2b38c8ceda26be3f746aed440dc7ce8d375a7b7ba2050ca7345141315e6506ef7205d3902c5796872359733f88bf7acbf4c68c14b0fc8a07cc18981eedcb1d
-  data.tar.gz: ace94f63560ed912c29d5f6094f9ed6a757791e17c79cc388ce652edb0a37aa78e6dae2ad84bf152d0a400bc0244691686c35d545e74528c273f32a2854669b3
+  metadata.gz: f2796806f37fff89494e84f60cc73305ab9cdcc19e44540954fbe9f9961d73914c82af786bafc01936aa1e1e2553fbc1b23fd9902950e70cefcafd007ada22ca
+  data.tar.gz: 9a15536fd266ac59fea374200645ff395b11dff32f45ae7acb85c158aa90dcb8486f1e03c8ba8312c034086606bbef41a8884fc0a65e91c713f9f3470e27aedf

data/src/compile/c/excel_to_c_runtime.c

@@ -74,6 +74,7 @@ static ExcelValue left_1(ExcelValue string_v);
 static ExcelValue len(ExcelValue string_v);
 static ExcelValue excel_log(ExcelValue number);
 static ExcelValue excel_log_2(ExcelValue number, ExcelValue base);
+static ExcelValue ln(ExcelValue number);
 static ExcelValue excel_exp(ExcelValue number);
 static ExcelValue max(int number_of_arguments, ExcelValue *arguments);
 static ExcelValue min(int number_of_arguments, ExcelValue *arguments);
@@ -333,6 +334,16 @@ static ExcelValue excel_log_2(ExcelValue number_v, ExcelValue base_v) {
   return	new_excel_number(log(n)/log(b));
 }
 
+static ExcelValue ln(ExcelValue number_v) {
+	CHECK_FOR_PASSED_ERROR(number_v)
+	NUMBER(number_v, n)
+	CHECK_FOR_CONVERSION_ERROR
+
+  if(n<=0) { return NUM; }
+
+  return	new_excel_number(log(n));
+}
+
 static ExcelValue excel_exp(ExcelValue number_v) {
 	CHECK_FOR_PASSED_ERROR(number_v)
 	NUMBER(number_v, n)

data/src/compile/c/excel_to_c_runtime_test.c

@@ -685,6 +685,12 @@ int test_functions() {
   assert(excel_log_2(new_excel_number(8),new_excel_number(2)).number == 3.0);
   assert(excel_log_2(new_excel_number(8),new_excel_number(0)).type == ExcelError);
 
+  // Test LN
+  assert(ln(new_excel_number(10)).number == 2.302585092994046);
+  assert(ln(new_excel_number(8)).number == 2.0794415416798357);
+  assert(ln(new_excel_number(0)).type == ExcelError);
+  assert(ln(new_excel_number(-1)).type == ExcelError);
+
   // Test MMULT (Matrix multiplication)
   ExcelValue mmult_1[] = { ONE, TWO, THREE, FOUR};
   ExcelValue mmult_2[] = { FOUR, THREE, TWO, ONE};

data/src/compile/c/map_formulae_to_c.rb

@@ -55,6 +55,7 @@ class MapFormulaeToC < MapValuesToC
     :'LEFT1' => 'left_1',
     :'LEFT2' => 'left',
     :'LEN' => 'len',
+    :'LN' => 'ln',
     :'LOG1' => 'excel_log',
     :'LOG2' => 'excel_log_2',
     :'MATCH2' => 'excel_match_2',

data/src/compile/ruby/map_formulae_to_ruby.rb

@@ -40,6 +40,7 @@ class MapFormulaeToRuby < MapValuesToRuby
     :'LARGE' => 'large',
     :'LEFT' => 'left',
     :'LEN' => 'len',
+    :'LN' => 'ln',
     :'LOG' => 'log',
     :'LOWER' => 'lower',
     :'MATCH' => 'excel_match',

data/src/excel/excel_functions.rb

@@ -109,3 +109,5 @@ require_relative 'excel_functions/forecast'
 require_relative 'excel_functions/ensure_is_number'
 
 require_relative 'excel_functions/value'
+
+require_relative 'excel_functions/ln'

data/src/excel/excel_functions/ln.rb

@@ -0,0 +1,14 @@
+module ExcelFunctions
+  
+  def ln(a)
+    a = number_argument(a)
+    
+    return a if a.is_a?(Symbol)
+
+    return :num if a <= 0
+
+    Math.log(a)
+
+  end
+  
+end

data/src/excel_to_code.rb

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

data/src/extract/extract_named_references.rb

@@ -1,53 +1,72 @@
-require 'nokogiri'
+require 'ox'
 
-class ExtractNamedReferences < Nokogiri::XML::SAX::Document 
+class ExtractNamedReferences < ::Ox::Sax
 
-  attr_accessor :parsing, :input, :output
+  attr_accessor :named_references
+  attr_accessor :state
 
   def self.extract(input)
     self.new.extract(input)
   end
 
-  def initialize
-    super
-    @sheet_names = []
+  def extract(input_xml)
+    @state = :not_parsing
+    @sheet_names = [] # This keeps track of the sheet names
+    @named_references = {}
+    @localSheetId = nil
+    @name = nil
+    @reference = []
+    Ox.sax_parse(self, input_xml, :convert_special => true)
+    @named_references
   end
 
-  def extract(input)
-    @input, @output = input, {}
-    @sheet = nil
-    @name = nil
-    @reference = nil
-    parser = Nokogiri::XML::SAX::Parser.new(self)
-    parser.parse(@input)
-    @output
+  def start_element(name)
+    case name
+    when :sheet
+      @state = :parsing_sheet_name
+    when :definedName
+      @state = :parsing_named_reference
+    end
   end
 
-  def start_element(name,attributes)
-    if name == "sheet"
-      @sheet_names << attributes.assoc('name').last
-    elsif name == "definedName"
-      @sheet = attributes.assoc('localSheetId') && @sheet_names[attributes.assoc('localSheetId').last.to_i].downcase.to_sym
-      @name =  attributes.assoc('name').last.downcase.to_sym
-      @reference = ""
+
+  def attr(name, value)
+    case state
+    when :parsing_sheet_name
+      @sheet_names << value if name == :name
+    when :parsing_named_reference
+      @localSheetId = value.to_i if name == :localSheetId
+      @name = value.downcase.to_sym if name == :name
     end
   end
 
   def end_element(name)
-    return unless name == "definedName"
-    if @sheet
-      @output[[@sheet, @name]] = @reference.gsub('$', '')
-    else
-      @output[@name] = @reference.gsub('$', '')
+    case name
+    when :sheet
+      @state = :not_parsing
+    when :definedName
+      @state = :not_parsing
+
+      reference = @reference.join.gsub('$','')
+
+      @named_references[key] = reference
+
+      @localSheetId = nil
+      @name = nil
+      @reference = []
     end
-    @sheet = nil
-    @name = nil
-    @reference = nil
   end
 
-  def characters(string)
-    return unless @reference
-    @reference << string
+  def text(text)
+    return unless state == :parsing_named_reference
+    @reference << text
+  end
+
+
+  def key
+    return @name unless @localSheetId
+    sheet = @sheet_names[@localSheetId].downcase.to_sym
+    [sheet, @name]
   end
 
 end

data/src/simplify/replace_arithmetic_on_ranges.rb

@@ -2,7 +2,17 @@ class ReplaceArithmeticOnRangesAst
     
   def map(ast)
     return ast unless ast.is_a?(Array)
-    ast.each { |a| map(a) }
+    ast.each do |a| 
+      next unless a.is_a?(Array)
+      case ast.first
+      when :error, :null, :space, :prefix, :boolean_true, :boolean_false, :number, :string
+        next
+      when :sheet_reference, :table_reference, :local_table_reference
+        next
+      else
+        map(a)
+      end
+    end
     arithmetic(ast) if ast.first == :arithmetic
     comparison(ast) if ast.first == :comparison
     ast
@@ -112,25 +122,3 @@ class ReplaceArithmeticOnRangesAst
   end
     
 end
-  
-
-class ReplaceArithmeticOnRanges
-    
-  def self.replace(*args)
-    self.new.replace(*args)
-  end
-  
-  def replace(input,output)
-    rewriter = ReplaceArithmeticOnRangesAst.new
-    input.each_line do |line|
-      # Looks to match lines with references
-      if line =~ /:arithmetic/ && line =~ /:array/
-        content = line.split("\t")
-        ast = eval(content.pop)
-        output.puts "#{content.join("\t")}\t#{rewriter.map(ast).inspect}"
-      else
-        output.puts line
-      end
-    end
-  end
-end

data/src/simplify/replace_arrays_with_single_cells.rb

@@ -37,7 +37,7 @@ class ReplaceArraysWithSingleCellsAst
         right = try_and_convert_array(right)
         ast.replace([:arithmetic, left, op, right])
       else
-        ast[1..-1].each { |a| do_map(a) }
+        map_if_required(ast)
       end
     when :string_join
       strings = ast[1..-1]
@@ -45,7 +45,7 @@ class ReplaceArraysWithSingleCellsAst
         strings = strings.map { |s| try_and_convert_array(s) }
         ast.replace([:string_join, *strings])
       else
-        ast[1..-1].each { |a| do_map(a) }
+        map_if_required(strings)
       end
     when :function
       if ast[1] == :SUMIF && ast[3].first == :array
@@ -57,10 +57,27 @@ class ReplaceArraysWithSingleCellsAst
       elsif ast[1] == :INDIRECT && check_indirect(ast)
         # Replacement made in check function
       else
-        ast[2..-1].each { |a| do_map(a) }
+        map_if_required(ast)
       end
     else
-      ast[1..-1].each { |a| do_map(a) }
+      map_if_required(ast)
+    end
+  end
+
+  # This tries to speed up the process by not recursively
+  # checking arguments that we know won't be interesting
+  def map_if_required(arguments)
+    return arguments unless arguments.is_a?(Array)
+    arguments.each do |a|
+      next unless a.is_a?(Array)
+      case a.first
+      when :error, :null, :space, :prefix, :boolean_true, :boolean_false, :number, :string
+        next
+      when :sheet_reference, :table_reference, :local_table_reference
+        next
+      else
+        do_map(a)
+      end
     end
   end
 

data/src/simplify/replace_string_join_on_ranges.rb

@@ -2,8 +2,18 @@ class ReplaceStringJoinOnRangesAST
     
   def map(ast)
     return ast unless ast.is_a?(Array)
+    ast.each do |a| 
+      next unless a.is_a?(Array)
+      case ast.first
+      when :error, :null, :space, :prefix, :boolean_true, :boolean_false, :number, :string
+        next
+      when :sheet_reference, :table_reference, :local_table_reference
+        next
+      else
+        map(a)
+      end
     string_join(ast) if ast[0] == :string_join
-    ast.each { |a| map(a) }
+    end
     ast
   end
   
@@ -46,28 +56,4 @@ class ReplaceStringJoinOnRangesAST
     return [:error, "#VALUE!"] unless cell
     map(cell)
   end
-
-    
-end
-  
-
-class ReplaceStringJoinOnRanges
-    
-  def self.replace(*args)
-    self.new.replace(*args)
-  end
-  
-  def replace(input,output)
-    rewriter = ReplaceStringJoinOnRangesAST.new
-    input.each_line do |line|
-      # Looks to match lines with references
-      if line =~ /:string_join/ && line =~ /:array/
-        content = line.split("\t")
-        ast = eval(content.pop)
-        output.puts "#{content.join("\t")}\t#{rewriter.map(ast).inspect}"
-      else
-        output.puts line
-      end
-    end
-  end
 end

metadata

@@ -1,33 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.2.24
+  version: 0.2.25
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-16 00:00:00.000000000 Z
+date: 2014-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
@@ -35,6 +38,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.5.0
@@ -42,6 +48,9 @@ dependencies:
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
@@ -49,6 +58,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.7'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.7.0
@@ -56,6 +68,9 @@ dependencies:
   name: ffi
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
@@ -63,6 +78,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.11
@@ -70,6 +88,9 @@ dependencies:
   name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.12
@@ -77,6 +98,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.12
@@ -168,6 +192,7 @@ files:
 - src/excel/excel_functions/len.rb
 - src/excel/excel_functions/less_than.rb
 - src/excel/excel_functions/less_than_or_equal.rb
+- src/excel/excel_functions/ln.rb
 - src/excel/excel_functions/log.rb
 - src/excel/excel_functions/lower.rb
 - src/excel/excel_functions/max.rb