unparser 0.5.5 → 0.6.1

data/lib/unparser/writer/binary.rb

@@ -3,7 +3,7 @@
 module Unparser
   module Writer
     class Binary
-      include Writer, Adamantium::Flat
+      include Writer, Adamantium
 
       children :left, :right
 

data/lib/unparser/writer/dynamic_string.rb

@@ -3,22 +3,20 @@
 module Unparser
   module Writer
     class DynamicString
-      include Writer, Adamantium::Flat
+      include Writer, Adamantium
 
-      PATTERNS_2 = IceNine.deep_freeze(
+      PATTERNS_2 =
         [
-          %i[str_empty begin],
-          %i[begin str_nl]
-        ]
-      )
+          %i[str_empty begin].freeze,
+          %i[begin str_nl].freeze
+        ].freeze
 
-      PATTERNS_3 = IceNine.deep_freeze(
+      PATTERNS_3 =
         [
-          %i[begin str_nl_eol str_nl_eol],
-          %i[str_nl_eol begin str_nl_eol],
-          %i[str_ws begin str_nl_eol]
-        ]
-      )
+          %i[begin str_nl_eol str_nl_eol].freeze,
+          %i[str_nl_eol begin str_nl_eol].freeze,
+          %i[str_ws begin str_nl_eol].freeze
+        ].freeze
 
       FLAT_INTERPOLATION = %i[ivar cvar gvar nth_ref].to_set.freeze
 
@@ -42,7 +40,7 @@ module Unparser
     private
 
       def heredoc_header
-        need_squiggly? ? '<<~HEREDOC' : '<<-HEREDOC'
+        '<<-HEREDOC'
       end
 
       def heredoc?
@@ -55,11 +53,7 @@ module Unparser
 
       def emit_heredoc_body
         nl
-        if need_squiggly?
-          emit_squiggly_heredoc_body
-        else
-          emit_normal_heredoc_body
-        end
+        emit_normal_heredoc_body
       end
 
       def emit_heredoc_footer
@@ -119,10 +113,6 @@ module Unparser
         n_str?(last) && last.children.first[-1].eql?("\n")
       end
 
-      def need_squiggly?
-        children.any?(s(:str, ''))
-      end
-
       def emit_squiggly_heredoc_body
         buffer.indent
         children.each do |child|

data/lib/unparser/writer/rescue.rb

@@ -3,7 +3,7 @@
 module Unparser
   module Writer
     class Rescue
-      include Writer, Adamantium::Flat
+      include Writer, Adamantium
 
       children :body, :rescue_body
 

data/lib/unparser/writer/send/unary.rb

@@ -17,7 +17,7 @@ module Unparser
 
           write(MAP.fetch(name, name).to_s)
 
-          if n_int?(receiver) && selector.equal?(:'+@')
+          if n_int?(receiver) && selector.equal?(:+@)
             write('+')
           end
 

data/lib/unparser/writer/send.rb

@@ -4,10 +4,10 @@ module Unparser
   module Writer
     # Writer for send
     class Send
-      include Writer, Adamantium::Flat, Constants, Generation
+      include Writer, Adamantium, Constants, Generation
 
