csv_plus_plus 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a93c3ee93f2320dc717ee330c55cd3f300cfa4d155a4502b9a433cdafdcc389
-  data.tar.gz: aa95dca43a374d57f2217030e0aefef680341549613b0388cb5df1122cb5f815
+  metadata.gz: 6ef86258faa82b75114acc715e9cb68bb312dc55194d533270fce0a796e02362
+  data.tar.gz: 9316f43dd4169a779efc6d8f447002434c4fc5984064b1f22f1448baee0f4522
 SHA512:
-  metadata.gz: 19a827c9a5fc8f0f9fe9d58c4e6b85de821c9e09627465673c2813c2690fadc886c7d8f24e3da5402783b27347a79f7832b13c82abe4e204026d12839d6f4691
-  data.tar.gz: b157b531d9ae9e2fda9c93ed466976deacfe639b1fbc1527b60c706be9d97792946341a767f00c32b6d35cbc6e388711980767d9ef6b5c20b4a2f44ebe7fb121
+  metadata.gz: 8637e6c3dec41bf747e5fe1f6eb4d3227247e196ef530bbac96e964f6cdbe911d39bed9941ab7e116f00ea2547cf5050a609f078af8dab8f28a6e0f7746e776d
+  data.tar.gz: 57acb6edef384a31a41ea244841d2977d31817d87735944336688f5961d6eb22c97e5b88683d753c1163239f397936411a7836eafe1aef6e9ed6a612e846fd68

data/CHANGELOG.md

@@ -1,8 +1,15 @@
+## v0.1.1
+
+- Better support for the various infix operators (+,-,/,*,^,%,=,<,etc)
+  * Previously we were converting them to their prefix equivalent (multiply, minus, concat, etc) but excel doesn't support most of those.  So we keep them infix
+  * Didn't support some infix operators (^, %, </>/<=/>=/<>)
+  * Proper support for operator precedence
+- When in verbose mode, print a summary of compiled functions and variables
+- docs & tests
 
 ## v0.1.0
 
 - revamp of builtin functions
-
 - docs & tests
 
 ## v0.0.5

data/lib/csv_plus_plus/code_section.rb

@@ -64,5 +64,38 @@ module CSVPlusPlus
     def to_s
       "CodeSection(functions: #{@functions}, variables: #{@variables})"
     end
+
+    # Provide a summary of the functions and variables compiled (to show in verbose mode)
+    #
+    # @return [String]
+    def verbose_summary
+      <<~SUMMARY
+        # Code Section Summary
+
+        ## Resolved Variables
+
+        #{variable_summary}
+
+        ## Functions
+
+        #{function_summary}
+      SUMMARY
+    end
+
+    private
+
+    def variable_summary
+      return '(no variables defined)' if @variables.empty?
+
+      @variables.map { |k, v| "#{k} := #{v}" }
+                .join("\n")
+    end
+
+    def function_summary
+      return '(no functions defined)' if @functions.empty?
+
+      @functions.map { |k, f| "#{k}: #{f}" }
+                .join("\n")
+    end
   end
 end

data/lib/csv_plus_plus/language/ast_builder.rb

@@ -13,11 +13,11 @@ module CSVPlusPlus
       # @param arguments [] The arguments to create the entity with
       #
       # @return [Entity, #super]
-      def method_missing(method_name, *arguments)
+      def method_missing(method_name, *args, **kwargs, &)
         entity_class = ::CSVPlusPlus::Language::TYPES[method_name.to_sym]
         return super unless entity_class
 
-        entity_class.new(*arguments)
+        entity_class.new(*args, **kwargs, &)
       end
 
       # Let the current class have functions which can build a given entity by calling it's type.  For example

data/lib/csv_plus_plus/language/cell_value.tab.rb

@@ -7,12 +7,14 @@
 require 'racc/parser.rb'
 
   require_relative '../lexer'
+  require_relative '../language/ast_builder'
 
 module CSVPlusPlus
   module Language
     class CellValueParser < Racc::Parser
 
 module_eval(<<'...end cell_value.y/module_eval...', 'cell_value.y', 48)
+  include ::CSVPlusPlus::Language::ASTBuilder
   include ::CSVPlusPlus::Lexer
 
   protected
@@ -31,15 +33,16 @@ module_eval(<<'...end cell_value.y/module_eval...', 'cell_value.y', 48)
 
   def tokenizer
     ::CSVPlusPlus::Lexer::Tokenizer.new(
-      catchall: /[\(\)\/\*\+\-,=&]/,
+      catchall: /[\{\}\(\),=]/,
       ignore: /\s+/,
       tokens: [
-        [/true/i, :TRUE],
-        [/false/i, :FALSE],
-        [/"(?:[^"\\]|\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4}))*"/, :STRING],
-        [/-?[\d.]+/, :NUMBER],
-        [/\$\$/, :VAR_REF],
-        [/[\$\w_]+/, :ID]
+        TOKEN_LIBRARY[:TRUE],
+        TOKEN_LIBRARY[:FALSE],
+        TOKEN_LIBRARY[:NUMBER],
+        TOKEN_LIBRARY[:STRING],
+        TOKEN_LIBRARY[:INFIX_OP],
+        TOKEN_LIBRARY[:VAR_REF],
+        TOKEN_LIBRARY[:ID]
       ]
     )
   end
