excel_to_code 0.3.10 → 0.3.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8cceb19713580157a6d4911e093de7847739c09a
-  data.tar.gz: 40e33dc2ae747d31f1f13c91dfcc290d8b0ca2b1
+  metadata.gz: 7be4eb5782ad34fe1d4a42bf50083440afcc72e2
+  data.tar.gz: ac3bbda110cc0d9ce8dcbc504fce982e79c849d0
 SHA512:
-  metadata.gz: fb562768c44cf4c27a06e1a754a30e0a766c7d35e0169f29adc2882f87b119f79a8311d5b7ad3969645af1ed1abc21ee807341dcbaa68c7b6cee8f5b23dbb90d
-  data.tar.gz: 0a326c177bcc2e1749a406f364f7ccd7c90f7ce542455c6af55773943f5aa81c719c183feb041539fe2071fe3f1f77cdc44728c8758391faa93e162f54da83d1
+  metadata.gz: 2ca73c4cac5b6acef852961b40cd495e91793b5424ef1833b9bdfbf4614c012bcb7c058eda8139b877e2fa8496d4b74014bd9e6066650e2852e6cf8e68bf7456
+  data.tar.gz: df4a7cc607b058104cabd6f03f1fe2675d352a90d1c63fc5591f22e2ba76450c46cfd076f70ca2ef9d7bf29b98ddb1b82ca4657b35bdb064a189b6126241ef12

data/src/commands/excel_to_x.rb

@@ -231,7 +231,13 @@ class ExcelToX
     unless self.log
       self.log = Logger.new(STDOUT)
       log.formatter = proc do |severity, datetime, progname, msg|
-        "#{datetime.strftime("%H:%M")}\t#{msg}\n"
+        case severity
+        when "FATAL"; "\033[41m#{datetime.strftime("%H:%M")}\t#{msg}\033[0m\n"
+        when "ERROR"; "\033[41m#{datetime.strftime("%H:%M")}\t#{msg}\033[0m\n"
+        when "WARN"; "\033[31m#{datetime.strftime("%H:%M")}\t#{msg}\033[0m\n"
+        when "INFO"; "\033[34m#{datetime.strftime("%H:%M")}\t#{msg}\033[0m\n"
+        else; "#{datetime.strftime("%H:%M")}\t#{msg}\n"
+        end
       end
     end
 

data/src/compile/c/excel_to_c_runtime.c

@@ -58,6 +58,7 @@ static ExcelValue less_than(ExcelValue a_v, ExcelValue b_v);
 static ExcelValue less_than_or_equal(ExcelValue a_v, ExcelValue b_v);
 static ExcelValue average(int array_size, ExcelValue *array);
 static ExcelValue averageifs(ExcelValue average_range_v, int number_of_arguments, ExcelValue *arguments);
+static ExcelValue excel_char(ExcelValue number_v);
 static ExcelValue ensure_is_number(ExcelValue maybe_number_v);
 static ExcelValue find_2(ExcelValue string_to_look_for_v, ExcelValue string_to_look_in_v);
 static ExcelValue find(ExcelValue string_to_look_for_v, ExcelValue string_to_look_in_v, ExcelValue position_to_start_at_v);
@@ -300,6 +301,23 @@ static ExcelValue excel_abs(ExcelValue a_v) {
 	}
 }
 
+static ExcelValue excel_char(ExcelValue a_v) {
+	CHECK_FOR_PASSED_ERROR(a_v)	
+	NUMBER(a_v, a)
+	CHECK_FOR_CONVERSION_ERROR
+  if(a <= 0) { return VALUE; }
+  if(a >= 256) { return VALUE; }
+  a = floor(a);
+	char *string = malloc(1); // Freed later
+	if(string == 0) {
+	  printf("Out of memory in char");
+	  exit(-1);
+	}
+  string[0] = a;
+  free_later(string);
+  return EXCEL_STRING(string);
+}
+
 static ExcelValue add(ExcelValue a_v, ExcelValue b_v) {
 	CHECK_FOR_PASSED_ERROR(a_v)
 	CHECK_FOR_PASSED_ERROR(b_v)

data/src/compile/c/excel_to_c_runtime_test.c

@@ -1012,6 +1012,16 @@ int test_functions() {
   ExcelValue npv_array5[] = { BLANK };
   assert(npv(EXCEL_NUMBER(0.1), 1, npv_array5).number == 0);
 
+  // CHAR
+  assert_equal(VALUE, excel_char(ZERO), "excel_char(0) == VALUE");
+  assert_equal(VALUE, excel_char(EXCEL_NUMBER(256)), "excel_char(256) == VALUE");
+  assert_equal(VALUE, excel_char(BLANK), "excel_char() == VALUE");
+  assert_equal(VALUE, excel_char(EXCEL_STRING("adsfa")), "excel_char('nonsense') == VALUE");
+  assert_equal(DIV0, excel_char(DIV0), "excel_char(DIV0) == DIV0");
+  assert_equal(EXCEL_STRING("\x01"), excel_char(ONE), "excel_char(1) == '\x01'");
+  assert_equal(EXCEL_STRING("a"), excel_char(EXCEL_NUMBER(97)), "excel_char(97) == 'a'");
+  assert_equal(EXCEL_STRING("a"), excel_char(EXCEL_NUMBER(97.5)), "excel_char(97.5) == 'a'");
+
   // Release memory
   free_all_allocated_memory();
 

data/src/compile/c/map_formulae_to_c.rb

@@ -31,6 +31,7 @@ class MapFormulaeToC < MapValuesToC
     :'AND' => 'excel_and',
     :'AVERAGE' => 'average',
     :'AVERAGEIFS' => 'averageifs',
+    :'CHAR' => 'excel_char',
     :'CHOOSE' => 'choose',
     :'CONCATENATE' => 'string_join',
     :'COSH' => 'cosh',

data/src/compile/ruby/map_formulae_to_ruby.rb

@@ -21,6 +21,7 @@ class MapFormulaeToRuby < MapValuesToRuby
     :'AVERAGE' => 'average',
     :'AVERAGEIFS' => 'averageifs',
     :'CELL' => 'cell',
+    :'CHAR' => 'char',
     :'CHOOSE' => 'choose',
     :'CONCATENATE' => 'string_join',
     :'COSH' => 'cosh',

data/src/excel/excel_functions.rb

@@ -117,3 +117,5 @@ require_relative 'excel_functions/iserr'
 require_relative 'excel_functions/npv'
 
 require_relative 'excel_functions/iserror'
+
+require_relative 'excel_functions/char'

data/src/excel/excel_functions/char.rb

@@ -0,0 +1,12 @@
+module ExcelFunctions
+  
+  def char(a)
+    a = number_argument(a)
+    return a if a.is_a?(Symbol)
+    return :value if a <= 0
+    return :value if a >= 256
+    a = a.floor
+    "".force_encoding("Windows-1252") << a
+  end
+  
+end

data/src/excel_to_code.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.3.10
+  version: 0.3.11
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-16 00:00:00.000000000 Z
+date: 2015-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -155,6 +155,7 @@ files:
 - src/excel/excel_functions/average.rb
 - src/excel/excel_functions/averageifs.rb
 - src/excel/excel_functions/cell.rb
+- src/excel/excel_functions/char.rb
 - src/excel/excel_functions/choose.rb
 - src/excel/excel_functions/cosh.rb
 - src/excel/excel_functions/count.rb