unparser 0.5.3 → 0.6.0

data/lib/unparser/emitter.rb

@@ -5,7 +5,7 @@ module Unparser
 
   # Emitter base class
   class Emitter
-    include Adamantium::Flat, AbstractType, Constants, Generation, NodeHelpers
+    include Adamantium, AbstractType, Constants, Generation, NodeHelpers
     include Anima.new(:buffer, :comments, :node, :local_variable_scope)
 
     public :node

data/lib/unparser/emitter/flow_modifier.rb

@@ -14,13 +14,22 @@ module Unparser
 
       handle(*MAP.keys)
 
+      def emit_heredoc_reminders
+        children.each do |node|
+          emitter(node).emit_heredoc_reminders
+        end
+      end
+
     private
 
       def dispatch
         write(MAP.fetch(node.type))
 
-        unless children.empty?
-          emit_arguments
+        if children.one? && n_if?(children.first)
+          ws
+          emitter(children.first).emit_ternary
+        else
+          emit_arguments unless children.empty?
         end
       end
 

data/lib/unparser/emitter/hash.rb

@@ -4,10 +4,6 @@ module Unparser
   class Emitter
     # Emitter for Hash literals
     class Hash < self
-      BAREWORD = /\A[A-Za-z_][A-Za-z_0-9]*[?!]?\z/.freeze
-
-      private_constant(*constants(false))
-
       handle :hash
 
       def emit_last_argument_hash
@@ -41,34 +37,8 @@ module Unparser
       end
 
       def emit_hash_body
-        delimited(children, &method(:emit_hash_member))
-      end
-
-      def emit_hash_member(node)
-        if n_kwsplat?(node)
-          visit(node)
-        else
-          emit_pair(node)
-        end
+        delimited(children)
       end
-
-      def emit_pair(pair)
-        key, value = *pair.children
-
-        if colon?(key)
-          write(key.children.first.to_s, ': ')
-        else
-          visit(key)
-          write(' => ')
-        end
-
-        visit(value)
-      end
-
-      def colon?(key)
-        n_sym?(key) && BAREWORD.match?(key.children.first)
-      end
-
     end # Hash
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/if.rb

@@ -8,6 +8,14 @@ module Unparser
 
       children :condition, :if_branch, :else_branch
 
+      def emit_ternary
+        visit(condition)
+        write(' ? ')
+        visit(if_branch)
+        write(' : ')
+        visit(else_branch)
+      end
+
     private
 
       def dispatch

data/lib/unparser/emitter/in_pattern.rb

@@ -27,6 +27,8 @@ module Unparser
           ws
           write('then')
           emit_body(branch)
+        else
+          nl
         end
       end
     end # InPattern

data/lib/unparser/emitter/index.rb

@@ -36,7 +36,7 @@ module Unparser
         handle :indexasgn
 
         VALUE_RANGE     = (1..-2).freeze
-        NO_VALUE_PARENT = IceNine.deep_freeze(%i[and_asgn op_asgn or_asgn].to_set)
+        NO_VALUE_PARENT = %i[and_asgn op_asgn or_asgn].to_set.freeze
 
         private_constant(*constants(false))
 

data/lib/unparser/emitter/kwargs.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Unparser
+  class Emitter
+    class Kwargs < self
+      handle :kwargs
+
+      def dispatch
+        delimited(children)
+      end
+    end # Kwargs
+  end # Emitter
+end # Unparser

data/lib/unparser/emitter/match_pattern.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Unparser
+  class Emitter
+    # Emitter for in pattern nodes
+    class MatchPattern < self
+
+      handle :match_pattern
+      handle :match_pattern_p
+
+      children :target, :pattern
+
+    private
+
+      def dispatch
+        visit(target)
+        write(' in ')
+        visit(pattern)
+      end
+    end # InPattern
+  end # Emitter
+end # Unparser

data/lib/unparser/emitter/op_assign.rb

@@ -7,10 +7,10 @@ module Unparser
     class BinaryAssign < self
       children :target, :expression
 
-      MAP = IceNine.deep_freeze(
+      MAP = {
         and_asgn: '&&=',
         or_asgn:  '||='
-      )
+      }.freeze
 
       handle(*MAP.keys)
 

data/lib/unparser/emitter/pair.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module Unparser
+  class Emitter
+    # Emitter for key value pairs in hash literals or kwargs
+    class Pair < self
+      BAREWORD = /\A[A-Za-z_][A-Za-z_0-9]*[?!]?\z/.freeze
+
+      private_constant(*constants(false))
+
+      handle :pair
+
+      children :key, :value
+
+    private
+
+      def dispatch
+        if colon?(key)
+          write(key.children.first.to_s, ': ')
+        else
+          visit(key)
+          write(' => ')
+        end
+
+        visit(value)
+      end
+
+      def colon?(key)
+        n_sym?(key) && BAREWORD.match?(key.children.first)
+      end
+    end
+  end
+end

data/lib/unparser/emitter/primitive.rb

@@ -28,11 +28,11 @@ module Unparser
         RATIONAL_FORMAT = 'i'.freeze
 
         MAP =
-          IceNine.deep_freeze(
+          {
             ::Float    => :float,
             ::Rational => :rational,
             ::Integer  => :int
-          )
+          }.freeze
 
       private
 

data/lib/unparser/emitter/simple.rb

