excel_to_code 0.3.17 → 0.3.18.beta.1

data/src/simplify/replace_cell_addresses_with_references.rb

@@ -0,0 +1,70 @@
+class ReplaceCellAddressesWithReferencesAst
+
+  attr_accessor :count_replaced
+  attr_accessor :replacement_made
+
+  def initialize
+    @count_replaced = 0
+  end
+    
+  def replace(ast)
+    @replacement_made = false
+    map(ast)
+    @replacement_made
+  end
+   
+  def map(ast)
+    return ast unless ast.is_a?(Array)
+    function(ast) if ast[0] == :function
+    ast.each { |a| map(a) }
+    ast
+  end
+  
+  def function(ast)
+    _, name, info, ref = *ast
+    return unless name == :CELL
+    return unless info.first == :string
+    return unless info.last.downcase == "address"
+    replace_with_reference(ast, ref)
+  end
+
+  def replace_with_reference(ast, ref)
+    case ref.first
+    when :cell
+      ast.replace([:cell, Reference.for(ref.last).unfix])
+    when :sheet_reference
+      replace_with_reference(ref.last, ref.last)
+      ast.replace(ref)
+    when :area
+      ast.replace([:cell, Reference.for(ref[1]).unfix])
+    else
+      ast.replace([:error, "#VALUE!"])
+    end
+  end
+
+end
+  
+
+class ReplaceCellAddressesWithReferences
+
+    
+  def self.replace(*args)
+    self.new.replace(*args)
+  end
+  
+  attr_accessor :count_replaced
+  
+  def replace(input,output)
+    rewriter = ReplaceCellAddressesWithReferencesAst.new
+    input.each_line do |line|
+      # Looks to match lines with cell
+      if line =~ /:CELL/
+        ref, ast = line.split("\t")
+        output.puts "#{ref}\t#{rewriter.map(eval(ast)).inspect}"
+      else
+        output.puts line
+      end
+    end
+    @count_replaced = rewriter.count_replaced
+  end
+end

data/src/simplify/replace_column_with_column_number.rb

@@ -26,8 +26,15 @@ class ReplaceColumnAndRowFunctionsAST
   def function(ast)
     return unless (ast[1] == :COLUMN || ast[1] == :ROW)
     if ast[2]
-      if ast[2][0] == :cell
+      if ast[2][0] == :cell || ast[2][0] == :area
         reference = Reference.for(ast[2][1])
+      elsif ast[2][0] == :array && ast[2][1][0] == :row
+        r = ast[2][1][1]
+        if r[0] == :cell || r[0] == :area
+          reference = Reference.for(r[1])
+        elsif r[0] == :sheet_reference
+          reference = Reference.for(r[2][1])
+        end
       elsif ast[2][0] == :sheet_reference
         reference = Reference.for(ast[2][2][1])
       else

data/src/simplify/replace_table_references.rb

@@ -1,29 +1,50 @@
 class ReplaceTableReferenceAst
-  
-  attr_accessor :tables, :worksheet, :referring_cell
-  
+
+  attr_accessor :tables, :worksheet, :referring_cell, :function_needs_area
+
   def initialize(tables, worksheet = nil, referring_cell = nil)
     @tables, @worksheet, @referring_cell = tables, worksheet, referring_cell
+    @function_needs_area = false
   end
-  
+
   def map(ast)
     return ast unless ast.is_a?(Array)
     case ast[0]
-    when :table_reference; table_reference(ast)
-    when :local_table_reference; local_table_reference(ast)
+    when :function;
+      check_function_needs_area(ast)
+    when :table_reference;
+      table_reference(ast)
+    when :local_table_reference;
+      local_table_reference(ast)
+    else
+      ast.each { |a| map(a) }
+    end
+    ast
+  end
+
+  def check_function_needs_area(ast)
+    if ast[1] == :MATCH
+      @function_needs_area = false
+      map(ast[2])
+      @function_needs_area = true
+      map(ast[3])
+      @function_needs_area = false
+      ast[4..-1].each { |a| map(a) }
+    else
+      @function_needs_area = false
+      ast.each { |a| map(a) }
     end
-    ast.each { |a| map(a) }
     ast
   end
-  
+
   # Of the format [:table_reference, table_name, table_reference]
   def table_reference(ast)
     table_name = ast[1]
     table_reference = ast[2]
     return ast.replace([:error, :"#REF!"]) unless tables.has_key?(table_name.downcase)
-    ast.replace(tables[table_name.downcase].reference_for(table_name,table_reference,worksheet,referring_cell))
+    ast.replace(tables[table_name.downcase].reference_for(table_name,table_reference,worksheet,referring_cell, @function_needs_area))
   end
-  
+
   # Of the format [:local_table_reference, table_reference]
   def local_table_reference(ast)
     table_reference = ast[1]
