unparser 0.4.7 → 0.6.7

data/lib/unparser/emitter/argument.rb

@@ -2,121 +2,21 @@
 
 module Unparser
   class Emitter
-
-    # Arg expr (pattern args) emitter
-    class ArgExpr < self
-
-      handle :arg_expr
-
-      children :body
-
-    private
-
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def dispatch
-        visit_parentheses(body)
-      end
-    end # ArgExpr
-
-    # Arguments emitter
-    class Arguments < self
-      include Terminated
-
-      handle :args
-
-      SHADOWARGS = ->(node) { node.type.equal?(:shadowarg) }.freeze
-      ARG        = ->(node) { node.type.equal?(:arg) }.freeze
-
-    private
-
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def dispatch
-        delimited(normal_arguments)
-
-        write(', ') if procarg_disambiguator?
-
-        return if shadowargs.empty?
-
-        write('; ')
-        delimited(shadowargs)
-      end
-
-      # Test for procarg_disambiguator
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
-      def procarg_disambiguator?
-        regular_block? && normal_arguments.all?(&ARG) && normal_arguments.one?
-      end
-
-      # Test for regular block
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
-      def regular_block?
-        parent_type.equal?(:block) && !parent.node.children.first.type.equal?(:lambda)
-      end
-
-      # Return normal arguments
-      #
-      # @return [Enumerable<Parser::AST::Node>]
-      #
-      # @api private
-      #
-      def normal_arguments
-        children.reject(&SHADOWARGS)
-      end
-      memoize :normal_arguments
-
-      # Return shadow args
-      #
-      # @return [Enumerable<Parser::AST::Node>]
-      #
-      # @api private
-      #
-      def shadowargs
-        children.select(&SHADOWARGS)
-      end
-      memoize :shadowargs
-
-    end # Arguments
-
-    # Emitter for block and kwrestarg arguments
-    class Morearg < self
-      include Terminated
-
+    # Emitter for forwarding arguments
+    class ForwardArg < self
       MAP = {
-        blockarg:  T_AMP,
-        kwrestarg: T_DSPLAT
+        blockarg:            '&',
+        forwarded_kwrestarg: '**',
+        forwarded_restarg:   '*',
+        kwrestarg:           '**'
       }.freeze
 
-      handle :blockarg
-      handle :kwrestarg
+      handle(*MAP.keys)
 
       children :name
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
         write(MAP.fetch(node_type), name.to_s)
       end
@@ -125,44 +25,28 @@ module Unparser
 
     # Optional argument emitter
     class Optarg < self
-      include Terminated
-
       handle :optarg
 
       children :name, :value
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
-        write(name.to_s, WS, T_ASN, WS)
+        write(name.to_s, ' = ')
         visit(value)
       end
     end
 
     # Optional keyword argument emitter
     class KeywordOptional < self
-      include Terminated
-
       handle :kwoptarg
 
       children :name, :value
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
-        write(name.to_s, T_COLON, WS)
+        write(name.to_s, ': ')
         visit(value)
       end
 
@@ -170,64 +54,40 @@ module Unparser
 
     # Keyword argument emitter
     class Kwarg < self
-      include Terminated
-
       handle :kwarg
 
       children :name
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
-        write(name.to_s, T_COLON)
+        write(name.to_s, ':')
       end
 
     end # Restarg
 
     # Rest argument emitter
     class Restarg < self
-      include Terminated
-
       handle :restarg
 
       children :name
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
-        write(T_SPLAT, name.to_s)
+        write('*', name.to_s)
       end
 
     end # Restarg
 
     # Argument emitter
     class Argument < self
-      include Terminated
-
       handle :arg, :shadowarg
 
       children :name
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
         write(name.to_s)
       end
@@ -236,20 +96,12 @@ module Unparser
 
     # Progarg emitter
     class Procarg < self
-      include Terminated
-
       handle :procarg0
 
       PARENS = %i[restarg mlhs].freeze
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
         if needs_parens?
           parentheses do
@@ -269,23 +121,15 @@ module Unparser
 
     # Block pass node emitter
     class BlockPass < self
-      include Terminated
-
       handle :block_pass
 
       children :name
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
-        write(T_AMP)
-        visit(name)
+        write('&')
+        visit(name) if name
       end
 
     end # BlockPass

data/lib/unparser/emitter/array.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module Unparser
+  class Emitter
+    # Array literal emitter
+    class Array < self
+      handle :array
+
+      def emit_heredoc_reminders
+        emitters.each(&:emit_heredoc_reminders)
+      end
+
+    private
+
+      def dispatch
+        parentheses('[', ']') do
+          delimited(emitters, &:write_to_buffer)
+        end
+      end
+
+      def emitters
+        children.map(&method(:emitter))
+      end
+      memoize :emitters
+    end # Array
+  end # Emitter
+end # Unparser

data/lib/unparser/emitter/array_pattern.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Unparser
+  class Emitter
+    # Emitter for array patterns
+    class ArrayPattern < self
+
+      handle :array_pattern
+      handle :array_pattern_with_tail
+
+    private
+
+      def dispatch
+        write('[')
+        delimited(children, &method(:emit_member))
+        write(', ') if node_type.equal?(:array_pattern_with_tail)
+        write(']')
+      end
+
+      def emit_member(node)
+        if n_match_rest?(node)
+          writer_with(MatchRest, node).emit_array_pattern
+        else
+          visit(node)
+        end
+      end
+    end # Pin
+  end # Emitter
+end # Unparser

data/lib/unparser/emitter/assignment.rb

@@ -5,163 +5,72 @@ module Unparser
 
     # Base class for assignment emitters
     class Assignment < self