@@ -47,108 +50,99 @@ module_eval(<<'...end cell_value.y/module_eval...', 'cell_value.y', 48)
 ##### State transition tables begin ###
 
 racc_action_table = [
-    33,    16,    17,    20,    18,    19,    15,     7,    16,    17,
-    20,    18,    19,     7,    34,    12,    13,    10,     9,    11,
-     8,    12,    13,    10,     9,    11,     8,     7,    16,    17,
-    20,    18,    19,     7,     2,    12,    13,    10,     9,    11,
-     8,    12,    13,    10,     9,    11,     8,     7,    16,    17,
-    20,     3,    14,     7,    22,    12,    13,    10,     9,    11,
-     8,    12,    13,    10,     9,    11,     8,     7,    16,    17,
-    20,    23,    16,     7,    31,    12,    13,    10,     9,    11,
-     8,    12,    13,    10,     9,    11,     8,     7,    29,    16,
-    17,    20,    18,    19,    16,    12,    13,    10,     9,    11,
-     8 ]
+     7,    21,    15,    25,     2,    16,     3,     7,    14,    18,
+    19,    16,    16,    16,     7,    12,    13,    16,    10,     9,
+    11,     8,    12,    13,    26,    10,     9,    11,     8,    12,
+    13,   nil,    10,     9,    11,     8,     7,    23,   nil,   nil,
+   nil,   nil,   nil,     7,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    12,    13,   nil,    10,     9,    11,     8,    12,    13,
+   nil,    10,     9,    11,     8 ]
 
 racc_action_check = [
-    30,     4,     4,     4,     4,     4,     4,     2,    32,    32,
-    32,    32,    32,     7,    30,     2,     2,     2,     2,     2,
-     2,     7,     7,     7,     7,     7,     7,    16,    35,    35,
-    35,    35,    35,    17,     0,    16,    16,    16,    16,    16,
-    16,    17,    17,    17,    17,    17,    17,    18,    26,    26,
-    26,     1,     3,    19,     8,    18,    18,    18,    18,    18,
-    18,    19,    19,    19,    19,    19,    19,    20,    27,    27,
-    27,    13,    25,    23,    23,    20,    20,    20,    20,    20,
-    20,    23,    23,    23,    23,    23,    23,    34,    21,    21,
-    21,    21,    21,    21,    28,    34,    34,    34,    34,    34,
-    34 ]
+     2,    17,     4,    22,     0,     4,     1,     7,     3,     8,
+    13,    20,    24,    27,    16,     2,     2,    17,     2,     2,
+     2,     2,     7,     7,    22,     7,     7,     7,     7,    16,
+    16,   nil,    16,    16,    16,    16,    19,    19,   nil,   nil,
+   nil,   nil,   nil,    26,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    19,    19,   nil,    19,    19,    19,    19,    26,    26,
+   nil,    26,    26,    26,    26 ]
 
 racc_action_pointer = [
-    18,    51,     5,    52,    -3,   nil,   nil,    11,    43,   nil,
-   nil,   nil,   nil,    69,   nil,   nil,    25,    31,    45,    51,
-    65,    85,   nil,    71,   nil,    68,    44,    64,    90,   nil,
-    -3,   nil,     4,   nil,    85,    24 ]
+    -6,     6,    -2,     8,   -14,   nil,   nil,     5,    -9,   nil,
+   nil,   nil,   nil,     8,   nil,   nil,    12,    -2,   nil,    34,
+    -8,   nil,     0,   nil,    -7,   nil,    41,    -6 ]
 
 racc_action_default = [
-   -20,   -20,   -20,   -20,   -20,    -2,    -3,   -20,   -20,    -6,
-    -7,    -8,    -9,   -10,    36,    -1,   -20,   -20,   -20,   -20,
-   -20,   -20,    -5,   -20,   -15,   -16,   -17,   -18,   -19,    -4,
-   -20,   -12,   -14,   -11,   -20,   -13 ]
+   -16,   -16,   -16,   -16,   -16,    -2,    -3,   -16,   -16,    -6,
+    -7,    -8,    -9,   -10,    28,    -1,   -16,   -16,    -5,   -16,
+   -15,    -4,   -16,   -12,   -14,   -11,   -16,   -13 ]
 
 racc_goto_table = [
-     4,     1,    30,   nil,   nil,    21,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    24,    25,    26,    27,    28,   nil,
-   nil,    32,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,    35 ]
+     4,     1,    22,   nil,   nil,    17,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    20,   nil,   nil,    24,   nil,   nil,
+   nil,   nil,   nil,   nil,    27 ]
 
 racc_goto_check = [
      2,     1,     5,   nil,   nil,     2,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,     2,     2,     2,     2,     2,   nil,
-   nil,     2,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,     2 ]
+   nil,   nil,   nil,   nil,     2,   nil,   nil,     2,   nil,   nil,
+   nil,   nil,   nil,   nil,     2 ]
 
 racc_goto_pointer = [
-   nil,     1,    -2,   nil,   nil,   -21 ]
+   nil,     1,    -2,   nil,   nil,   -17 ]
 
 racc_goto_default = [
    nil,   nil,   nil,     5,     6,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  3, 19, :_reduce_1,
-  1, 20, :_reduce_none,
-  1, 20, :_reduce_none,
-  3, 20, :_reduce_4,
-  2, 20, :_reduce_5,
-  1, 20, :_reduce_6,
-  1, 20, :_reduce_7,
-  1, 20, :_reduce_8,
-  1, 20, :_reduce_9,
-  1, 20, :_reduce_10,
-  4, 21, :_reduce_11,
-  3, 21, :_reduce_12,
-  3, 23, :_reduce_13,
-  1, 23, :_reduce_14,
-  3, 22, :_reduce_15,
-  3, 22, :_reduce_16,
-  3, 22, :_reduce_17,
-  3, 22, :_reduce_18,
-  3, 22, :_reduce_19 ]
-
-racc_reduce_n = 20
-
-racc_shift_n = 36
+  3, 26, :_reduce_1,
+  1, 27, :_reduce_none,
+  1, 27, :_reduce_none,
+  3, 27, :_reduce_4,
+  2, 27, :_reduce_5,
+  1, 27, :_reduce_6,
+  1, 27, :_reduce_7,
+  1, 27, :_reduce_8,
+  1, 27, :_reduce_9,
+  1, 27, :_reduce_10,
+  4, 28, :_reduce_11,
+  3, 28, :_reduce_12,
+  3, 30, :_reduce_13,
+  1, 30, :_reduce_14,
+  3, 29, :_reduce_15 ]
+
+racc_reduce_n = 16
+
+racc_shift_n = 28
 
 racc_token_table = {
   false => 0,
   :error => 1,
   "(" => 2,
   ")" => 3,
-  "&" => 4,
+  "^" => 4,
   "*" => 5,
   "/" => 6,
   "+" => 7,
   "-" => 8,
-  :EOL => 9,
-  :FALSE => 10,
-  :ID => 11,
-  :NUMBER => 12,
-  :STRING => 13,
-  :TRUE => 14,
-  :VAR_REF => 15,
-  "=" => 16,
-  "," => 17 }
-
-racc_nt_base = 18
+  "&" => 9,
+  "=" => 10,
+  "<" => 11,
+  ">" => 12,
+  "<=" => 13,
+  ">=" => 14,
+  "<>" => 15,
+  :EOL => 16,
+  :FALSE => 17,
+  :ID => 18,
+  :INFIX_OP => 19,
+  :NUMBER => 20,
+  :STRING => 21,
+  :TRUE => 22,
+  :VAR_REF => 23,
+  "," => 24 }
+
+racc_nt_base = 25
 
 racc_use_result_var = true
 