@@ -31,29 +52,29 @@ class ReplaceTableReferenceAst
       table.includes?(worksheet,referring_cell)
     end
     return ast.replace([:error, :"#REF!"]) unless table
-    ast.replace(table.reference_for(table.name,table_reference,worksheet,referring_cell))
+    ast.replace(table.reference_for(table.name,table_reference,worksheet,referring_cell, @function_needs_area))
   end
-  
+
 end
 
 
 class ReplaceTableReferences
-  
+
   attr_accessor :sheet_name
-  
+
   def self.replace(*args)
     self.new.replace(*args)
   end
-  
+
   def replace(input,table_data,output)
     tables = {}
     table_data.each do |line|
       table = Table.new(*line.strip.split("\t"))
       tables[table.name.downcase] = table
     end
-        
+
     rewriter = ReplaceTableReferenceAst.new(tables,sheet_name)
-  
+
     input.each_line do |line|
       # Looks to match shared string lines
       begin
@@ -69,8 +90,8 @@ class ReplaceTableReferences
       rescue Exception => e
         puts "Exception at line #{line}"
         raise
-      end      
+      end
     end
   end
-  
+
 end

data/src/simplify/simplify_arithmetic.rb

@@ -1,15 +1,15 @@
 class SimplifyArithmeticAst
-  
+
   def map(ast)
     @brackets_to_remove = []
     simplify_arithmetic(ast)
-    remove_brackets
+    remove_brackets(ast)
     ast
   end
 
   def simplify_arithmetic(ast)
     return ast unless ast.is_a?(Array)
-    ast.each do |a| 
+    ast.each do |a|
       simplify_arithmetic(a) if a.is_a?(Array)
     end
     case ast[0]
@@ -17,9 +17,14 @@ class SimplifyArithmeticAst
     when :brackets; @brackets_to_remove << ast
     end
   end
-  
-  def remove_brackets
-    @brackets_to_remove.uniq.each do |ast|
+
+  def remove_brackets(ast)
+    return ast unless ast.is_a?(Array)
+    ast.each do |a|
+      remove_brackets(a) if a.is_a?(Array)
+    end
+    case ast[0]
+    when :brackets
       raise NotSupportedException.new("Multiple arguments not supported in brackets #{ast.inspect}") if ast.size > 2
       ast.replace(ast[1])
     end
@@ -31,7 +36,7 @@ class SimplifyArithmeticAst
     {:'*' => 2,:'/' => 2},
     {:'+' => 3,:'-' => 3}
   ]
-  
+
   def arithmetic(ast)
     # If smaller than 4, will only be a simple operation (e.g., 1+1 or 2*4)
     # If more than 4, will be like 1+2*3 and so needs turning into 1+(2*3)
@@ -54,14 +59,14 @@ class SimplifyArithmeticAst
     end
   end
 end
-  
+
 
 class SimplifyArithmetic
-    
+
   def self.replace(*args)
     self.new.replace(*args)
   end
-  
+
   def replace(input,output)
     rewriter = SimplifyArithmeticAst.new
     input.each_line do |line|

data/src/version.rb

@@ -0,0 +1,4 @@
+class ExcelToCode
+  def self.version() "0.3.18.beta.1" end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: excel_to_code
 version: !ruby/object:Gem::Version
-  version: 0.3.17
+  version: 0.3.18.beta.1
 platform: ruby
 authors:
 - Thomas Counsell, Green on Black Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2018-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubypeg
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,89 +27,133 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.0.4
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '3.7'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+- !ruby/object:Gem::Dependency
+  name: ffi
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 1.9.18
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: '1.9'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 1.9.18
 - !ruby/object:Gem::Dependency
-  name: ffi
+  name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: 2.8.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '2.8'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.11
+        version: 2.8.2
 - !ruby/object:Gem::Dependency