+      BINARY_OPERATOR = %i[and or].freeze
+
+      def symbol_name
+        true
+      end
+
+      def emit_heredoc_reminders
+        return unless right
+
+        emitter(right).emit_heredoc_reminders
+      end
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
         emit_left
         emit_right
       end
 
-      # Single assignment emitter
-      class Single < self
-
-        # Test for terminated emit
-        #
-        # @return [Boolean]
-        #
-        # @api private
-        #
-        def terminated?
-          right.nil?
-        end
-
-      private
+      def emit_right
+        return unless right
 
-        # Emit right
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def emit_right
-          return unless right
+        write(' = ')
 
-          write(WS, T_ASN, WS)
+        if BINARY_OPERATOR.include?(right.type)
+          writer_with(Writer::Binary, right).emit_operator
+        else
           visit(right)
         end
+      end
 
-        abstract_method :emit_left
-
-        # Variable assignment emitter
-        class Variable < self
-
-          handle :lvasgn, :ivasgn, :cvasgn, :gvasgn
-
-          children :name, :right
-
-        private
-
-          # Emit left
-          #
-          # @return [undefined]
-          #
-          # @api private
-          #
-          def emit_left
-            write(name.to_s)
-          end
-
-        end # Variable
-
-        # Constant assignment emitter
-        class Constant < self
-
-          handle :casgn
-
-          children :base, :name, :right
-
-        private
-
-          # Emit left
-          #
-          # @return [undefined]
-          #
-          # @api private
-          #
-          def emit_left
-            if base
-              visit(base)
-              write(T_DCL) if base.type != :cbase
-            end
-            write(name.to_s)
-          end
+      abstract_method :emit_left
 
-        end # Constant
-      end # Single
+      # Variable assignment emitter
+      class Variable < self
 
-      # Multiple assignment
-      class Multiple < self
-        include Unterminated
+        handle :lvasgn, :ivasgn, :cvasgn, :gvasgn
 
-        handle :masgn
+        children :name, :right
 
       private
 
-        # Emit left
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
         def emit_left
-          visit_plain(first_child)
+          write(name.to_s)
         end
 
-        # Emit right
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def emit_right
-          write(WS, T_ASN, WS)
-          visit(children.last)
-        end
+      end # Variable
 
-      end # Multiple
+      # Constant assignment emitter
+      class Constant < self
 
-      # Emitter for multiple assignment left hand side
-      class MLHS < Emitter
-        include Unterminated
+        handle :casgn
 
-        handle :mlhs
+        children :base, :name, :right
 
       private
 
-        NO_COMMA = %i[splat restarg].to_set.freeze
-        PARENT_MLHS = %i[mlhs masgn].freeze
-
-        # Perform dispatch
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def dispatch
-          delimited(children)
-
-          write(',') if children.one? && mlhs?
-        end
-
-        # Test for mlhs context
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def mlhs?
-          !NO_COMMA.include?(first_child.type) && PARENT_MLHS.include?(parent_type)
+        def emit_left
+          if base
+            visit(base)
+            write('::') unless n_cbase?(base)
+          end
+          write(name.to_s)
         end
 
-      end # MLHS
-
+      end # Constant
     end # Assignment
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/begin.rb

@@ -5,97 +5,22 @@ module Unparser
 
     # Emitter for begin nodes
     class Begin < self
-
+      handle :begin
       children :body
 
-    private
-
-      # Emit inner nodes
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def emit_inner
-        children.each_with_index do |child, index|
-          visit_plain(child)
-          write(NL) if index < children.length - 1
+      def emit_heredoc_reminders
+        children.each do |child|
+          emitter(child).emit_heredoc_reminders
         end
       end
 
-      # Emitter for implicit begins
-      class Implicit < self
-
-        handle :begin
-
-        # Test if begin is terminated
-        #
-        # @return [Boolean]
-        #
-        # @api private
-        #
-        def terminated?
-          children.empty?
-        end
-
-        TERMINATING_PARENT = %i[root interpolated dyn_str_body].to_set.freeze
-
-      private
-
-        # Perform dispatch
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def dispatch
-          if terminated? && !TERMINATING_PARENT.include?(parent_type)
-            write('()')
-          else
-            emit_inner
-          end
-        end
-
-      end # Implicit
-
-      # Emitter for explicit begins
-      class Explicit < self
-        include Terminated
-
-        handle :kwbegin
-
-      private
-
-        # Perform dispatch
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def dispatch
-          write(K_BEGIN)
-          emit_body
-          k_end
-        end
+    private
 
-        # Emit body
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def emit_body
-          if body.nil?
-            nl
-          elsif NOINDENT.include?(body.type)
-            emit_inner
-          else
-            indented { emit_inner }
-          end
+      def dispatch
+        parentheses do
+          delimited(children, '; ')
         end
-
-      end # Explicit
-
+      end
     end # Begin
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/binary.rb

@@ -2,33 +2,20 @@
 
 module Unparser
   class Emitter
-    # Base class for binary emitters
+    # Non send binary operator / keyword emitter
     class Binary < self
-      include Unterminated
-
-      children :left, :right
-
-      MAP = {
-        or:  T_OR,
-        and: T_AND
-      }.freeze
-
-      handle(*MAP.keys)
+      handle :and, :or
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
-        visit(left)
-        write(WS, MAP.fetch(node.type), WS)
-        visit(right)
+        writer.dispatch
       end
 
+      def writer
+        writer_with(Writer::Binary, node)
+      end
+      memoize :writer
     end # Binary
   end # Emitter
 end # Unparser