@@ -173,19 +167,26 @@ Racc_token_to_s_table = [
   "error",
   "\"(\"",
   "\")\"",
-  "\"&\"",
+  "\"^\"",
   "\"*\"",
   "\"/\"",
   "\"+\"",
   "\"-\"",
+  "\"&\"",
+  "\"=\"",
+  "\"<\"",
+  "\">\"",
+  "\"<=\"",
+  "\">=\"",
+  "\"<>\"",
   "EOL",
   "FALSE",
   "ID",
+  "INFIX_OP",
   "NUMBER",
   "STRING",
   "TRUE",
   "VAR_REF",
-  "\"=\"",
   "\",\"",
   "$start",
   "cell_value",
@@ -200,7 +201,7 @@ Racc_debug_parser = false
 
 # reduce 0 omitted
 
-module_eval(<<'.,.,', 'cell_value.y', 17)
+module_eval(<<'.,.,', 'cell_value.y', 20)
   def _reduce_1(val, _values, result)
      @ast = val[1]
     result
@@ -211,114 +212,86 @@ module_eval(<<'.,.,', 'cell_value.y', 17)
 
 # reduce 3 omitted
 
-module_eval(<<'.,.,', 'cell_value.y', 21)
+module_eval(<<'.,.,', 'cell_value.y', 24)
   def _reduce_4(val, _values, result)
      result = val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cell_value.y', 22)
+module_eval(<<'.,.,', 'cell_value.y', 25)
   def _reduce_5(val, _values, result)
-     result = e(:variable, val[1])
+     result = variable(val[1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cell_value.y', 23)
+module_eval(<<'.,.,', 'cell_value.y', 26)
   def _reduce_6(val, _values, result)
-     result = e(:string, val[0])
+     result = string(val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cell_value.y', 24)
+module_eval(<<'.,.,', 'cell_value.y', 27)
   def _reduce_7(val, _values, result)
-     result = e(:number, val[0])
+     result = number(val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cell_value.y', 25)
+module_eval(<<'.,.,', 'cell_value.y', 28)
   def _reduce_8(val, _values, result)
-     result = e(:boolean, true)
+     result = boolean(true)
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cell_value.y', 26)
+module_eval(<<'.,.,', 'cell_value.y', 29)
   def _reduce_9(val, _values, result)
-     result = e(:boolean, false)
+     result = boolean(false)
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cell_value.y', 27)
+module_eval(<<'.,.,', 'cell_value.y', 30)
   def _reduce_10(val, _values, result)
-     result = e(:cell_reference, val[0])
+     result = cell_reference(val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cell_value.y', 29)
+module_eval(<<'.,.,', 'cell_value.y', 32)
   def _reduce_11(val, _values, result)
-     result = e(:function_call, val[0], val[2])
+     result = function_call(val[0], val[2])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cell_value.y', 30)
+module_eval(<<'.,.,', 'cell_value.y', 33)
   def _reduce_12(val, _values, result)
-     result = e(:function_call, val[0], [])
+     result = function_call(val[0], [])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cell_value.y', 32)
+module_eval(<<'.,.,', 'cell_value.y', 35)
   def _reduce_13(val, _values, result)
      result = val[0] << val[2]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cell_value.y', 33)
+module_eval(<<'.,.,', 'cell_value.y', 36)
   def _reduce_14(val, _values, result)
      result = [val[0]]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'cell_value.y', 35)
-  def _reduce_15(val, _values, result)
-     result = e(:function_call, :concat, [val[0], val[2]])
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'cell_value.y', 36)
-  def _reduce_16(val, _values, result)
-     result = e(:function_call, :multiply, [val[0], val[2]])
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'cell_value.y', 37)
-  def _reduce_17(val, _values, result)
-     result = e(:function_call, :add, [val[0], val[2]])
-    result
-  end
-.,.,
-
 module_eval(<<'.,.,', 'cell_value.y', 38)
-  def _reduce_18(val, _values, result)
-     result = e(:function_call, :minus, [val[0], val[2]])
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'cell_value.y', 39)
-  def _reduce_19(val, _values, result)
-     result = e(:function_call, :divide, [val[0], val[2]])
+  def _reduce_15(val, _values, result)
+     result = function_call(val[1], [val[0], val[2]], infix: true)
     result
   end
 .,.,

data/lib/csv_plus_plus/language/code_section.tab.rb

@@ -6,15 +6,17 @@
 
 require 'racc/parser.rb'
 
-require_relative '../lexer'
-require_relative '../code_section'
+  require_relative '../lexer'
+  require_relative '../code_section'
+  require_relative '../language/ast_builder'
 
 module CSVPlusPlus
   module Language
     class CodeSectionParser < Racc::Parser
 
-module_eval(<<'...end code_section.y/module_eval...', 'code_section.y', 67)
+module_eval(<<'...end code_section.y/module_eval...', 'code_section.y', 71)
   include ::CSVPlusPlus::Lexer
+  include ::CSVPlusPlus::Language::ASTBuilder
 
   def initialize
     super
@@ -35,7 +37,7 @@ module_eval(<<'...end code_section.y/module_eval...', 'code_section.y', 67)
 
   def tokenizer
     ::CSVPlusPlus::Lexer::Tokenizer.new(
-      catchall: /[\(\)\{\}\/\*\+\-,=&]/,
+      catchall: /[\{\}\(\),]/, # TODO: do I even need this (oh I think brackets are for arrays
       ignore: /\s+|\#[^\n]+\n/,
       stop_fn: lambda do |scanner|
         return false unless scanner.scan(/#{::CSVPlusPlus::Lexer::END_OF_CODE_SECTION}/)
@@ -45,15 +47,16 @@ module_eval(<<'...end code_section.y/module_eval...', 'code_section.y', 67)
         true
       end,
       tokens: [
-        [/\n/, :EOL],
+        [/\n/, :EOL], # XXX do I need this?
         [/:=/, :ASSIGN],
-        [/\bdef\b/, :FN_DEF],
-        [/\bTRUE\b/i, :TRUE],
-        [/\bFALSE\b/i, :FALSE],
-        [/"(?:[^"\\]|\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4}))*"/, :STRING],
-        [/-?[\d.]+/, :NUMBER],
-        [/\$\$/, :VAR_REF],
-        [/[!:\w_]+/, :ID],
+        [/def/, :FN_DEF],
+        TOKEN_LIBRARY[:TRUE],
+        TOKEN_LIBRARY[:FALSE],
+        TOKEN_LIBRARY[:NUMBER],
+        TOKEN_LIBRARY[:STRING],
+        TOKEN_LIBRARY[:INFIX_OP],
+        TOKEN_LIBRARY[:VAR_REF],
+        TOKEN_LIBRARY[:ID]
       ],
     )
   end
@@ -64,12 +67,8 @@ module_eval(<<'...end code_section.y/module_eval...', 'code_section.y', 67)
 
   private
 
-  def e(type, *entity_args)
-    ::CSVPlusPlus::Language::TYPES[type].new(*entity_args)
-  end
-
   def def_function(id, arguments, body)
-    fn_def = e(:function, id, arguments, body)
+    fn_def = function(id, arguments, body)
     @code_section.def_function(fn_def.id, fn_def)
   end
 
@@ -80,112 +79,91 @@ module_eval(<<'...end code_section.y/module_eval...', 'code_section.y', 67)
 ##### State transition tables begin ###
 
 racc_action_table = [
-    45,    27,     3,    37,    51,     7,    38,    52,    28,     9,
-    19,     8,    29,    30,    31,    32,    33,    24,    25,    22,
-    21,    23,    20,    19,    29,    30,    31,    32,    33,    19,
-    24,    25,    22,    21,    23,    20,    24,    25,    22,    21,
-    23,    20,    19,    29,    30,    31,    32,    33,    19,    24,
-    25,    22,    21,    23,    20,    24,    25,    22,    21,    23,
-    20,    19,    29,    30,    31,    32,    33,    19,    24,    25,
-    22,    21,    23,    20,    24,    25,    22,    21,    23,    20,
-    19,    29,    30,    31,    32,    33,    12,    24,    25,    22,
-    21,    23,    20,    19,    48,    13,    14,    15,    35,    19,
-    24,    25,    22,    21,    23,    20,    24,    25,    22,    21,
-    23,    20,    19,    29,    30,    31,    32,    33,    36,    24,
-    25,    22,    21,    23,    20,    10,    50,   nil,     7,    29,
-    30,    31,    32,    33,     8,    29,    30,    31,    32,    33,
-    29,    30,    31,    32,    33,    29,    30,    31,    32,    33,
-    29,    30,    31,    32,    33 ]
+    20,    38,    35,     9,    12,    13,    14,    20,    16,    31,
+    33,    34,    31,    42,    20,    31,    29,    36,    25,    26,
+    31,    23,    22,    24,    21,    25,    26,    20,    23,    22,
+    24,    21,    25,    26,    30,    23,    22,    24,    21,    20,
+    41,    31,    31,   nil,    43,    25,    26,    20,    23,    22,
+    24,    21,     3,    10,   nil,     7,     7,    25,    26,    44,
+    23,    22,    24,    21,   nil,    25,    26,   nil,    23,    22,
+    24,    21,     8,     8 ]
 
 racc_action_check = [
-    34,    15,     0,    26,    47,     0,    26,    47,    15,     1,
-    13,     0,    34,    34,    34,    34,    34,    13,    13,    13,
-    13,    13,    13,    19,    16,    16,    16,    16,    16,    27,
-    19,    19,    19,    19,    19,    19,    27,    27,    27,    27,
-    27,    27,    29,    39,    39,    39,    39,    39,    30,    29,
-    29,    29,    29,    29,    29,    30,    30,    30,    30,    30,
-    30,    31,    40,    40,    40,    40,    40,    32,    31,    31,
-    31,    31,    31,    31,    32,    32,    32,    32,    32,    32,
-    33,    41,    41,    41,    41,    41,     7,    33,    33,    33,
-    33,    33,    33,    36,    36,     8,     9,    12,    20,    37,
-    36,    36,    36,    36,    36,    36,    37,    37,    37,    37,
-    37,    37,    52,    42,    42,    42,    42,    42,    25,    52,
-    52,    52,    52,    52,    52,     2,    38,   nil,     2,    43,
-    43,    43,    43,    43,     2,    44,    44,    44,    44,    44,
-    46,    46,    46,    46,    46,    49,    49,    49,    49,    49,
-    53,    53,    53,    53,    53 ]
+    13,    32,    28,     1,     7,     8,     9,    15,    12,    17,
+    21,    26,    27,    36,    20,    37,    16,    28,    13,    13,
+    32,    13,    13,    13,    13,    15,    15,    31,    15,    15,
+    15,    15,    20,    20,    16,    20,    20,    20,    20,    34,
+    34,    39,    45,   nil,    40,    31,    31,    44,    31,    31,
+    31,    31,     0,     2,   nil,     0,     2,    34,    34,    40,
+    34,    34,    34,    34,   nil,    44,    44,   nil,    44,    44,
+    44,    44,     0,     2 ]
 
 racc_action_pointer = [
-     0,     9,   123,   nil,   nil,   nil,   nil,    75,    89,    96,
-   nil,   nil,    94,     7,   nil,    -3,     8,   nil,   nil,    20,
-    87,   nil,   nil,   nil,   nil,   115,    -1,    26,   nil,    39,
-    45,    58,    64,    77,    -4,   nil,    90,    96,   115,    27,
-    46,    65,    97,   113,   119,   nil,   124,     0,   nil,   129,
-   nil,   nil,   109,   134 ]
+    50,     3,    51,   nil,   nil,   nil,   nil,   -18,    -1,     6,
+   nil,   nil,     5,    -3,   nil,     4,    12,   -14,   nil,   nil,
+    11,   -12,   nil,   nil,   nil,   nil,     8,   -11,    -2,   nil,
+   nil,    24,    -3,   nil,    36,   nil,    -9,    -8,   nil,    18,
+    40,   nil,   nil,   nil,    44,    19 ]
 
 racc_action_default = [
-   -30,   -30,   -30,    -2,    -4,    -5,    -6,   -30,   -30,   -30,
-    -1,    -3,   -30,   -30,    54,   -30,   -11,   -12,   -13,   -30,
-   -30,   -16,   -17,   -18,   -19,   -20,   -30,   -30,   -10,   -30,
-   -30,   -30,   -30,   -30,   -30,   -15,   -30,   -30,   -30,    -8,
-   -21,   -22,   -23,   -24,   -25,   -14,   -29,   -30,   -27,    -7,
-    -9,   -26,   -30,   -28 ]
+   -27,   -27,   -27,    -2,    -4,    -5,    -6,   -27,   -27,   -27,
+    -1,    -3,   -27,   -27,    46,   -27,   -27,   -12,   -13,   -14,
+   -27,   -27,   -17,   -18,   -19,   -20,   -21,    -7,   -27,    -9,
+   -11,   -27,   -27,   -16,   -27,    -8,   -27,   -22,   -15,   -26,
+   -27,   -24,   -10,   -23,   -27,   -25 ]
 
 racc_goto_table = [
-    16,     4,     1,    11,     2,    26,    34,    47,   nil,   nil,
-   nil,   nil,   nil,   nil,    39,   nil,    40,    41,    42,    43,
-    44,   nil,   nil,    46,    49,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    53 ]
+    17,     4,    27,    11,     1,     2,    15,    32,    28,    40,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    37,   nil,
+   nil,    39,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,    45 ]
 
 racc_goto_check = [
-     7,     3,     1,     3,     2,     6,     7,    10,   nil,   nil,
-   nil,   nil,   nil,   nil,     7,   nil,     7,     7,     7,     7,
-     7,   nil,   nil,     7,     7,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     7 ]
+     7,     3,     7,     3,     1,     2,     6,     7,     8,    11,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,     7,   nil,
+   nil,     7,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,     7 ]
 
 racc_goto_pointer = [
-   nil,     2,     4,     1,   nil,   nil,   -10,   -13,   nil,   nil,
-   -29 ]
+   nil,     4,     5,     1,   nil,   nil,    -6,   -13,    -8,   nil,
+   nil,   -25 ]
 
 racc_goto_default = [
-   nil,   nil,   nil,   nil,     5,     6,   nil,   nil,    17,    18,
-   nil ]
+   nil,   nil,   nil,   nil,     5,     6,   nil,   nil,   nil,    18,
+    19,   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  2, 22, :_reduce_none,
-  1, 22, :_reduce_none,
-  2, 23, :_reduce_none,
-  1, 23, :_reduce_none,
-  1, 24, :_reduce_none,
-  1, 24, :_reduce_none,
-  6, 25, :_reduce_7,
-  5, 25, :_reduce_8,
-  3, 27, :_reduce_9,
-  1, 27, :_reduce_10,
-  3, 26, :_reduce_11,
-  1, 28, :_reduce_none,
-  1, 28, :_reduce_none,
-  3, 28, :_reduce_14,
-  2, 28, :_reduce_15,
-  1, 28, :_reduce_16,
-  1, 28, :_reduce_17,
-  1, 28, :_reduce_18,
-  1, 28, :_reduce_19,
-  1, 28, :_reduce_20,
-  3, 30, :_reduce_21,
-  3, 30, :_reduce_22,
-  3, 30, :_reduce_23,
-  3, 30, :_reduce_24,
-  3, 30, :_reduce_25,
-  4, 29, :_reduce_26,
-  3, 29, :_reduce_27,
-  3, 31, :_reduce_28,
-  1, 31, :_reduce_29 ]
-
-racc_reduce_n = 30
-
-racc_shift_n = 54
+  2, 29, :_reduce_none,
+  1, 29, :_reduce_none,
+  2, 30, :_reduce_none,
+  1, 30, :_reduce_none,
+  1, 31, :_reduce_none,
+  1, 31, :_reduce_none,
+  4, 32, :_reduce_7,
+  3, 34, :_reduce_8,
+  2, 34, :_reduce_9,
+  3, 36, :_reduce_10,
+  1, 36, :_reduce_11,
+  3, 33, :_reduce_12,
+  1, 35, :_reduce_none,
+  1, 35, :_reduce_none,
+  3, 35, :_reduce_15,
+  2, 35, :_reduce_16,
+  1, 35, :_reduce_17,
+  1, 35, :_reduce_18,
+  1, 35, :_reduce_19,
+  1, 35, :_reduce_20,
+  1, 35, :_reduce_21,
+  3, 38, :_reduce_22,
+  4, 37, :_reduce_23,
+  3, 37, :_reduce_24,
+  3, 39, :_reduce_25,
+  1, 39, :_reduce_26 ]
+
+racc_reduce_n = 27
+
+racc_shift_n = 46
 
 racc_token_table = {
   false => 0,
@@ -195,22 +173,29 @@ racc_token_table = {
   ")" => 4,
   :FN_DEF => 5,
   :ASSIGN => 6,
-  "," => 7,
-  :CELL_REF => 8,
-  :EOL => 9,
-  :FALSE => 10,
-  :ID => 11,
-  :NUMBER => 12,
-  :STRING => 13,
-  :TRUE => 14,
-  :VAR_REF => 15,
-  "&" => 16,
-  "*" => 17,
-  "+" => 18,
-  "-" => 19,
-  "/" => 20 }
-
-racc_nt_base = 21
+  "^" => 7,
+  "*" => 8,
+  "/" => 9,
+  "+" => 10,
+  "-" => 11,
+  "&" => 12,
+  "=" => 13,
+  "<" => 14,
+  ">" => 15,
+  "<=" => 16,
+  ">=" => 17,
+  "<>" => 18,
+  "," => 19,
+  :EOL => 20,
+  :FALSE => 21,
+  :ID => 22,
+  :INFIX_OP => 23,
+  :NUMBER => 24,
+  :STRING => 25,
+  :TRUE => 26,
+  :VAR_REF => 27 }
+
+racc_nt_base = 28
 
 racc_use_result_var = true
 
