unparser 0.4.8 → 0.5.3

data/lib/unparser/writer/resbody.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Unparser
+  module Writer
+    # Writer for rescue bodies
+    class Resbody
+      include Writer
+
+      children :exception, :assignment, :body
+
+      def emit_postcontrol
+        write(' rescue ')
+        visit(body)
+      end
+
+      def emit_regular
+        write('rescue')
+        emit_exception
+        emit_assignment
+        emit_optional_body(body)
+      end
+
+    private
+
+      def emit_exception
+        return unless exception
+
+        ws
+        delimited(exception.children)
+      end
+
+      def emit_assignment
+        return unless assignment
+
+        write(' => ')
+        visit(assignment)
+      end
+    end # Resbody
+  end # Writer
+end # Unparser

data/lib/unparser/writer/rescue.rb

@@ -0,0 +1,39 @@
+# frozen_string_literal: true
+
+module Unparser
+  module Writer
+    class Rescue
+      include Writer, Adamantium::Flat
+
+      children :body, :rescue_body
+
+      define_group :rescue_bodies, 1..-2
+
+      def emit_regular
+        emit_optional_body(body)
+
+        rescue_bodies.each(&method(:emit_rescue_body))
+
+        if else_node
+          write('else')
+          emit_body(else_node)
+        end
+      end
+
+      def emit_postcontrol
+        visit(body)
+        writer_with(Resbody, rescue_body).emit_postcontrol
+      end
+
+    private
+
+      def else_node
+        children.last
+      end
+
+      def emit_rescue_body(node)
+        writer_with(Resbody, node).emit_regular
+      end
+    end # Rescue
+  end # Writer
+end # Unparser

data/lib/unparser/writer/send.rb

@@ -0,0 +1,124 @@
+# frozen_string_literal: true
+
+module Unparser
+  module Writer
+    # Writer for send
+    class Send
+      include Writer, Adamantium::Flat, Constants, Generation
+
+      INDEX_ASSIGN    = :'[]='
+      INDEX_REFERENCE = :'[]'
+
+      OPERATORS = {
+        csend: '&.',
+        send:  '.'
+      }.freeze
+
+      private_constant(*constants(false))
+
+      children :receiver, :selector
+
+      def dispatch
+        effective_writer.dispatch
+      end
+
+      def emit_mlhs
+        effective_writer.emit_send_mlhs
+      end
+
+      def emit_selector
+        write(details.string_selector)
+      end
+
+      def emit_heredoc_reminders
+        emitter(receiver).emit_heredoc_reminders if receiver
+        arguments.each(&method(:emit_heredoc_reminder))
+      end
+
+    private
+
+      def effective_writer
+        writer_with(effective_writer_class, node)
+      end
+      memoize :effective_writer
+
+      def effective_writer_class
+        if details.binary_syntax_allowed?
+          Binary
+        elsif details.selector_unary_operator? && n_send?(node)
+          Unary
+        elsif write_as_attribute_assignment?
+          AttributeAssignment
+        else
+          Regular
+        end
+      end
+
+      def write_as_attribute_assignment?
+        details.assignment_operator?
+      end
+
+      def emit_operator
+        write(OPERATORS.fetch(node.type))
+      end
+
+      def emit_arguments
+        if arguments.empty?
+          write('()') if receiver.nil? && avoid_clash?
+        else
+          emit_normal_arguments
+        end
+      end
+
+      def arguments
+        details.arguments
+      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
+      end
+
+      def emit_heredoc_reminder(argument)
+        emitter(argument).emit_heredoc_reminders
+      end
+
+      def avoid_clash?
+        local_variable_clash? || parses_as_constant?
+      end
+
+      def local_variable_clash?
+        local_variable_scope.local_variable_defined_for_node?(node, selector)
+      end
+
+      def parses_as_constant?
+        n_const?(Unparser.parse(selector.to_s))
+      end
+
+      def details
+        NodeDetails::Send.new(node)
+      end
+      memoize :details
+
+      def emit_send_regular(node)
+        if n_send?(node)
+          writer_with(Regular, node).dispatch
+        else
+          visit(node)
+        end
+      end
+    end # Send
+  end # Writer
+end # Unparser

