excel_to_code 0.3.4 → 0.3.5

data/src/compile/c/map_formulae_to_c.rb

@@ -250,7 +250,7 @@ class MapFormulaeToC < MapValuesToC
     
     # Then we need to assign it to an excel value
     range_name = array_name+"_ev"
-    initializers << "ExcelValue #{range_name} = new_excel_range(#{array_name},#{number_of_rows},#{number_of_columns});"
+    initializers << "ExcelValue #{range_name} = EXCEL_RANGE(#{array_name},#{number_of_rows},#{number_of_columns});"
 
     range_name
   end

data/src/compile/c/map_values_to_c.rb

@@ -52,16 +52,16 @@ class MapValuesToC
       else
         text.to_i.to_s
       end
-      "new_excel_number(#{n})"
+      "EXCEL_NUMBER(#{n})"
     end
   end
   
   def percentage(text)
-    "new_excel_number(#{(text.to_f / 100.0).to_s})"
+    "EXCEL_NUMBER(#{(text.to_f / 100.0).to_s})"
   end
   
   def string(text)
-    "new_excel_string(#{text.inspect})"
+    "EXCEL_STRING(#{text.inspect})"
   end
   
   ERRORS = {

data/src/excel/excel_functions/right.rb

@@ -8,6 +8,7 @@ module ExcelFunctions
     string = "TRUE" if string == true
     string = "FALSE" if string == false
     string = string.to_s
+    characters = string.length if characters > string.length
     string.slice(string.length-characters,characters) || ""
   end
   

data/src/excel_to_code.rb

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

data/src/simplify/replace_values_with_constants.rb

@@ -12,7 +12,6 @@ class MapValuesToConstants
   
   def map(ast)
     return ast unless ast.is_a?(Array)
-    operator = ast[0]
     if replace?(ast)
       ast.replace([:constant, constants[ast.dup]])
     else
@@ -38,26 +37,3 @@ class MapValuesToConstants
 
 end
 
-
-class ReplaceValuesWithConstants
-  
-  attr_accessor :rewriter
-  
-  def self.replace(*args)
-    self.new.replace(*args)
-  end
-  
-  def replace(input,output)
-    @rewriter ||= MapValuesToConstants.new
-    input.each_line do |line|
-      begin
-        ref, ast = line.split("\t")
-        output.puts "#{ref}\t#{rewriter.map(eval(ast)).inspect}"
-      rescue Exception => e
-        puts "Exception at line #{line}"
-        raise
-      end
-    end
-
-  end
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2014-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -126,6 +126,8 @@ files:
 - src/compile.rb
 - src/compile/c.rb
 - src/compile/c/a.out
+- src/compile/c/a.out.dSYM/Contents/Info.plist
+- src/compile/c/a.out.dSYM/Contents/Resources/DWARF/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