@@ -238,28 +223,36 @@ Racc_token_to_s_table = [
   "\")\"",
   "FN_DEF",
   "ASSIGN",
+  "\"^\"",
+  "\"*\"",
+  "\"/\"",
+  "\"+\"",
+  "\"-\"",
+  "\"&\"",
+  "\"=\"",
+  "\"<\"",
+  "\">\"",
+  "\"<=\"",
+  "\">=\"",
+  "\"<>\"",
   "\",\"",
-  "CELL_REF",
   "EOL",
   "FALSE",
   "ID",
+  "INFIX_OP",
   "NUMBER",
   "STRING",
   "TRUE",
   "VAR_REF",
-  "\"&\"",
-  "\"*\"",
-  "\"+\"",
-  "\"-\"",
-  "\"/\"",
   "$start",
   "code_section",
   "code",
   "def",
   "fn_def",
   "var_def",
-  "fn_def_args",
+  "fn_def_args_or_not",
   "exp",
+  "fn_def_args",
   "fn_call",
   "infix_fn_call",
   "fn_call_args" ]
@@ -282,152 +275,131 @@ Racc_debug_parser = false
 
 # reduce 6 omitted
 
-module_eval(<<'.,.,', 'code_section.y', 29)
+module_eval(<<'.,.,', 'code_section.y', 34)
   def _reduce_7(val, _values, result)