data/lib/unparser/{emitter → writer}/send/attribute_assignment.rb

@@ -1,24 +1,16 @@
 # frozen_string_literal: true
 
 module Unparser
-  class Emitter
+  module Writer
     class Send
-      # Emitter for send as attribute assignment
+      # Writer for send as attribute assignment
       class AttributeAssignment < self
-        include Unterminated
-
         children :receiver, :selector, :first_argument
 
-        # Perform regular dispatch
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
         def dispatch
           emit_receiver
           emit_attribute
-          write(T_ASN)
+          write('=')
 
           if arguments.one?
             visit(first_argument)
@@ -27,29 +19,22 @@ module Unparser
           end
         end
 
+        def emit_send_mlhs
+          emit_receiver
+          write(details.non_assignment_selector)
+        end
+
       private
 
-        # Emit receiver
-        #
-        # @return [Parser::AST::Node]
-        #
-        # @api private
-        #
         def emit_receiver
           visit(receiver)
-          write(T_DOT)
+          emit_operator
         end
 
-        # Emit attribute
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
         def emit_attribute
-          write(non_assignment_selector)
+          write(details.non_assignment_selector)
         end
       end # AttributeAssignment
     end # Send
-  end # Emitter
+  end # Writer
 end # Unparser

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Unparser
+  module Writer
+    class Send
+      # Writer for binary sends
+      class Binary < self
+        def dispatch
+          visit(receiver)
+          emit_operator
+          emit_right
+        end
+
+      private
+
+        def emit_operator
+          write(' ', details.string_selector, ' ')
+        end
+
+        def emit_right
+          emit_send_regular(children.fetch(2))
+        end
+
+      end # Binary
+    end # Send
+  end # Writer
+end # Unparser

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

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Unparser
+  module Writer
+    class Send
+      # Writer for "conditional" receiver&.selector(arguments...) case
+      class Conditional < self
+
+      private
+
+        def dispatch
+          emit_receiver
+          emit_selector
+          emit_arguments
+        end
+
+        def emit_receiver
+          visit(receiver)
+          write('&.')
+        end
+
+      end # Regular
+    end # Send
+  end # Writer
+end # Unparser

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

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Unparser
+  module Writer
+    class Send
+      # Writer for "regular" receiver.selector(arguments...) case
+      class Regular < self
+        def dispatch
+          emit_receiver
+          emit_selector
+          emit_arguments
+        end
+
+        def emit_send_mlhs
+          dispatch
+        end
+
+        def emit_arguments_without_heredoc_body
+          emit_normal_arguments if arguments.any?
+        end
+
+        def emit_receiver
+          return unless receiver
+
+          emit_send_regular(receiver)
+
+          emit_operator
+        end
+
+      end # Regular
+    end # Send
+  end # Writer
+end # Unparser

data/lib/unparser/{emitter → writer}/send/unary.rb

@@ -1,36 +1,29 @@
 # frozen_string_literal: true
 
 module Unparser
-  class Emitter
+  module Writer
     class Send
-      # Emitter for unary sends
+      # Writer for unary sends
       class Unary < self
-        include Unterminated
-
-      private
-
-        MAP = IceNine.deep_freeze(
+        MAP = {
           '-@': '-',
           '+@': '+'
-        )
+        }.freeze
+
+        private_constant(*constants(false))
 
-        # Perform dispatch
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
         def dispatch
           name = selector
+
           write(MAP.fetch(name, name).to_s)
-          if receiver.type.equal?(:int) && selector.equal?(:'+@')
+
+          if n_int?(receiver) && selector.equal?(:'+@')
             write('+')
           end
 
           visit(receiver)
         end
-
       end # Unary
     end # Send
-  end # Emitter
+  end # Writer
 end # Unparser

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.4.8
+  version: 0.5.3
 platform: ruby
 authors:
 - Markus Schirp
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_type
@@ -142,28 +142,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 0.9.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 0.9.14
 - !ruby/object:Gem::Dependency
   name: mutant-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 0.9.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.9