@@ -4,7 +4,7 @@ module Unparser
   class Emitter
     # Emitter for simple nodes that generate a single token
     class Simple < self
-      MAP = IceNine.deep_freeze(
+      MAP = {
         __ENCODING__:      '__ENCODING__',
         __FILE__:          '__FILE__',
         __LINE__:          '__LINE__',
@@ -19,7 +19,7 @@ module Unparser
         self:              'self',
         true:              'true',
         zsuper:            'super'
-      )
+      }.freeze
 
       handle(*MAP.keys)
 

data/lib/unparser/emitter/splat.rb

@@ -22,12 +22,22 @@ module Unparser
 
       children :subject
 
+      def emit_mlhs
+        write('*')
+        subject_emitter.emit_mlhs if subject
+      end
+
     private
 
       def dispatch
         write('*')
-        visit(subject) if subject
+        subject_emitter.write_to_buffer
+      end
+
+      def subject_emitter
+        emitter(subject)
       end
+      memoize :subject_emitter
     end
   end
 end # Unparser

data/lib/unparser/equalizer.rb

@@ -0,0 +1,98 @@
+# frozen_string_literal: true
+
+module Unparser
+  # Define equality, equivalence and inspection methods
+  #
+  # Original code before vendoring and reduction from: https://github.com/dkubb/equalizer.
+  class Equalizer < Module
+    # Initialize an Equalizer with the given keys
+    #
+    # Will use the keys with which it is initialized to define #cmp?,
+    # #hash, and #inspect
+    #
+    # @param [Array<Symbol>] keys
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    # rubocop:disable Lint/MissingSuper
+    def initialize(*keys)
+      @keys = keys
+      define_methods
+      freeze
+    end
+    # rubocop:enable Lint/MissingSuper
+
+    private
+
+    def included(descendant)
+      descendant.include(Methods)
+    end
+
+    def define_methods
+      define_cmp_method
+      define_hash_method
+      define_inspect_method
+    end
+
+    def define_cmp_method
+      keys = @keys
+      define_method(:cmp?) do |comparator, other|
+        keys.all? do |key|
+          __send__(key).public_send(comparator, other.__send__(key))
+        end
+      end
+      private :cmp?
+    end
+
+    def define_hash_method
+      keys = @keys
+      define_method(:hash) do
+        keys.map(&public_method(:__send__)).push(self.class).hash
+      end
+    end
+
+    def define_inspect_method
+      keys = @keys
+      define_method(:inspect) do
+        klass = self.class
+        name  = klass.name || klass.inspect
+        "#<#{name}#{keys.map { |key| " #{key}=#{__send__(key).inspect}" }.join}>"
+      end
+    end
+
+    # The comparison methods
+    module Methods
+      # Compare the object with other object for equality
+      #
+      # @example
+      #   object.eql?(other)  # => true or false
+      #
+      # @param [Object] other
+      #   the other object to compare with
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def eql?(other)
+        instance_of?(other.class) && cmp?(__method__, other)
+      end
+
+      # Compare the object with other object for equivalency
+      #
+      # @example
+      #   object == other  # => true or false
+      #
+      # @param [Object] other
+      #   the other object to compare with
+      #
+      # @return [Boolean]
+      #
+      # @api public
+      def ==(other)
+        instance_of?(other.class) && cmp?(__method__, other)
+      end
+    end # module Methods
+  end # class Equalizer
+end # Unparser

data/lib/unparser/generation.rb

@@ -204,7 +204,9 @@ module Unparser
     end
 
     def emit_rescue_postcontrol(node)
-      writer_with(Writer::Rescue, node).emit_postcontrol
+      writer = writer_with(Writer::Rescue, node)
+      writer.emit_postcontrol
+      writer.emit_heredoc_reminders
     end
 
     def emit_rescue_regular(node)

data/lib/unparser/node_details.rb

@@ -6,7 +6,7 @@ module Unparser
 
     def self.included(descendant)
       descendant.class_eval do
-        include Adamantium::Flat, Concord.new(:node)
+        include Adamantium, Concord.new(:node)
 
         extend DSL
       end

data/lib/unparser/node_helpers.rb

@@ -45,6 +45,7 @@ module Unparser
       ensure
       hash
       hash_pattern
+      if
       in_pattern
       int
       kwsplat

data/lib/unparser/validation.rb

@@ -3,7 +3,7 @@
 module Unparser
   # Validation of unparser results
   class Validation
-    include Adamantium::Flat, Anima.new(
+    include Adamantium, Anima.new(
       :generated_node,
       :generated_source,
       :identification,
@@ -64,7 +64,7 @@ module Unparser
 
       new(
         identification:   '(string)',
-        original_source:  MPrelude::Either::Right.new(original_source),
+        original_source:  Either::Right.new(original_source),
         original_node:    original_node,
         generated_source: generated_source,
         generated_node:   generated_node
@@ -86,7 +86,7 @@ module Unparser
       new(
         identification:   '(string)',
         original_source:  generated_source,
-        original_node:    MPrelude::Either::Right.new(original_node),
+        original_node:    Either::Right.new(original_node),
         generated_source: generated_source,
         generated_node:   generated_node
       )

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,24 +3,22 @@
 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].to_set.freeze
+      FLAT_INTERPOLATION = %i[ivar cvar gvar nth_ref].to_set.freeze
 
       private_constant(*constants(false))
 
@@ -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|