-     def_function(val[1], val[3], val[5])
+     def_function(val[1], val[2], val[3])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'code_section.y', 30)
+module_eval(<<'.,.,', 'code_section.y', 36)
   def _reduce_8(val, _values, result)
-     def_function(val[1], [], val[4])
+     result = val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'code_section.y', 32)
+module_eval(<<'.,.,', 'code_section.y', 37)
   def _reduce_9(val, _values, result)
-     result = val[0] << val[2]
+     result = []
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'code_section.y', 33)
+module_eval(<<'.,.,', 'code_section.y', 39)
   def _reduce_10(val, _values, result)
-     result = [val[0]]
+     result = val[0] << val[2]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'code_section.y', 35)
+module_eval(<<'.,.,', 'code_section.y', 40)
   def _reduce_11(val, _values, result)
-     def_variable(val[0], val[2])
+     result = [val[0]]
     result
   end
 .,.,
 
-# reduce 12 omitted
-
-# reduce 13 omitted
-
-module_eval(<<'.,.,', 'code_section.y', 39)
-  def _reduce_14(val, _values, result)
-     result = val[1]
+module_eval(<<'.,.,', 'code_section.y', 42)
+  def _reduce_12(val, _values, result)
+     def_variable(val[0], val[2])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'code_section.y', 40)
+# reduce 13 omitted
+
+# reduce 14 omitted
+
+module_eval(<<'.,.,', 'code_section.y', 46)
   def _reduce_15(val, _values, result)
-     result = e(:variable, val[1])
+     result = val[1]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'code_section.y', 41)
+module_eval(<<'.,.,', 'code_section.y', 47)
   def _reduce_16(val, _values, result)
-     result = e(:string, val[0])
+     result = variable(val[1])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'code_section.y', 42)
+module_eval(<<'.,.,', 'code_section.y', 48)
   def _reduce_17(val, _values, result)
-     result = e(:number, val[0])
+     result = string(val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'code_section.y', 43)
+module_eval(<<'.,.,', 'code_section.y', 49)
   def _reduce_18(val, _values, result)
-     result = e(:boolean, true)
+     result = number(val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'code_section.y', 44)
+module_eval(<<'.,.,', 'code_section.y', 50)
   def _reduce_19(val, _values, result)
-     result = e(:boolean, false)
+     result = boolean(true)
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'code_section.y', 45)
+module_eval(<<'.,.,', 'code_section.y', 51)
   def _reduce_20(val, _values, result)
-     result = e(:cell_reference, val[0])
+     result = boolean(false)
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'code_section.y', 47)
+module_eval(<<'.,.,', 'code_section.y', 52)
   def _reduce_21(val, _values, result)
-     result = e(:function_call, :concat, [val[0], val[2]])
+     result = cell_reference(val[0])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'code_section.y', 48)
+module_eval(<<'.,.,', 'code_section.y', 54)
   def _reduce_22(val, _values, result)
-     result = e(:function_call, :multiply, [val[0], val[2]])
+     result = function_call(val[1], [val[0], val[2]], infix: true)
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'code_section.y', 49)
+module_eval(<<'.,.,', 'code_section.y', 56)
   def _reduce_23(val, _values, result)