+        version: 0.9.14
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.92.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.79.0
+        version: 0.92.0
+- !ruby/object:Gem::Dependency
+  name: rubocop-packaging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 description: Generate equivalent source for parser gem AST nodes
 email: mbj@schirp-dso.com
 executables:
@@ -228,23 +242,8 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- ".github/workflows/ci.yml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- Changelog.md
-- Gemfile
-- Gemfile.lock
-- LICENSE
 - README.md
-- Rakefile
 - bin/unparser
-- config/devtools.yml
-- config/flay.yml
-- config/flog.yml
-- config/mutant.yml
-- config/reek.yml
-- config/yardstick.yml
 - lib/unparser.rb
 - lib/unparser/ast.rb
 - lib/unparser/ast/local_variable_scope.rb
@@ -257,81 +256,78 @@ files:
 - lib/unparser/dsl.rb
 - lib/unparser/emitter.rb
 - lib/unparser/emitter/alias.rb
+- lib/unparser/emitter/args.rb
 - lib/unparser/emitter/argument.rb
+- lib/unparser/emitter/array.rb
+- lib/unparser/emitter/array_pattern.rb
 - lib/unparser/emitter/assignment.rb
 - lib/unparser/emitter/begin.rb
 - lib/unparser/emitter/binary.rb
 - lib/unparser/emitter/block.rb
 - lib/unparser/emitter/case.rb
+- lib/unparser/emitter/case_guard.rb
+- lib/unparser/emitter/case_match.rb
 - lib/unparser/emitter/cbase.rb
 - lib/unparser/emitter/class.rb
+- lib/unparser/emitter/const_pattern.rb
 - lib/unparser/emitter/def.rb
 - lib/unparser/emitter/defined.rb
-- lib/unparser/emitter/empty.rb
-- lib/unparser/emitter/ensure.rb
+- lib/unparser/emitter/dstr.rb
+- lib/unparser/emitter/dsym.rb
 - lib/unparser/emitter/flipflop.rb
+- lib/unparser/emitter/float.rb
 - lib/unparser/emitter/flow_modifier.rb
 - lib/unparser/emitter/for.rb
+- lib/unparser/emitter/hash.rb
+- lib/unparser/emitter/hash_pattern.rb
 - lib/unparser/emitter/hookexe.rb
 - lib/unparser/emitter/if.rb
+- lib/unparser/emitter/in_match.rb
+- lib/unparser/emitter/in_pattern.rb
 - lib/unparser/emitter/index.rb
+- lib/unparser/emitter/kwbegin.rb
 - lib/unparser/emitter/lambda.rb
-- lib/unparser/emitter/literal.rb
-- lib/unparser/emitter/literal/array.rb
-- lib/unparser/emitter/literal/dynamic.rb
-- lib/unparser/emitter/literal/dynamic_body.rb
-- lib/unparser/emitter/literal/execute_string.rb
-- lib/unparser/emitter/literal/hash.rb
-- lib/unparser/emitter/literal/primitive.rb
-- lib/unparser/emitter/literal/range.rb
-- lib/unparser/emitter/literal/regexp.rb
-- lib/unparser/emitter/literal/singleton.rb
+- lib/unparser/emitter/masgn.rb
 - lib/unparser/emitter/match.rb
-- lib/unparser/emitter/meta.rb
+- lib/unparser/emitter/match_alt.rb
+- lib/unparser/emitter/match_as.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/redo.rb
+- lib/unparser/emitter/pin.rb
+- lib/unparser/emitter/primitive.rb
+- lib/unparser/emitter/range.rb
+- lib/unparser/emitter/regexp.rb
 - lib/unparser/emitter/repetition.rb
-- lib/unparser/emitter/resbody.rb
 - lib/unparser/emitter/rescue.rb
-- lib/unparser/emitter/retry.rb
 - lib/unparser/emitter/root.rb
 - lib/unparser/emitter/send.rb