-  name: ox
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 5.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '5.11'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
-description: "# excel_to_code\n\nConverts some excel spreadsheets (.xlsx, not .xls)
-  into some other programming languages (currently ruby or c).\nThis allows the excel
-  spreadsheets to be run programatically, without excel.\n\nIts cannonical source
-  is at http://github.com/tamc/excel_to_code\n\n# Running excel_to_code\n\nTo just
-  have a go:\n\n\t./bin/excel_to_c <excel_file_name>\n\t\nNB:For small spreadsheets
-  this will take a minute or so. For large spreadsheets it is best to run it overnight.\n\t\nfor
-  more detail:\n\t\n\t./bin/excel_to_c --compile --run-tests --settable <name of input
-  worksheet> --prune-except <name of output worksheet> <excel file name> \n\t\nthis
-  should work:\n\n\t./bin/excel_to_c --help\n\n# Testing excel_to_code\n\n1. Make
-  sure you have ruby 1.9.2 or later installed\n2. gem install bundler # May need to
-  use sudo\n3. bundle\n4. rspec spec/*\n\nTo test the C runtime:\n1. cd src/compile/c\n2.
-  cc excel_to_c_runtime\n3. ./a.out\n\n# Hacking excel_to_code\n\nThere are some how
-  to guides in the doc folder. \n\n# Limitations\n\n1. Not tested at all on Windows\n2.
-  INDIRECT and OFFSET formula must be convertable at runtime into a standard formula\n3.
-  Doesn't implement all functions (see doc/Which_functions_are_implemented.md)\n4.
+        version: 5.11.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12'
+description: "# Excel to Code\n\n[![Tests Passing](https://travis-ci.org/tamc/excel_to_code.svg?branch=master)](https://travis-ci.org/tamc/excel_to_code)\n\nexcel_to_c
+  - roughly translate some Excel files into C.\n\nexcel_to_ruby - roughly translate
+  some Excel files into Ruby.\n\nThis allows spreadsheets to be:\n\n1. Embedded in
+  other programs, such as web servers, or optimisers\n2. Without depending on any
+  Microsoft code\n\nFor example, running [these commands](examples/simple/compile.sh)
+  turns [this spreadsheet](examples/simple/simple.xlsx) into [this Ruby code](examples/simple/ruby/simple.rb)
+  or [this C code](examples/simple/c/simple.c).\n\n# Install\n\nRequires Ruby. Install
+  by:\n\n    gem install excel_to_code\n\n# Run\n\nTo just have a go:\n\n\texcel_to_c
+  <excel_file_name>\n\nThis will produce a file called excelspreadsheet.c\n\nFor a
+  more complex spreadsheet:\n\t\n\texcel_to_c --compile --run-tests --settable <name
+  of input worksheet> --prune-except <name of output worksheet> <excel file name>
+  \n\t\nSee the full list of options:\n\n\texcel_to_c --help\n\n# Gotchas, limitations
+  and bugs\n\n0. No custom functions, no macros for generating results\n1. Results
+  are cached. So you must call reset(), then set values, then read values.\n2. It
+  must be possible to replace INDIRECT and OFFSET formula with standard references
+  at compile time (e.g., INDIRECT(\"A\"&\"1\") is fine, INDIRECT(userInput&\"3\")
+  is not.\n3. Doesn't implement all functions. [See which functions are implemented](docs/Which_functions_are_implemented.md).\n4.
   Doesn't implement references that involve range unions and lists (but does implement
   standard ranges)\n5. Sometimes gives cells as being empty, when excel would give
   the cell as having a numeric value of zero\n6. The generated C version does not
-  multithread and will give bad results if you try\n7. The generated code uses floating
-  point, rather than fully precise arithmetic, so results can differ slightly\n8.
+  multithread and will give bad results if you try.\n7. The generated code uses floating
+  point, rather than fully precise arithmetic, so results can differ slightly.\n8.
   The generated code uses the sprintf approach to rounding (even-odd) rather than
-  excel's 0.5 rounds away from zero.\n90. Ranges like this: Sheet1!A10:Sheet1!B20
-  and 3D ranges don't work\n"
+  excel's 0.5 rounds away from zero.\n9. Ranges like this: Sheet1!A10:Sheet1!B20 and
+  3D ranges don't work.\n\nReport bugs: <https://github.com/tamc/excel_to_code/issues>\n\n#
+  Changelog\n\nSee [Changes](CHANGES.md).\n\n# License\n\nSee [License](LICENSE.md)\n\n#
+  Hacking\n\nSource code: <https://github.com/tamc/excel_to_code>\n\nDocumentation:\n\n*
+  [Installing from source](docs/installing_from_source.md)\n* [Structure of this project](docs/structure_of_this_project.md)\n*
+  [How does the calculation work](docs/how_does_the_calculation_work.md)\n* [How to
+  fix parsing errors](docs/How_to_fix_parsing_errors.md)\n* [How to implement a new
+  Excel function](docs/How_to_add_a_missing_function.md)\n\nSome notes on how Excel
+  works under the hood:\n\n* [The Excel file structure](docs/implementation/excel_file_structure.md)\n*
+  [Relationships](docs/implementation/relationships.md)\n* [Workbooks](docs/implementation/workbook.md)\n*
+  [Worksheets](docs/implementation/worksheets.md)\n* [Cells](docs/implementation/cell.md)\n*
+  [Tables](docs/implementation/tables.md)\n* [Shared Strings](docs/implementation/shared_strings.md)\n*
+  [Array formulae](docs/implementation/array_formulae.md)\n\n"
 email: tamc@greenonblack.com
 executables:
 - excel_to_c
@@ -115,11 +162,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- TODO
 - bin/excel_to_c
+- bin/excel_to_go
 - bin/excel_to_ruby
 - src/commands.rb
+- src/commands/common_command_line_options.rb
 - src/commands/excel_to_c.rb
+- src/commands/excel_to_go.rb
 - src/commands/excel_to_ruby.rb
 - src/commands/excel_to_test.rb
 - src/commands/excel_to_x.rb
@@ -138,6 +187,14 @@ files:
 - src/compile/c/map_sheet_names_to_c_names.rb
 - src/compile/c/map_values_to_c.rb
 - src/compile/c/map_values_to_c_structs.rb
+- src/compile/c/run_c_unit_tests
+- src/compile/cd.rb
+- src/compile/go.rb
+- src/compile/go/compile_to_go.rb
+- src/compile/go/compile_to_go_test.rb
+- src/compile/go/excel.go
+- src/compile/go/excel_test.go
+- src/compile/go/map_values_to_go.rb
 - src/compile/ruby.rb
 - src/compile/ruby/compile_to_ruby.rb
 - src/compile/ruby/compile_to_ruby_unit_test.rb
@@ -155,12 +212,15 @@ files:
 - src/excel/excel_functions/apply_to_range.rb
 - src/excel/excel_functions/average.rb
 - src/excel/excel_functions/averageifs.rb
+- src/excel/excel_functions/ceiling.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
 - src/excel/excel_functions/counta.rb
+- src/excel/excel_functions/countif.rb
+- src/excel/excel_functions/countifs.rb
 - src/excel/excel_functions/divide.rb
 - src/excel/excel_functions/ensure_is_number.rb
 - src/excel/excel_functions/excel_equal.rb
@@ -168,8 +228,10 @@ files:
 - src/excel/excel_functions/excel_match.rb
 - src/excel/excel_functions/exp.rb
 - src/excel/excel_functions/find.rb
+- src/excel/excel_functions/floor.rb
 - src/excel/excel_functions/forecast.rb
 - src/excel/excel_functions/hlookup.rb
+- src/excel/excel_functions/hyperlink.rb
 - src/excel/excel_functions/iferror.rb
 - src/excel/excel_functions/index.rb
 - src/excel/excel_functions/int.rb
@@ -193,21 +255,30 @@ files:
 - src/excel/excel_functions/more_than.rb
 - src/excel/excel_functions/more_than_or_equal.rb
 - src/excel/excel_functions/multiply.rb
+- src/excel/excel_functions/na.rb
 - src/excel/excel_functions/negative.rb
+- src/excel/excel_functions/not.rb
 - src/excel/excel_functions/not_equal.rb
 - src/excel/excel_functions/npv.rb
 - src/excel/excel_functions/number_argument.rb
 - src/excel/excel_functions/number_or_zero.rb
+- src/excel/excel_functions/or.rb
 - src/excel/excel_functions/pi.rb
 - src/excel/excel_functions/pmt.rb
 - src/excel/excel_functions/power.rb
+- src/excel/excel_functions/product.rb
 - src/excel/excel_functions/pv.rb
 - src/excel/excel_functions/rank.rb
+- src/excel/excel_functions/rate.rb
+- src/excel/excel_functions/replace.rb
 - src/excel/excel_functions/reset.rb
 - src/excel/excel_functions/right.rb
 - src/excel/excel_functions/round.rb
 - src/excel/excel_functions/rounddown.rb
 - src/excel/excel_functions/roundup.rb
+- src/excel/excel_functions/scurve.rb
+- src/excel/excel_functions/sqrt.rb
+- src/excel/excel_functions/string_argument.rb
 - src/excel/excel_functions/string_join.rb
 - src/excel/excel_functions/substitute.rb
 - src/excel/excel_functions/subtotal.rb
@@ -258,6 +329,7 @@ files:
 - src/simplify/remove_cells.rb
 - src/simplify/replace_arithmetic_on_ranges.rb
 - src/simplify/replace_arrays_with_single_cells.rb
+- src/simplify/replace_cell_addresses_with_references.rb
 - src/simplify/replace_column_with_column_number.rb
 - src/simplify/replace_common_elements_in_formulae.rb
 - src/simplify/replace_indirects_with_references.rb
@@ -276,6 +348,7 @@ files:
 - src/util.rb
 - src/util/not_supported_exception.rb
 - src/util/try.rb
+- src/version.rb
 homepage: http://github.com/tamc/excel_to_code
 licenses:
 - MIT
@@ -288,18 +361,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.1
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
-summary: Converts .xlxs files into pure ruby 1.9 code or pure C code so that they
-  can be executed without excel
+summary: Convert many .xlsx and .xlsm files into equivalent Ruby or C code that can
+  be executed without Excel
 test_files: []
-has_rdoc: false