-      INDEX_ASSIGN    = :'[]='
-      INDEX_REFERENCE = :'[]'
+      INDEX_ASSIGN    = :[]=
+      INDEX_REFERENCE = :[]
 
       OPERATORS = {
         csend: '&.',
@@ -75,20 +75,7 @@ module Unparser
       end
 
       def emit_normal_arguments
-        parentheses do
-          arguments.each_with_index do |node, index|
-            write(', ') unless index.zero?
-            emit_argument(node, index.succ.equal?(arguments.length))
-          end
-        end
-      end
-
-      def emit_argument(argument, last)
-        if n_hash?(argument) && last
-          writer_with(Emitter::Hash, argument).emit_last_argument_hash
-        else
-          visit(argument)
-        end
+        parentheses { delimited(arguments) }
       end
 
       def emit_heredoc_reminder(argument)
@@ -104,7 +91,11 @@ module Unparser
       end
 
       def parses_as_constant?
-        n_const?(Unparser.parse(selector.to_s))
+        test = Unparser.parse_either(selector.to_s).from_right do
+          fail InvalidNodeError.new("Invalid selector for send node: #{selector.inspect}", node)
+        end
+
+        n_const?(test)
       end
 
       def details

data/lib/unparser.rb

@@ -1,16 +1,22 @@
 # frozen_string_literal: true
 
-require 'abstract_type'
-require 'anima'
-require 'concord'
 require 'diff/lcs'
 require 'diff/lcs/hunk'
-require 'mprelude'
 require 'optparse'
 require 'parser/current'
-require 'procto'
 require 'set'
 
+require 'unparser/equalizer'
+require 'unparser/adamantium'
+require 'unparser/adamantium/method_builder'
+require 'unparser/abstract_type'
+
+require 'unparser/concord'
+require 'unparser/either'
+require 'unparser/anima'
+require 'unparser/anima/attribute'
+require 'unparser/anima/error'
+
 # Library namespace
 module Unparser
   # Unparser specific AST builder defaulting to modern AST format
@@ -27,7 +33,18 @@ module Unparser
   EMPTY_STRING = ''.freeze
   EMPTY_ARRAY  = [].freeze
 
-  private_constant(*constants(false))
+  private_constant(*constants(false) - %i[Adamantium AbstractType Anima Concord Either Equalizer Memoizable])
+
+  # Error raised when unparser encounters an invalid AST
+  class InvalidNodeError < RuntimeError
+    attr_reader :node
+
+    def initialize(message, node)
+      super(message)
+      @node = node
+      freeze
+    end
+  end
 
   # Unparse an AST (and, optionally, comments) into a string
   #
@@ -36,8 +53,10 @@ module Unparser
   #
   # @return [String]
   #
-  # @api private
+  # @raise InvalidNodeError
+  #   if the node passed is invalid
   #
+  # @api public
   def self.unparse(node, comment_array = [])
     return '' if node.nil?
 
@@ -61,9 +80,9 @@ module Unparser
     validation = Validation.from_string(generated)
 
     if validation.success?
-      MPrelude::Either::Right.new(generated)
+      Either::Right.new(generated)
     else
-      MPrelude::Either::Left.new(validation)
+      Either::Left.new(validation)
     end
   end
 
@@ -75,8 +94,7 @@ module Unparser
   #
   # @return [Either<Exception, String>]
   def self.unparse_either(node)
-    MPrelude::Either
-      .wrap_error(Exception) { unparse(node) }
+    Either.wrap_error(Exception) { unparse(node) }
   end
 
   # Parse string into AST
@@ -92,9 +110,9 @@ module Unparser
   #
   # @param [String] source
   #
-  # @return [MPrelude::Either<Parser::SyntaxError, (Parser::ASTNode, nil)>]
+  # @return [Either<Parser::SyntaxError, (Parser::ASTNode, nil)>]
   def self.parse_either(source)
-    MPrelude::Either.wrap_error(Parser::SyntaxError) do
+    Either.wrap_error(Parser::SyntaxError) do
       parser.parse(buffer(source))
     end
   end
@@ -117,21 +135,10 @@ module Unparser
     Parser::CurrentRuby.new(Builder.new).tap do |parser|
       parser.diagnostics.tap do |diagnostics|
         diagnostics.all_errors_are_fatal = true
-        diagnostics.consumer             = method(:consume_diagnostic)
       end
     end
   end
 
-  # Consume diagnostic
-  #
-  # @param [Parser::Diagnostic] diagnostic
-  #
-  # @return [undefined]
-  def self.consume_diagnostic(diagnostic)
-    Kernel.warn(diagnostic.render)
-  end
-  private_class_method :consume_diagnostic
-
   # Construct a parser buffer from string
   #
   # @param [String] source
@@ -209,6 +216,9 @@ require 'unparser/emitter/undef'
 require 'unparser/emitter/variable'
 require 'unparser/emitter/xstr'
 require 'unparser/emitter/yield'
+require 'unparser/emitter/kwargs'
+require 'unparser/emitter/pair'
+require 'unparser/emitter/match_pattern'
 require 'unparser/writer'
 require 'unparser/writer/binary'
 require 'unparser/writer/dynamic_string'

metadata

@@ -1,71 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.1
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-24 00:00:00.000000000 Z
+date: 2021-11-08 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: abstract_type
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.7
-- !ruby/object:Gem::Dependency
-  name: adamantium
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.2.0
-- !ruby/object:Gem::Dependency
-  name: anima
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.1
-- !ruby/object:Gem::Dependency
-  name: concord
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.5
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -80,90 +24,48 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-- !ruby/object:Gem::Dependency
-  name: equalizer
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.9
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.9
-- !ruby/object:Gem::Dependency
-  name: mprelude
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.5
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.5
-- !ruby/object:Gem::Dependency
-  name: procto
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.0.2
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: mutant
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.19
+        version: 0.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.19
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.19
+        version: 0.11.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.10.19
+        version: 0.11.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -212,28 +114,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.1
+        version: '1.7'
 - !ruby/object:Gem::Dependency
   name: rubocop-packaging
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: '0.5'
 description: Generate equivalent source for parser gem AST nodes
 email: mbj@schirp-dso.com
 executables:
@@ -245,15 +147,23 @@ files:
 - README.md
 - bin/unparser
 - lib/unparser.rb
+- lib/unparser/abstract_type.rb
+- lib/unparser/adamantium.rb
+- lib/unparser/adamantium/method_builder.rb
+- lib/unparser/anima.rb
+- lib/unparser/anima/attribute.rb
+- lib/unparser/anima/error.rb
 - lib/unparser/ast.rb
 - lib/unparser/ast/local_variable_scope.rb
 - lib/unparser/buffer.rb
 - lib/unparser/cli.rb
 - lib/unparser/color.rb
 - lib/unparser/comments.rb
+- lib/unparser/concord.rb
 - lib/unparser/constants.rb
 - lib/unparser/diff.rb
 - lib/unparser/dsl.rb
+- lib/unparser/either.rb
 - lib/unparser/emitter.rb
 - lib/unparser/emitter/alias.rb
 - lib/unparser/emitter/args.rb
@@ -285,17 +195,20 @@ files:
 - lib/unparser/emitter/in_match.rb
 - lib/unparser/emitter/in_pattern.rb
 - lib/unparser/emitter/index.rb
+- lib/unparser/emitter/kwargs.rb
 - lib/unparser/emitter/kwbegin.rb
 - lib/unparser/emitter/lambda.rb
 - lib/unparser/emitter/masgn.rb
 - lib/unparser/emitter/match.rb
 - lib/unparser/emitter/match_alt.rb
 - lib/unparser/emitter/match_as.rb
+- lib/unparser/emitter/match_pattern.rb
 - lib/unparser/emitter/match_rest.rb
 - lib/unparser/emitter/match_var.rb
 - lib/unparser/emitter/mlhs.rb
 - lib/unparser/emitter/module.rb
 - lib/unparser/emitter/op_assign.rb
+- lib/unparser/emitter/pair.rb
 - lib/unparser/emitter/pin.rb
 - lib/unparser/emitter/primitive.rb
 - lib/unparser/emitter/range.rb
@@ -311,6 +224,7 @@ files:
 - lib/unparser/emitter/variable.rb
 - lib/unparser/emitter/xstr.rb
 - lib/unparser/emitter/yield.rb
+- lib/unparser/equalizer.rb
 - lib/unparser/finalize.rb
 - lib/unparser/generation.rb
 - lib/unparser/node_details.rb
@@ -331,7 +245,10 @@ files:
 homepage: http://github.com/mbj/unparser
 licenses:
 - MIT
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/mbj/unparser/issues
+  changelog_uri: https://github.com/mbj/unparser/blob/master/Changelog.md
+  funding_uri: https://github.com/sponsors/mbj
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -340,14 +257,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.5'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes