unparser 0.4.7 → 0.6.7

data/lib/unparser/emitter/rescue.rb

@@ -4,109 +4,13 @@ module Unparser
   class Emitter
     # Emitter for rescue nodes
     class Rescue < self
-      include Unterminated
-
       handle :rescue
 
-      children :body, :rescue_body
-
-      define_group :rescue_bodies, 1..-2
-
-      EMBEDDED_TYPES = %i[block def defs kwbegin ensure].to_set.freeze
-
-      NOINDENT_STANDALONE_RESCUE = %i[root begin pair_rocket pair_colon lvasgn ivasgn].to_set.freeze
-
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
-        if standalone?
-          if NOINDENT_STANDALONE_RESCUE.include?(parent_type)
-            emit_standalone
-          else
-            indented { emit_standalone }
-          end
-        else
-          emit_embedded
-        end
-      end
-
-      # Test if rescue node ist standalone
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
-      def standalone?
-        if parent_type.equal?(:ensure)
-          !parent.node.children.first.equal?(node)
-        else
-          !EMBEDDED_TYPES.include?(parent_type)
-        end
-      end
-
-      # Emit standalone form
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def emit_standalone
-        visit_plain(body)
-        ws
-        run(Resbody::Standalone, rescue_body)
+        emit_rescue_postcontrol(node)
       end
-
-      # Emit embedded form
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def emit_embedded
-        if body
-          visit_indented(body)
-        else
-          nl
-        end
-        rescue_bodies.each do |child|
-          run(Resbody::Embedded, child)
-        end
-        emit_else
-      end
-
-      # Emit else
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def emit_else
-        return unless else_branch
-
-        write(K_ELSE)
-        visit_indented(else_branch)
-      end
-
-      # Return else body
-      #
-      # @return [Parser::AST::Node]
-      #   if else body is present
-      #
-      # @return [nil]
-      #   otherwise
-      #
-      # @api private
-      #
-      def else_branch
-        children.last
-      end
-
     end # Rescue
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/root.rb

@@ -4,8 +4,24 @@ module Unparser
   class Emitter
     # Root emitter a special case
     class Root < self
-      include Concord::Public.new(:node, :buffer, :comments)
+      include Concord::Public.new(:buffer, :node, :comments)
       include LocalVariableRoot
+
+      END_NL = %i[class sclass module begin].freeze
+
+      private_constant(*constants(false))
+
+      def dispatch
+        if children.any?
+          emit_body(node, indent: false)
+        else
+          visit_deep(node)
+        end
+
+        emit_eof_comments
+
+        nl if END_NL.include?(node.type) && !buffer.fresh_line?
+      end
     end # Root
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/send.rb

@@ -3,236 +3,27 @@
 module Unparser
   class Emitter
     # Emitter for send
-    # ignore :reek:TooManyMethods
     class Send < self
+      handle :csend, :send
 
-      handle :send
-
-      ASSIGN_SUFFIX    = '='.freeze
-      INDEX_ASSIGN     = :'[]='
-      INDEX_REFERENCE  = :'[]'
-      NON_ASSIGN_RANGE = (0..-2).freeze
-
-      children :receiver, :selector
+      def emit_mlhs
+        writer.emit_mlhs
+      end
 
