excel_to_code 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c755ed176f71493a5c52591c5170f6b958f90dd7
-  data.tar.gz: 0575ab1ca5b705fc1520b0a81064a2f7f492ec32
+  metadata.gz: 5a9204f1b847531abe1231be586e07efde9d6f56
+  data.tar.gz: 55e3970859d6b607b877e91c4670777c098e5d78
 SHA512:
-  metadata.gz: 6c8b064f12d8c64260b4694aeb77b5335a6b5fc431656a333cdb0cdebf60dc52d97a8ea58e505e7347a6fc3f6258cf7a7b8646c55f6a0ab043eb14b8915af7dd
-  data.tar.gz: 666690943ce80993facb30315918fc46dd2617d5797dcdb62ecea6ba268ad3eb2c49f5bd5cfd9e5faa2585bfc27dc35e22c4649aa30e9dc5d3d1ae729e53fd6a
+  metadata.gz: 994609e98432c12a0abe413587fe7cefa9c138aedd43e174c1ff54a349bf716ed7e82e05413fab9f94b5291df2a1ff89881226c1559593a9052ff20c204ef9ef
+  data.tar.gz: 83139c0c54325b3303c64065b07d18a529a2a761de1391932388c41dc038d51c152bff100bf50c9e50066962eb5e45c136b996bcfba764f2fe025f2f0eb6a9c8

data/src/compile/c/excel_to_c_runtime.c

@@ -63,6 +63,8 @@ static ExcelValue excel_index_2(ExcelValue array_v, ExcelValue row_number_v);
 static ExcelValue large(ExcelValue array_v, ExcelValue k_v);
 static ExcelValue left(ExcelValue string_v, ExcelValue number_of_characters_v);
 static ExcelValue left_1(ExcelValue string_v);
+static ExcelValue excel_log(ExcelValue number);
+static ExcelValue excel_log_2(ExcelValue number, ExcelValue base);
 static ExcelValue max(int number_of_arguments, ExcelValue *arguments);
 static ExcelValue min(int number_of_arguments, ExcelValue *arguments);
 static ExcelValue mod(ExcelValue a_v, ExcelValue b_v);
@@ -86,6 +88,7 @@ static ExcelValue text(ExcelValue number_v, ExcelValue format_v);
 static ExcelValue vlookup_3(ExcelValue lookup_value_v,ExcelValue lookup_table_v, ExcelValue column_number_v);
 static ExcelValue vlookup(ExcelValue lookup_value_v,ExcelValue lookup_table_v, ExcelValue column_number_v, ExcelValue match_type_v);
 
+
 // My little heap for excel values
 ExcelValue cells[MAX_EXCEL_VALUE_HEAP_SIZE];
 int cell_counter = 0;
@@ -298,6 +301,23 @@ static ExcelValue add(ExcelValue a_v, ExcelValue b_v) {
 	return new_excel_number(a + b);
 }
 
+static ExcelValue excel_log(ExcelValue number) {
+  return excel_log_2(number, TEN);
+}
+
+static ExcelValue excel_log_2(ExcelValue number_v, ExcelValue base_v) {
+	CHECK_FOR_PASSED_ERROR(number_v)
+	CHECK_FOR_PASSED_ERROR(base_v)
+	NUMBER(number_v, n)
+	NUMBER(base_v, b)
+	CHECK_FOR_CONVERSION_ERROR
+
+  if(n<=0) { return NUM; }
+  if(b<=0) { return NUM; }
+
+  return	new_excel_number(log(n)/log(b));
+}
+
 static ExcelValue excel_and(int array_size, ExcelValue *array) {
 	int i;
 	ExcelValue current_excel_value, array_result;
@@ -2385,6 +2405,16 @@ int test_functions() {
   assert(strcmp(text(BLANK, new_excel_string("0%")).string, "0%") == 0);
   assert(strcmp(text(new_excel_number(1.0), BLANK).string, "") == 0);
   assert(strcmp(text(new_excel_string("ASGASD"), new_excel_string("0%")).string, "ASGASD") == 0);
+
+  // Test LOG
+  // One argument variant assumes LOG base 10
+	assert(excel_log(new_excel_number(10)).number == 1);
+	assert(excel_log(new_excel_number(100)).number == 2);
+	assert(excel_log(new_excel_number(0)).type == ExcelError);
+  // Two argument variant allows LOG base to be specified
+	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);
+
   // Release memory
   free_all_allocated_memory();
   

data/src/compile/c/map_formulae_to_c.rb

@@ -47,6 +47,8 @@ class MapFormulaeToC < MapValuesToC
     'LARGE' => 'large',
     'LEFT1' => 'left_1',
     'LEFT2' => 'left',
+    'LOG1' => 'excel_log',
+    'LOG2' => 'excel_log_2',
     'MATCH2' => 'excel_match_2',
     'MATCH3' => 'excel_match',
     'MAX' => 'max',
@@ -69,7 +71,8 @@ class MapFormulaeToC < MapValuesToC
     'SUMPRODUCT' => 'sumproduct',
     'VLOOKUP3' => 'vlookup_3',
     'VLOOKUP4' => 'vlookup',
-    '^' => 'power'
+    '^' => 'power',
+    'POWER' => 'power'
   }
   
   def prefix(symbol,ast)

data/src/compile/ruby/map_formulae_to_ruby.rb

@@ -32,6 +32,7 @@ class MapFormulaeToRuby < MapValuesToRuby
     'INT' => 'int',
     'LARGE' => 'large',
     'LEFT' => 'left',
+    'LOG' => 'log',
     'MATCH' => 'excel_match',
     'MAX' => 'max',
     'MID' => 'mid',
@@ -39,6 +40,7 @@ class MapFormulaeToRuby < MapValuesToRuby
     'MOD' => 'mod',
     'PI' => 'pi',
     'PMT' => 'pmt',
+    'POWER' => 'power',
     'PV' => 'pv',
     'ROUND' => 'round',
     'ROUNDDOWN' => 'rounddown',

data/src/excel/excel_functions.rb

@@ -81,3 +81,5 @@ require_relative 'excel_functions/pv'
 require_relative 'excel_functions/text'
 
 require_relative 'excel_functions/hlookup'
+
+require_relative 'excel_functions/log'

data/src/excel/excel_functions/log.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -98,6 +98,7 @@ files:
 - src/commands/excel_to_ruby.rb
 - src/commands/excel_to_x.rb
 - src/commands.rb
+- src/compile/c/a.out
 - src/compile/c/compile_named_reference_setters.rb
 - src/compile/c/compile_to_c.rb
 - src/compile/c/compile_to_c_header.rb
@@ -140,6 +141,7 @@ files:
 - src/excel/excel_functions/left.rb
 - src/excel/excel_functions/less_than.rb
 - src/excel/excel_functions/less_than_or_equal.rb
+- src/excel/excel_functions/log.rb
 - src/excel/excel_functions/max.rb
 - src/excel/excel_functions/mid.rb
 - src/excel/excel_functions/min.rb