-     result = e(:function_call, :add, [val[0], val[2]])
+     result = function_call(val[0], val[2])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'code_section.y', 50)
+module_eval(<<'.,.,', 'code_section.y', 57)
   def _reduce_24(val, _values, result)
-     result = e(:function_call, :minus, [val[0], val[2]])
+     result = function_call(val[0], [])
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'code_section.y', 51)
+module_eval(<<'.,.,', 'code_section.y', 59)
   def _reduce_25(val, _values, result)
-     result = e(:function_call, :divide, [val[0], val[2]])
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'code_section.y', 53)
-  def _reduce_26(val, _values, result)
-     result = e(:function_call, val[0], val[2])
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'code_section.y', 54)
-  def _reduce_27(val, _values, result)
-     result = e(:function_call, val[0], [])
-    result
-  end
-.,.,
-
-module_eval(<<'.,.,', 'code_section.y', 56)
-  def _reduce_28(val, _values, result)
      result = val[0] << val[2]
     result
   end
 .,.,
 
-module_eval(<<'.,.,', 'code_section.y', 57)
-  def _reduce_29(val, _values, result)
+module_eval(<<'.,.,', 'code_section.y', 60)
+  def _reduce_26(val, _values, result)
      result = [val[0]]
     result
   end

data/lib/csv_plus_plus/language/compiler.rb

@@ -1,12 +1,7 @@
 # frozen_string_literal: true
 
 require 'csv'
-# TODO: move some of these out to csv_plus_plus.rb
-require_relative '../cell'
-require_relative '../modifier'
-require_relative '../modifier.tab'
-require_relative '../row'
-require_relative '../template'
+
 require_relative 'benchmarked_compiler'
 require_relative 'code_section.tab'
 require_relative 'entities'
@@ -63,7 +58,7 @@ module CSVPlusPlus
         parse_code_section!
         rows = parse_csv_section!
 
-        ::CSVPlusPlus::Template.new(rows:).tap do |t|
+        ::CSVPlusPlus::Template.new(rows:, code_section: scope.code_section).tap do |t|
           t.validate_infinite_expands(@runtime)
           expanding { t.expand_rows! }
           resolve_all_cells!(t)
@@ -83,7 +78,7 @@ module CSVPlusPlus
       def parse_code_section!
         @runtime.start!
         parsing_code_section do |input|