-      def terminated?
-        effective_emitter.terminated?
+      def emit_heredoc_reminders
+        writer.emit_heredoc_reminders
       end
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
-        effective_emitter.write_to_buffer
-      end
-
-      # Return effective emitter
-      #
-      # @return [Emitter]
-      #
-      # @api private
-      #
-      def effective_emitter
-        effective_emitter_class.new(node, parent)
-      end
-
-      # Return effective emitter
-      #
-      # @return [Class:Emitter]
-      #
-      # @api private
-      #
-      def effective_emitter_class
-        if binary_operator?
-          Binary
-        elsif unary_operator?
-          Unary
-        elsif attribute_assignment?
-          AttributeAssignment
-        else
-          Regular
-        end
-      end
-
-      # Return string selector
-      #
-      # @return [String]
-      #
-      # @api private
-      #
-      def string_selector
-        selector.to_s
-      end
-
-      # Test for unary operator implemented as method
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
-      def unary_operator?
-        UNARY_OPERATORS.include?(selector)
-      end
-
-      # Test for binary operator implemented as method
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
-      def binary_operator?
-        BINARY_OPERATORS.include?(selector) && arguments.one? && !arguments.first.type.equal?(:splat)
-      end
-
-      # Emit selector
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def emit_selector
-        write(mlhs? ? non_assignment_selector : string_selector)
-      end
-
-      # Test for mlhs
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
-      def mlhs?
-        parent_type.equal?(:mlhs)
-      end
-
-      # Test for assignment
-      #
-      # FIXME: This also returns true for <= operator!
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
-      def assignment?
-        string_selector[-1].eql?(ASSIGN_SUFFIX)
-      end
-
-      # Test for attribute assignment
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
-      def attribute_assignment?
-        !BINARY_OPERATORS.include?(selector) && !UNARY_OPERATORS.include?(selector) && assignment? && !mlhs?
-      end
-
-      # Test for empty arguments
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
-      def arguments?
-        arguments.any?
-      end
-
-      # Return argument nodes
-      #
-      # @return [Array<Parser::AST::Node>]
-      #
-      # @api private
-      #
-      def arguments
-        children[2..-1]
-      end
-      memoize :arguments
-
-      # Emit arguments
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def emit_arguments
-        if arguments.empty?
-          write('()') if receiver.nil? && avoid_clash?
-        else
-          normal_arguments
-        end
-      end
-
-      # Emit normal arguments
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def normal_arguments
-        parentheses do
-          delimited_plain(effective_arguments)
-        end
-      end
-
-      # The effective arguments
-      #
-      # @return [Parser::AST::Node]
-      #
-      # @api private
-      #
-      def effective_arguments
-        last = arguments.length - 1
-        arguments.each_with_index.map do |argument, index|
-          if last.equal?(index) && argument.type.equal?(:hash) && argument.children.any?
-            argument.updated(:hash_body)
-          else
-            argument
-          end
-        end
-      end
-
-      # Test if clash with local variable or constant needs to be avoided
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
-      def avoid_clash?
-        local_variable_clash? || parses_as_constant?
-      end
-
-      # Test for local variable clash
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
-      def local_variable_clash?
-        local_variable_scope.local_variable_defined_for_node?(node, selector)
-      end
-
-      # The non assignment selector
-      #
-      # @return [String]
-      #
-      # @api private
-      def non_assignment_selector
-        string_selector[NON_ASSIGN_RANGE]
+        writer.dispatch
       end
 
-      # Test if selector parses as constant
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
-      def parses_as_constant?
-        Unparser.parse(selector.to_s).type.equal?(:const)
+      def writer
+        writer_with(Writer::Send, node)
       end
+      memoize :writer
     end # Send
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/simple.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Unparser
+  class Emitter
+    # Emitter for simple nodes that generate a single token
+    class Simple < self
+      MAP = {
+        __ENCODING__:      '__ENCODING__',
+        __FILE__:          '__FILE__',
+        __LINE__:          '__LINE__',
+        false:             'false',
+        forward_arg:       '...',
+        forwarded_args:    '...',
+        kwnilarg:          '**nil',
+        match_nil_pattern: '**nil',
+        nil:               'nil',
+        redo:              'redo',
+        retry:             'retry',
+        self:              'self',
+        true:              'true',
+        zsuper:            'super'
+      }.freeze
+
+      handle(*MAP.keys)
+
+    private
+
+      def dispatch
+        write(MAP.fetch(node_type))
+      end
+    end # Simple
+  end # Emitter
+end # Unparser

data/lib/unparser/emitter/splat.rb

@@ -4,46 +4,40 @@ module Unparser
   class Emitter
     # Emitter for splats
     class KwSplat < self
-      include Terminated
-
       handle :kwsplat
 
       children :subject
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
-        write(T_SPLAT, T_SPLAT)
+        write('**')
         visit(subject)
       end
     end
 
     # Emitter for splats
     class Splat < self
-      include Terminated
-
       handle :splat
 
       children :subject
 
