csv_plus_plus 0.1.3 → 0.2.1

data/lib/csv_plus_plus/writer.rb

@@ -1,11 +1,15 @@
 # typed: strict
 # frozen_string_literal: true
 
-require_relative './writer/base_writer'
+require_relative './writer/merger'
+require_relative './writer/writer'
+
 require_relative './writer/csv'
 require_relative './writer/excel'
 require_relative './writer/google_sheets'
+require_relative './writer/google_sheets_builder'
 require_relative './writer/open_document'
+require_relative './writer/rubyxl_builder'
 
 module CSVPlusPlus
   # Various strategies for writing to various formats (excel, google sheets, CSV & OpenDocument (not yet implemented))
@@ -14,8 +18,8 @@ module CSVPlusPlus
 
     sig do
       params(
-        options: ::CSVPlusPlus::Options,
-        runtime: ::CSVPlusPlus::Runtime::Runtime
+        options: ::CSVPlusPlus::Options::Options,
+        position: ::CSVPlusPlus::Runtime::Position
       ).returns(
         ::T.any(
           ::CSVPlusPlus::Writer::CSV,
@@ -28,27 +32,62 @@ module CSVPlusPlus
     # Return an instance of a writer depending on the given +options+
     #
     # @param options [Options] The supplied options.
-    # @param runtime [Runtime] The current runtime.
+    # @param position [Position] The current position.
     #
     # @return [Writer::CSV | Writer::Excel | Writer::GoogleSheets | Writer::OpenDocument]
-    # rubocop:disable Metrics/MethodLength
-    def self.writer(options, runtime)
+    def self.writer(options, position)
       output_format = options.output_format
       case output_format
-      when ::CSVPlusPlus::Options::OutputFormat::CSV then ::CSVPlusPlus::Writer::CSV.new(options, runtime)
-      when ::CSVPlusPlus::Options::OutputFormat::Excel then ::CSVPlusPlus::Writer::Excel.new(options, runtime)
-      when ::CSVPlusPlus::Options::OutputFormat::GoogleSheets then ::CSVPlusPlus::Writer::GoogleSheets.new(
-        options,
-        runtime
-      )
-      when ::CSVPlusPlus::Options::OutputFormat::OpenDocument then ::CSVPlusPlus::Writer::OpenDocument.new(
-        options,
-        runtime
-      )
-      else
-        ::T.absurd(output_format)
+      when ::CSVPlusPlus::Options::OutputFormat::CSV then csv(options, position)
+      when ::CSVPlusPlus::Options::OutputFormat::Excel then excel(options, position)
+      when ::CSVPlusPlus::Options::OutputFormat::GoogleSheets then google_sheets(options, position)
+      when ::CSVPlusPlus::Options::OutputFormat::OpenDocument then open_document(options, position)
+      else ::T.absurd(output_format)
       end
     end
-    # rubocop:enable Metrics/MethodLength
+
+    sig do
+      params(
+        options: ::CSVPlusPlus::Options::Options,
+        position: ::CSVPlusPlus::Runtime::Position
+      ).returns(::CSVPlusPlus::Writer::CSV)
+    end
+    # Instantiate a +CSV+ writer
+    def self.csv(options, position)
+      ::CSVPlusPlus::Writer::CSV.new(::T.cast(options, ::CSVPlusPlus::Options::FileOptions), position)
+    end
+
+    sig do
+      params(
+        options: ::CSVPlusPlus::Options::Options,
+        position: ::CSVPlusPlus::Runtime::Position
+      ).returns(::CSVPlusPlus::Writer::Excel)
+    end
+    # Instantiate a +Excel+ writer
+    def self.excel(options, position)
+      ::CSVPlusPlus::Writer::Excel.new(::T.cast(options, ::CSVPlusPlus::Options::FileOptions), position)
+    end
+
+    sig do
+      params(
+        options: ::CSVPlusPlus::Options::Options,
+        position: ::CSVPlusPlus::Runtime::Position
+      ).returns(::CSVPlusPlus::Writer::GoogleSheets)
+    end
+    # Instantiate a +GoogleSheets+ writer
+    def self.google_sheets(options, position)
+      ::CSVPlusPlus::Writer::GoogleSheets.new(::T.cast(options, ::CSVPlusPlus::Options::GoogleSheetsOptions), position)
+    end
+
+    sig do
+      params(
+        options: ::CSVPlusPlus::Options::Options,
+        position: ::CSVPlusPlus::Runtime::Position
+      ).returns(::CSVPlusPlus::Writer::OpenDocument)
+    end
+    # Instantiate an +OpenDocument+ writer
+    def self.open_document(options, position)
+      ::CSVPlusPlus::Writer::OpenDocument.new(::T.cast(options, ::CSVPlusPlus::Options::FileOptions), position)
+    end
   end
 end

data/lib/csv_plus_plus.rb

@@ -14,18 +14,24 @@ require 'pathname'
 require 'rubyXL'
 require 'rubyXL/convenience_methods'
 require 'set'
+require 'strscan'
 require 'tempfile'
 
+require_relative 'csv_plus_plus/a1_reference'
+require_relative 'csv_plus_plus/google_api_client'
+require_relative 'csv_plus_plus/options'
+require_relative 'csv_plus_plus/runtime/position'
 require_relative 'csv_plus_plus/source_code'
 
-require_relative 'csv_plus_plus/runtime'
-
 require_relative 'csv_plus_plus/cli_flag'
 require_relative 'csv_plus_plus/entities'
 require_relative 'csv_plus_plus/error'
+require_relative 'csv_plus_plus/error_formatter'
 
-require_relative 'csv_plus_plus/cell'
 require_relative 'csv_plus_plus/cli'
+require_relative 'csv_plus_plus/runtime'
+
+require_relative 'csv_plus_plus/cell'
 require_relative 'csv_plus_plus/color'
 require_relative 'csv_plus_plus/modifier'
 
@@ -35,9 +41,8 @@ require_relative 'csv_plus_plus/parser/modifier.tab'
 
 require_relative 'csv_plus_plus/compiler'
 
-require_relative 'csv_plus_plus/google_options'
 require_relative 'csv_plus_plus/lexer'
-require_relative 'csv_plus_plus/options'
+require_relative 'csv_plus_plus/reader'
 require_relative 'csv_plus_plus/row'
 require_relative 'csv_plus_plus/template'
 require_relative 'csv_plus_plus/writer'
@@ -48,16 +53,15 @@ require_relative 'csv_plus_plus/benchmarked_compiler'
 module CSVPlusPlus
   extend ::T::Sig
 
-  sig { params(input: ::String, filename: ::T.nilable(::String), options: ::CSVPlusPlus::Options).void }
+  sig { params(source_code: ::CSVPlusPlus::SourceCode, options: ::CSVPlusPlus::Options::Options).void }
   # Parse the input into a +Template+ and write it to the desired format
   #
-  # @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 source_code [SourceCode] The source code being compiled
   # @param options [Options] The various options to compile with
-  def self.apply_template_to_sheet!(input, filename, options)
-    warn(options.verbose_summary) if options.verbose
+  def self.cli_compile(source_code, options)
+    runtime = ::CSVPlusPlus::Runtime.new(source_code:)
 
-    runtime = ::CSVPlusPlus::Runtime.new(source_code: ::CSVPlusPlus::SourceCode.new(input:, filename:))
+    warn(options.verbose_summary) if options.verbose
 
     ::CSVPlusPlus::Compiler.with_compiler(options:, runtime:) do |compiler|
       template = compiler.compile_template
@@ -65,10 +69,18 @@ module CSVPlusPlus
 
       write_template(template:, compiler:, options:)
     end
+  rescue ::StandardError => e
+    ::CSVPlusPlus::ErrorFormatter.new(runtime: ::T.must(runtime), options:).handle_error(e)
+    # the caller will exit(1)
+    raise(e)
   end
 
   sig do
-    params(compiler: ::CSVPlusPlus::Compiler, options: ::CSVPlusPlus::Options, template: ::CSVPlusPlus::Template).void
+    params(
+      compiler: ::CSVPlusPlus::Compiler,
+      options: ::CSVPlusPlus::Options::Options,
+      template: ::CSVPlusPlus::Template
+    ).void
   end
   # Write the results (and possibly make a backup) of a compiled +template+
   #
@@ -76,8 +88,8 @@ module CSVPlusPlus
   # @param options [Options] The options we're running with
   # @param template [Template] The compiled template
   def self.write_template(compiler:, options:, template:)
-    compiler.outputting! do |runtime|
-      output = ::CSVPlusPlus::Writer.writer(options, runtime)
+    compiler.outputting! do |position|
+      output = ::CSVPlusPlus::Writer.writer(options, position)
       output.write_backup if options.backup
       output.write(template)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: csv_plus_plus
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.1
 platform: ruby
 authors:
 - Patrick Carroll
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-11 00:00:00.000000000 Z
+date: 2023-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-apis-drive_v3
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.4'
+- !ruby/object:Gem::Dependency
+  name: sorbet-runtime
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -123,6 +137,7 @@ files:
 - bin/csvpp
 - docs/CHANGELOG.md
 - lib/csv_plus_plus.rb
+- lib/csv_plus_plus/a1_reference.rb
 - lib/csv_plus_plus/benchmarked_compiler.rb
 - lib/csv_plus_plus/cell.rb
 - lib/csv_plus_plus/cli.rb
@@ -133,27 +148,29 @@ files:
 - lib/csv_plus_plus/entities/ast_builder.rb
 - lib/csv_plus_plus/entities/boolean.rb
 - lib/csv_plus_plus/entities/builtins.rb
-- lib/csv_plus_plus/entities/cell_reference.rb
 - lib/csv_plus_plus/entities/date.rb
 - lib/csv_plus_plus/entities/entity.rb
 - lib/csv_plus_plus/entities/entity_with_arguments.rb
 - lib/csv_plus_plus/entities/function.rb
 - lib/csv_plus_plus/entities/function_call.rb
+- lib/csv_plus_plus/entities/has_identifier.rb
 - lib/csv_plus_plus/entities/number.rb
+- lib/csv_plus_plus/entities/reference.rb
 - lib/csv_plus_plus/entities/runtime_value.rb
 - lib/csv_plus_plus/entities/string.rb
-- lib/csv_plus_plus/entities/variable.rb
 - lib/csv_plus_plus/error.rb
+- lib/csv_plus_plus/error/cli_error.rb
+- lib/csv_plus_plus/error/compiler_error.rb
 - lib/csv_plus_plus/error/error.rb
 - lib/csv_plus_plus/error/formula_syntax_error.rb
 - lib/csv_plus_plus/error/modifier_syntax_error.rb
 - lib/csv_plus_plus/error/modifier_validation_error.rb
-- lib/csv_plus_plus/error/syntax_error.rb
+- lib/csv_plus_plus/error/positional_error.rb
 - lib/csv_plus_plus/error/writer_error.rb
+- lib/csv_plus_plus/error_formatter.rb
 - lib/csv_plus_plus/google_api_client.rb
-- lib/csv_plus_plus/google_options.rb
 - lib/csv_plus_plus/lexer.rb
-- lib/csv_plus_plus/lexer/lexer.rb
+- lib/csv_plus_plus/lexer/racc_lexer.rb
 - lib/csv_plus_plus/lexer/tokenizer.rb
 - lib/csv_plus_plus/modifier.rb
 - lib/csv_plus_plus/modifier/conditional_formatting.rb
@@ -164,39 +181,47 @@ files:
 - lib/csv_plus_plus/modifier/modifier_validator.rb
 - lib/csv_plus_plus/modifier/rubyxl_modifier.rb
 - lib/csv_plus_plus/options.rb
+- lib/csv_plus_plus/options/file_options.rb
+- lib/csv_plus_plus/options/google_sheets_options.rb
+- lib/csv_plus_plus/options/options.rb
 - lib/csv_plus_plus/parser/cell_value.tab.rb
 - lib/csv_plus_plus/parser/code_section.tab.rb
 - lib/csv_plus_plus/parser/modifier.tab.rb
+- lib/csv_plus_plus/reader.rb
+- lib/csv_plus_plus/reader/csv.rb
+- lib/csv_plus_plus/reader/google_sheets.rb
+- lib/csv_plus_plus/reader/reader.rb
+- lib/csv_plus_plus/reader/rubyxl.rb
 - lib/csv_plus_plus/row.rb
 - lib/csv_plus_plus/runtime.rb
-- lib/csv_plus_plus/runtime/can_define_references.rb
-- lib/csv_plus_plus/runtime/can_resolve_references.rb
 - lib/csv_plus_plus/runtime/graph.rb
-- lib/csv_plus_plus/runtime/position_tracker.rb
+- lib/csv_plus_plus/runtime/position.rb
 - lib/csv_plus_plus/runtime/references.rb
 - lib/csv_plus_plus/runtime/runtime.rb
+- lib/csv_plus_plus/runtime/scope.rb
 - lib/csv_plus_plus/source_code.rb
 - lib/csv_plus_plus/template.rb
 - lib/csv_plus_plus/version.rb
 - lib/csv_plus_plus/writer.rb
-- lib/csv_plus_plus/writer/base_writer.rb
 - lib/csv_plus_plus/writer/csv.rb
 - lib/csv_plus_plus/writer/excel.rb
 - lib/csv_plus_plus/writer/file_backer_upper.rb
-- lib/csv_plus_plus/writer/google_sheet_builder.rb
 - lib/csv_plus_plus/writer/google_sheets.rb
+- lib/csv_plus_plus/writer/google_sheets_builder.rb
+- lib/csv_plus_plus/writer/merger.rb
 - lib/csv_plus_plus/writer/open_document.rb
 - lib/csv_plus_plus/writer/rubyxl_builder.rb
-homepage: https://github.com/patrickomatic/csv-plus-plus
+- lib/csv_plus_plus/writer/writer.rb
+homepage: https://github.com/patrickomatic/csv-plus-plus-ruby
 licenses:
 - MIT
 metadata:
-  bug_tracker_uri: https://github.com/patrickomatic/csv-plus-plus/issues
+  bug_tracker_uri: https://github.com/patrickomatic/csv-plus-plus-ruby/issues
   documentation_uri: https://www.rubydoc.info/gems/csv_plus_plus/
-  github_repo: git://github.com/patrickomatic/csv-plus-plus
-  homepage_uri: https://github.com/patrickomatic/csv-plus-plus
-  source_code_uri: https://github.com/patrickomatic/csv-plus-plus
-  changelog_uri: https://github.com/patrickomatic/csv-plus-plus/blob/main/docs/CHANGELOG.md
+  github_repo: git://github.com/patrickomatic/csv-plus-plus-ruby
+  homepage_uri: https://github.com/patrickomatic/csv-plus-plus-ruby
+  source_code_uri: https://github.com/patrickomatic/csv-plus-plus-ruby
+  changelog_uri: https://github.com/patrickomatic/csv-plus-plus-ruby/blob/main/docs/CHANGELOG.md
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []

data/lib/csv_plus_plus/entities/cell_reference.rb

@@ -1,231 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-module CSVPlusPlus
-  module Entities
-    # A reference to a cell. Internally it is represented by a simple +cell_index+ and +row_index+ but there are
-    # functions for converting to and from A1-style formats.  Supported formats are:
-    #
-    # * `1` - A reference to the entire first row
-    # * `A` - A reference to the entire first column
-    # * `A1` - A reference to the first cell (top left)
-    # * `A1:D10` - The range defined between A1 and D10
-    # * `Sheet1!B2` - Cell B2 on the sheet "Sheet1"
-    #
-    # @attr sheet_name [String, nil] The name of the sheet reference
-    # @attr_reader cell_index [Integer, nil] The cell index of the cell being referenced
-    # @attr_reader row_index [Integer, nil] The row index of the cell being referenced
-    # @attr_reader scoped_to_expand [Expand, nil] If set, the expand in which this variable is scoped to. It cannot be
-    #   resolved outside of the given expand.
-    # @attr_reader upper_cell_index [Integer, nil] If set, the cell reference is a range and this is the upper cell
-    #   index of it
-    # @attr_reader upper_row_index [Integer, nil] If set, the cell reference is a range and this is the upper row index
-    #   of it
-    # rubocop:disable Metrics/ClassLength
-    class CellReference < Entity
-      extend ::T::Sig
-
-      sig { returns(::T.nilable(::String)) }
-      attr_accessor :sheet_name
-
-      sig { returns(::T.nilable(::Integer)) }
-      attr_reader :cell_index
-
-      sig { returns(::T.nilable(::Integer)) }
-      attr_reader :row_index
-
-      sig { returns(::T.nilable(::CSVPlusPlus::Modifier::Expand)) }
-      attr_reader :scoped_to_expand
-
-      sig { returns(::T.nilable(::Integer)) }
-      attr_reader :upper_cell_index
-
-      sig { returns(::T.nilable(::Integer)) }
-      attr_reader :upper_row_index
-
-      # TODO: this is getting gross, maybe define an actual parser
-      A1_NOTATION_REGEXP = /
-        ^
-          (?:
-            (?:
-              (?:'([^'\\]|\\.)*') # allow for a single-quoted sheet name
-              |
-              (\w+)               # or if it's not quoted, just allow \w+
-            )
-            !                     # if a sheet name is specified, it's always followed by a !
-          )?
-          ([a-zA-Z0-9]+)          # the only part required - something alphanumeric
-          (?: :([a-zA-Z0-9]+))?   # and they might make it a range
-        $
-      /x
-      public_constant :A1_NOTATION_REGEXP
-
-      ALPHA = ::T.let(('A'..'Z').to_a.freeze, ::T::Array[::String])
-      private_constant :ALPHA
-
-      sig { params(cell_reference_string: ::String).returns(::T::Boolean) }
-      # Does the given +cell_reference_string+ conform to a valid cell reference?
-      #
-      # {https://developers.google.com/sheets/api/guides/concepts}
-      #
-      # @param cell_reference_string [::String] The string to check if it is a valid cell reference (we assume it's in
-      #   A1 notation but maybe can support R1C1)
-      #
-      # @return [::T::Boolean]
-      def self.valid_cell_reference?(cell_reference_string)
-        !(cell_reference_string =~ ::CSVPlusPlus::Entities::CellReference::A1_NOTATION_REGEXP).nil?
-      end
-
-      sig do
-        params(
-          cell_index: ::T.nilable(::Integer),
-          ref: ::T.nilable(::String),
-          row_index: ::T.nilable(::Integer),
-          scoped_to_expand: ::T.nilable(::CSVPlusPlus::Modifier::Expand)
-        ).void
-      end
-      # Either +ref+, +cell_index+ or +row_index+ must be specified.
-      #
-      # @param cell_index [Integer, nil] The index of the cell being referenced.
-      # @param ref [Integer, nil] An A1-style cell reference (that will be parsed into it's row/cell indexes).
-      # @param row_index [Integer, nil] The index of the row being referenced.
-      # @param scoped_to_expand [Expand] The [[expand]] that this cell reference will be scoped to. In other words, it
-      #   will only be able to be resolved if the runtime is within the bounds of the expand (it can't be referenced
-      #   outside of the expand.)
-      # rubocop:disable Metrics/MethodLength
-      def initialize(cell_index: nil, ref: nil, row_index: nil, scoped_to_expand: nil)
-        raise(::ArgumentError, 'Must specify :ref, :cell_index or :row_index') unless ref || cell_index || row_index
-
-        super(::CSVPlusPlus::Entities::Type::CellReference)
-
-        if ref
-          from_a1_ref!(ref)
-        else
-          @cell_index = ::T.let(cell_index, ::T.nilable(::Integer))
-          @row_index = ::T.let(row_index, ::T.nilable(::Integer))
-
-          @upper_cell_index = ::T.let(nil, ::T.nilable(::Integer))
-          @upper_row_index = ::T.let(nil, ::T.nilable(::Integer))
-        end
-
-        @scoped_to_expand = scoped_to_expand
-      end
-      # rubocop:enable Metrics/MethodLength
-
-      sig { override.params(other: ::CSVPlusPlus::Entities::Entity).returns(::T::Boolean) }
-      # @param other [Entity]
-      #
-      # @return [boolean]
-      # rubocop:disable Metrics/CyclomaticComplexity
-      def ==(other)
-        return false unless super
-
-        other.is_a?(self.class) && @cell_index == other.cell_index && @row_index == other.row_index \
-          && @sheet_name == other.sheet_name && @scoped_to_expand == other.scoped_to_expand \
-          && @upper_cell_index == other.upper_cell_index && @upper_row_index == other.upper_row_index
-      end
-      # rubocop:enable Metrics/CyclomaticComplexity
-
-      sig { override.params(runtime: ::CSVPlusPlus::Runtime::Runtime).returns(::String) }
-      # Get the A1-style cell reference
-      #
-      # @param runtime [Runtime] The current runtime
-      #
-      # @return [::String] An A1-style reference
-      def evaluate(runtime)
-        # unless in_scope?(runtime)
-        #   runtime.raise_modifier_syntax_error(message: 'Reference is out of scope', bad_input: runtime.cell.value)
-        # end
-
-        to_a1_ref(runtime) || ''
-      end
-
-      sig { returns(::T::Boolean) }
-      # Is the cell_reference a range? - something like A1:D10
-      #
-      # @return [boolean]
-      def range?
-        !upper_row_index.nil? || !upper_cell_index.nil?
-      end
-
-      private
-
-      sig { params(runtime: ::CSVPlusPlus::Runtime::Runtime).returns(::T.nilable(::String)) }
-      # Turns index-based/X,Y coordinates into a A1 format
-      #
-      # @param runtime [Runtime]
-      #
-      # @return [::String, nil]
-      def to_a1_ref(runtime)
-        row_index = runtime_row_index(runtime)
-        return unless row_index || @cell_index
-
-        rowref = row_index ? (row_index + 1).to_s : ''
-        cellref = @cell_index ? to_a1_cell_ref : ''
-        [cellref, rowref].join
-      end
-
-      sig { params(runtime: ::CSVPlusPlus::Runtime::Runtime).returns(::T.nilable(::Integer)) }
-      def runtime_row_index(runtime)
-        @scoped_to_expand ? runtime.row_index : @row_index
-      end
-
-      sig { returns(::String) }
-      # Turns a cell index into an A1 reference (just the "A" part - for example 0 == 'A', 1 == 'B', 2 == 'C', etc.)
-      #
-      # @return [::String]
-      def to_a1_cell_ref
-        c = @cell_index.dup
-        ref = ''
-
-        while c >= 0
-          # rubocop:disable Lint/ConstantResolution
-          ref += ::T.must(ALPHA[c % 26])
-          # rubocop:enable Lint/ConstantResolution
-          c = (c / 26).floor - 1
-        end
-
-        ref.reverse
-      end
-
-      sig { params(ref: ::String).void }
-      def from_a1_ref!(ref)
-        quoted_sheet_name, unquoted_sheet_name, lower_range, upper_range = ::T.must(
-          ref.strip.match(
-            ::CSVPlusPlus::Entities::CellReference::A1_NOTATION_REGEXP
-          )
-        ).captures
-
-        @sheet_name = quoted_sheet_name || unquoted_sheet_name
-
-        parse_lower_range!(lower_range) if lower_range
-        parse_upper_range!(upper_range) if upper_range
-      end
-
-      sig { params(lower_range: ::String).void }
-      def parse_lower_range!(lower_range)
-        cell_ref, row_ref = ::T.must(lower_range.match(/^([a-zA-Z]+)?(\d+)?$/)).captures
-        @cell_index = from_a1_cell_ref!(cell_ref) if cell_ref
-        @row_index = Integer(row_ref, 10) - 1 if row_ref
-      end
-
-      sig { params(upper_range: ::String).void }
-      # TODO: make this less redundant with the above function
-      def parse_upper_range!(upper_range)
-        cell_ref, row_ref = ::T.must(upper_range.match(/^([a-zA-Z]+)?(\d+)?$/)).captures
-        @upper_cell_index = from_a1_cell_ref!(cell_ref) if cell_ref
-        @upper_row_index = Integer(row_ref, 10) - 1 if row_ref
-      end
-
-      sig { params(cell_ref: ::String).returns(::Integer) }
-      def from_a1_cell_ref!(cell_ref)
-        (cell_ref.upcase.chars.reduce(0) do |cell_index, letter|
-          # rubocop:disable Lint/ConstantResolution
-          (cell_index * 26) + ::T.must(ALPHA.find_index(letter)) + 1
-          # rubocop:enable Lint/ConstantResolution
-        end) - 1
-      end
-    end
-    # rubocop:enable Metrics/ClassLength
-  end
-end

data/lib/csv_plus_plus/entities/variable.rb

@@ -1,37 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-module CSVPlusPlus
-  module Entities
-    # TODO: get rid of this I think - everything will just be References
-    #
-    # A reference to a variable
-    class Variable < Entity
-      extend ::T::Sig
-
-      sig { params(id: ::Symbol).void }
-      # @param id [Symbol] The identifier of the variable
-      def initialize(id)
-        super(::CSVPlusPlus::Entities::Type::Variable, id:)
-      end
-
-      sig { override.params(_runtime: ::CSVPlusPlus::Runtime::Runtime).returns(::String) }
-      # @param _runtime [Runtime]
-      #
-      # @return [::String]
-      def evaluate(_runtime)
-        "$$#{@id}"
-      end
-
-      sig { override.params(other: ::CSVPlusPlus::Entities::Entity).returns(::T::Boolean) }
-      # @param other [Entity]
-      #
-      # @return [boolean]
-      def ==(other)
-        return false unless super
-
-        other.is_a?(self.class) && @id == other.id
-      end
-    end
-  end
-end

data/lib/csv_plus_plus/error/syntax_error.rb

@@ -1,71 +0,0 @@
-# typed: strict
-# frozen_string_literal: true
-
-module CSVPlusPlus
-  module Error
-    # An error that can be thrown for various syntax errors
-    class SyntaxError < ::CSVPlusPlus::Error::Error
-      extend ::T::Sig
-
-      sig { params(runtime: ::CSVPlusPlus::Runtime::Runtime, wrapped_error: ::T.nilable(::StandardError)).void }
-      # @param runtime [Runtime] The current runtime
-      # @param wrapped_error [StandardError] The underlying error that caused the syntax error.  For example a
-      #   Racc::ParseError that was thrown
-      def initialize(runtime, wrapped_error: nil)
-        @runtime = runtime
-        @wrapped_error = wrapped_error
-
-        super()
-      end
-
-      sig { returns(::String) }
-      # @return [::String]
-      def to_s
-        to_trace
-      end
-
-      # TODO: clean up all these different string-formatting error classes
-      sig { override.returns(::String) }
-      # @return [::String]
-      def error_message
-        ''
-      end
-
-      sig { returns(::String) }
-      # Output a verbose user-helpful string that references the current runtime
-      def to_verbose_trace
-        warn(@wrapped_error.full_message) if @wrapped_error
-        warn((@wrapped_error.backtrace || []).join("\n")) if @wrapped_error&.backtrace
-        to_trace
-      end
-
-      sig { returns(::String) }
-      # Output a user-helpful string that references the runtime state
-      #
-      # @return [String]
-      def to_trace
-        "#{message_prefix}#{cell_index} #{error_message}"
-      end
-
-      private
-
-      sig { returns(::String) }
-      def cell_index
-        if @runtime.parsing_csv_section?
-          "[#{@runtime.row_index},#{@runtime.cell_index}]"
-        else
-          ''
-        end
-      end
-
-      sig { returns(::String) }
-      def message_prefix
-        line_number = @runtime.line_number
-        filename = @runtime.source_code.filename
-
-        line_str = ":#{line_number}"
-        "#{filename}#{line_str}"
-      end
-    end
-  end
-end