-- lib/unparser/emitter/send/attribute_assignment.rb
-- lib/unparser/emitter/send/binary.rb
-- lib/unparser/emitter/send/conditional.rb
-- lib/unparser/emitter/send/regular.rb
-- lib/unparser/emitter/send/unary.rb
+- lib/unparser/emitter/simple.rb
 - lib/unparser/emitter/splat.rb
 - lib/unparser/emitter/super.rb
 - lib/unparser/emitter/undef.rb
 - lib/unparser/emitter/variable.rb
+- lib/unparser/emitter/xstr.rb
 - lib/unparser/emitter/yield.rb
 - lib/unparser/finalize.rb
+- lib/unparser/generation.rb
+- lib/unparser/node_details.rb
+- lib/unparser/node_details/send.rb
 - lib/unparser/node_helpers.rb
-- lib/unparser/preprocessor.rb
 - lib/unparser/validation.rb
-- spec/integration/unparser/corpus_spec.rb
-- spec/integrations.yml
-- spec/spec_helper.rb
-- spec/unit/unparser/buffer/append_spec.rb
-- spec/unit/unparser/buffer/append_without_prefix_spec.rb
-- spec/unit/unparser/buffer/capture_content_spec.rb
-- spec/unit/unparser/buffer/content_spec.rb
-- spec/unit/unparser/buffer/fresh_line_spec.rb
-- spec/unit/unparser/buffer/indent_spec.rb
-- spec/unit/unparser/buffer/nl_spec.rb
-- spec/unit/unparser/buffer/unindent_spec.rb
-- spec/unit/unparser/color_spec.rb
-- spec/unit/unparser/comments/consume_spec.rb
-- spec/unit/unparser/comments/take_all_spec.rb
-- spec/unit/unparser/comments/take_before_spec.rb
-- spec/unit/unparser/comments/take_eol_comments_spec.rb
-- spec/unit/unparser/diff_spec.rb
-- spec/unit/unparser/emitter/class_methods/handle_spec.rb
-- spec/unit/unparser/validation_spec.rb
-- spec/unit/unparser_spec.rb
-- unparser.gemspec
+- lib/unparser/writer.rb
+- lib/unparser/writer/binary.rb
+- lib/unparser/writer/dynamic_string.rb
+- lib/unparser/writer/resbody.rb
+- lib/unparser/writer/rescue.rb
+- lib/unparser/writer/send.rb
+- lib/unparser/writer/send/attribute_assignment.rb
+- lib/unparser/writer/send/binary.rb
+- lib/unparser/writer/send/conditional.rb
+- lib/unparser/writer/send/regular.rb
+- lib/unparser/writer/send/unary.rb
 homepage: http://github.com/mbj/unparser
 licenses:
 - MIT
@@ -344,35 +340,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes
-test_files:
-- spec/integration/unparser/corpus_spec.rb
-- spec/integrations.yml
-- spec/spec_helper.rb
-- spec/unit/unparser/buffer/append_spec.rb
-- spec/unit/unparser/buffer/append_without_prefix_spec.rb
-- spec/unit/unparser/buffer/capture_content_spec.rb
-- spec/unit/unparser/buffer/content_spec.rb
-- spec/unit/unparser/buffer/fresh_line_spec.rb
-- spec/unit/unparser/buffer/indent_spec.rb
-- spec/unit/unparser/buffer/nl_spec.rb
-- spec/unit/unparser/buffer/unindent_spec.rb
-- spec/unit/unparser/color_spec.rb
-- spec/unit/unparser/comments/consume_spec.rb
-- spec/unit/unparser/comments/take_all_spec.rb
-- spec/unit/unparser/comments/take_before_spec.rb
-- spec/unit/unparser/comments/take_eol_comments_spec.rb
-- spec/unit/unparser/diff_spec.rb
-- spec/unit/unparser/emitter/class_methods/handle_spec.rb
-- spec/unit/unparser/validation_spec.rb
-- spec/unit/unparser_spec.rb
+test_files: []