+      def emit_mlhs
+        write('*')
+        subject_emitter.emit_mlhs if subject
+      end
+
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
-        write(T_SPLAT)
-        visit(subject) if subject
+        write('*')
+        subject_emitter.write_to_buffer
+      end
+
+      def subject_emitter
+        emitter(subject)
       end
+      memoize :subject_emitter
     end
   end
 end # Unparser

data/lib/unparser/emitter/super.rb

@@ -3,42 +3,14 @@
 module Unparser
   class Emitter
 
-    # Emitter for zsuper nodes
-    class ZSuper < self
-      include Terminated
-
-      handle :zsuper
-
-    private
-
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def dispatch
-        write(K_SUPER)
-      end
-
-    end # ZSuper
-
     # Emitter for super nodes
     class Super < self
-      include Terminated
-
       handle :super
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
-        write(K_SUPER)
+        write('super')
         parentheses do
           delimited(children)
         end

data/lib/unparser/emitter/undef.rb

@@ -4,20 +4,12 @@ module Unparser
   class Emitter
     # Emitter for undef nodes
     class Undef < self
-      include Unterminated
-
       handle :undef
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
-        write(K_UNDEF, WS)
+        write('undef ')
         delimited(children)
       end
 

data/lib/unparser/emitter/variable.rb

@@ -5,20 +5,12 @@ module Unparser
 
     # Emitter for various variable accesses
     class Variable < self
-      include Terminated
-
       handle :ivar, :lvar, :cvar, :gvar, :back_ref
 
       children :name
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
         write(name.to_s)
       end
@@ -27,43 +19,27 @@ module Unparser
 
     # Emitter for constant access
     class Const < self
-      include Terminated
-
       handle :const
 
       children :scope, :name
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
         emit_scope
         write(name.to_s)
       end
 
-      # Emit parent
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def emit_scope
         return unless scope
 
         visit(scope)
-        write(T_DCL) unless scope.type.equal?(:cbase)
+        write('::') unless n_cbase?(scope)
       end
     end
 
     # Emitter for nth_ref nodes (regexp captures)
     class NthRef < self
-      include Terminated
-
       PREFIX = '$'.freeze
       handle :nth_ref
 
@@ -71,12 +47,6 @@ module Unparser
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
         write(PREFIX)
         write(name.to_s)

data/lib/unparser/emitter/xstr.rb

@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+module Unparser
+  class Emitter
+    # Dynamic execute string literal emitter
+    class XStr < self
+
+      handle :xstr
+
+    private
+
+      def dispatch
+        if heredoc?
+          emit_heredoc
+        else
+          emit_xstr
+        end
+      end
+
+      def heredoc?
+        children.any? { |node| node.eql?(s(:str, '')) }
+      end
+
+      def emit_heredoc
+        write(%(<<~`HEREDOC`))
+        buffer.indent
+        nl
+        children.each do |child|
+          if n_str?(child)
+            write(child.children.first)
+          else
+            emit_begin(child)
+          end
+        end
+        buffer.unindent
+        write("HEREDOC\n")
+      end
+
+      def emit_xstr
+        write('`')
+        children.each do |child|
+          if n_begin?(child)
+            emit_begin(child)
+          else
+            emit_string(child)
+          end
+        end
+        write('`')
+      end
+
+      def emit_string(value)
+        write(escape_xstr(value.children.first))
+      end
+
+      def escape_xstr(input)
+        input.chars.map do |char|
+          if char.eql?('`')
+            '\\`'
+          else
+            char
+          end
+        end.join
+      end
+
+      def emit_begin(component)
+        write('#{')
+        visit(unwrap_single_begin(component))
+        write('}')
+      end
+    end # XStr
+  end # Emitter
+end # Unparser

data/lib/unparser/emitter/yield.rb

@@ -5,20 +5,12 @@ module Unparser
 
     # Emitter for yield node
     class Yield < self
-      include Terminated
-
       handle :yield
 
     private
 
-      # Perform dispatch
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
       def dispatch
-        write(K_YIELD)
+        write('yield')
         return if children.empty?
 
         parentheses do