-          code_section, csv_section = ::CSVPlusPlus::Language::CodeSectionParser.new.parse(input, self)
+          code_section, csv_section = ::CSVPlusPlus::Language::CodeSectionParser.new.parse(input, @runtime)
           # TODO: infer a type
           # allow user-supplied key/values to override anything global or from the code section
           code_section.def_variables(

data/lib/csv_plus_plus/language/entities/function_call.rb

@@ -4,16 +4,27 @@ module CSVPlusPlus
   module Language
     module Entities
       # A function call
+      #
+      # @attr_reader infix [boolean] Whether or not this function call is infix (X * Y, A + B, etc)
       class FunctionCall < EntityWithArguments
+        attr_reader :infix
+
         # @param id [String] The name of the function
         # @param arguments [Array<Entity>] The arguments to the function
-        def initialize(id, arguments)
+        # @param infix [boolean] Whether the function is infix
+        def initialize(id, arguments, infix: false)
           super(:function_call, id:, arguments:)
+
+          @infix = infix
         end
 
         # @return [String]
         def to_s
-          "#{@id.to_s.upcase}(#{arguments_to_s})"
+          if @infix
+            "(#{arguments.join(" #{@id} ")})"
+          else
+            "#{@id.to_s.upcase}(#{arguments_to_s})"
+          end
         end
 
         # @return [boolean]

data/lib/csv_plus_plus/language/scope.rb

@@ -91,6 +91,7 @@ module CSVPlusPlus
       end
 
       # Make a copy of the AST represented by +node+ and replace +fn_id+ with +replacement+ throughout
+      # rubocop:disable Metrics/MethodLength
       def function_replace(node, fn_id, replacement)
         if node.function_call? && node.id == fn_id
           call_function_or_runtime_value(replacement, node)
@@ -98,12 +99,14 @@ module CSVPlusPlus
           # not our function, but continue our depth first search on it
           ::CSVPlusPlus::Language::Entities::FunctionCall.new(
             node.id,
-            node.arguments.map { |n| function_replace(n, fn_id, replacement) }
+            node.arguments.map { |n| function_replace(n, fn_id, replacement) },
+            infix: node.infix
           )
         else
           node
         end
       end
+      # rubocop:enable Metrics/MethodLength
 
       def resolve_function(fn_id)
         id = fn_id.to_sym
@@ -133,7 +136,8 @@ module CSVPlusPlus
       def variable_replace(node, var_id, replacement)
         if node.function_call?
           arguments = node.arguments.map { |n| variable_replace(n, var_id, replacement) }
-          ::CSVPlusPlus::Language::Entities::FunctionCall.new(node.id, arguments)
+          # TODO: refactor these places where we copy functions... it's brittle with the kwargs
+          ::CSVPlusPlus::Language::Entities::FunctionCall.new(node.id, arguments, infix: node.infix)
         elsif node.variable? && node.id == var_id
           replacement
         else

data/lib/csv_plus_plus/lexer/lexer.rb

@@ -35,15 +35,16 @@ module CSVPlusPlus
       runtime.raise_syntax_error("Error parsing #{parse_subject}", e.message, wrapped_error: e)
     end
 
-    protected
-
-    # Given a +type+, instantiate the proper instance with the given +entity_args+
-    #
-    # @param type [Symbol]
-    # @param entity_args
-    def e(type, *entity_args)
-      ::CSVPlusPlus::Language::TYPES[type].new(*entity_args)
-    end
+    TOKEN_LIBRARY = {
+      TRUE: [/true/i, :TRUE],
+      FALSE: [/false/i, :FALSE],
+      NUMBER: [/-?[\d.]+/, :NUMBER],
+      STRING: [%r{"(?:[^"\\]|\\(?:["\\/bfnrt]|u[0-9a-fA-F]{4}))*"}, :STRING],
+      INFIX_OP: [%r{\^|\+|-|\*|/|&|<|>|<=|>=|<>}, :INFIX_OP],
+      VAR_REF: [/\$\$/, :VAR_REF],
+      ID: [/[$!\w:]+/, :ID]
+    }.freeze
+    public_constant :TOKEN_LIBRARY
 
     private
 

data/lib/csv_plus_plus/modifier.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require 'set'
-require_relative './color'
-require_relative './expand'
-require_relative './language/syntax_error'
-
 module CSVPlusPlus
   # A container representing the operations that can be applied to a cell or row
   #

data/lib/csv_plus_plus/options.rb

@@ -31,12 +31,14 @@ module CSVPlusPlus
     #
     # @param sheet_id [String] The identifier used by Google's API to reference the sheet.  You can find it in the URL
     #   for the sheet
+    #
     # @return [String]
     def google_sheet_id=(sheet_id)
       @google = ::CSVPlusPlus::GoogleOptions.new(sheet_id)
     end
 
     # Returns an error string or nil if there are no validation problems
+    #
     # @return [String, nil]
     def validate
       return if @google || @output_filename
@@ -45,6 +47,7 @@ module CSVPlusPlus
     end
 
     # Return a string with a verbose description of what we're doing with the options
+    #
     # @return [String]
     def verbose_summary
       <<~SUMMARY

data/lib/csv_plus_plus/template.rb

@@ -3,12 +3,15 @@
 module CSVPlusPlus
   # Contains the flow and data from a code section and CSV section
   #
+  # @attr_reader code_section [CodeSection] The +CodeSection+ containing the functions and variables defined herein
   # @attr_reader rows [Array<Row>] The +Row+s that comprise this +Template+
   class Template
-    attr_reader :rows
+    attr_reader :code_section, :rows
 
+    # @param code_section [CodeSection] The +CodeSection+ containing the functions and variables
     # @param rows [Array<Row>] The +Row+s that comprise this +Template+
-    def initialize(rows:)
+    def initialize(code_section:, rows:)
+      @code_section = code_section
       @rows = rows
     end
 
@@ -18,6 +21,7 @@ module CSVPlusPlus
     end
 
     # Apply any expand= modifiers to the parsed template
+    #
     # @return [Array<Row>]
     def expand_rows!
       expanded_rows = []
@@ -46,6 +50,18 @@ module CSVPlusPlus
       )
     end
 
+    # Provide a summary of the state of the template (and it's +@code_section+)
+    #
+    # @return [String]
+    def verbose_summary
+      # TODO: we can probably include way more stats in here
+      <<~SUMMARY
+        #{@code_section.verbose_summary}
+
+        > #{@rows.length} rows to be written
+      SUMMARY
+    end
+
     private
 
     def expand_rows(push_row_fn)

data/lib/csv_plus_plus/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module CSVPlusPlus
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
   public_constant :VERSION
 end

data/lib/csv_plus_plus.rb

@@ -5,13 +5,22 @@ require 'google/apis/sheets_v4'
 require 'googleauth'
 require 'rubyXL'
 require 'rubyXL/convenience_methods'
+require 'set'
 
+require_relative 'csv_plus_plus/cell'
 require_relative 'csv_plus_plus/cli'
+require_relative 'csv_plus_plus/code_section'
+require_relative 'csv_plus_plus/color'
 require_relative 'csv_plus_plus/error'
 require_relative 'csv_plus_plus/language/builtins'
 require_relative 'csv_plus_plus/language/compiler'
 require_relative 'csv_plus_plus/language/runtime'
+require_relative 'csv_plus_plus/language/syntax_error'
+require_relative 'csv_plus_plus/modifier'
+require_relative 'csv_plus_plus/modifier.tab'
 require_relative 'csv_plus_plus/options'
+require_relative 'csv_plus_plus/row'
+require_relative 'csv_plus_plus/template'
 require_relative 'csv_plus_plus/writer'
 
 # A programming language for writing rich CSV files
@@ -21,23 +30,30 @@ module CSVPlusPlus
   # @param input [String] The csvpp input to compile
   # @param filename [String, nil] The filename the input was read from.  +nil+ if it is read from stdin.
   # @param options [Options] The various options to compile with
-  #
-  # rubocop:disable Metrics/MethodLength
   def self.apply_template_to_sheet!(input, filename, options)
     warn(options.verbose_summary) if options.verbose
 
-    ::CSVPlusPlus::Language::Compiler.with_compiler(
-      options:,
-      runtime: ::CSVPlusPlus::Language::Runtime.new(input:, filename:)
-    ) do |c|
-      template = c.compile_template
-
-      output = ::CSVPlusPlus::Writer.writer(options)
-      c.outputting! do
-        output.write_backup if options.backup
-        output.write(template)
-      end
+    runtime = ::CSVPlusPlus::Language::Runtime.new(input:, filename:)
+
+    ::CSVPlusPlus::Language::Compiler.with_compiler(options:, runtime:) do |compiler|
+      template = compiler.compile_template
+
+      warn(template.verbose_summary) if options.verbose
+
+      write_template(template, compiler, options)
+    end
+  end
+
+  # Write the results (and possibly make a backup) of a compiled +template+
+  #
+  # @param template [Template] The compiled template
+  # @param compiler [Compiler] The compiler currently in use
+  # @param options [Options] The options we're running with
+  def self.write_template(template, compiler, options)
+    output = ::CSVPlusPlus::Writer.writer(options)
+    compiler.outputting! do
+      output.write_backup if options.backup
+      output.write(template)
     end
   end
-  # rubocop:enable Metrics/MethodLength
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv_plus_plus
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Patrick Carroll
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-10 00:00:00.000000000 Z
+date: 2023-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-apis-drive_v3