unparser 0.1.15 → 0.1.16

data/lib/unparser/emitter/repetition.rb

@@ -5,6 +5,7 @@ module Unparser
 
     # Emitter for postconditions
     class Post < self
+      include Unterminated
 
       handle :while_post, :until_post
 
@@ -32,6 +33,7 @@ module Unparser
 
     # Base class for while and until emitters
     class Repetition < self
+      include Terminated
 
       MAP = {
         while: K_WHILE,
@@ -87,7 +89,7 @@ module Unparser
       #
       def emit_normal
         emit_keyword
-        visit_terminated(condition)
+        visit(condition)
         emit_body
         k_end
       end
@@ -99,10 +101,10 @@ module Unparser
       # @api private
       #
       def emit_postcontrol
-        visit(body)
+        visit_plain(body)
         ws
         emit_keyword
-        visit(condition)
+        visit_plain(condition)
       end
 
     end # Repetition

data/lib/unparser/emitter/resbody.rb

@@ -19,8 +19,8 @@ module Unparser
         # @api private
         #
         def dispatch
-          write(K_RESCUE)
-          parentheses { visit(body) }
+          write(K_RESCUE, WS)
+          visit_plain(body)
         end
 
         # Emit exception

data/lib/unparser/emitter/rescue.rb

@@ -4,6 +4,7 @@ module Unparser
   class Emitter
     # Emitter for rescue nodes
     class Rescue < self
+      include Unterminated
 
       handle :rescue
 
@@ -56,7 +57,7 @@ module Unparser
       # @api private
       #
       def emit_standalone
-        visit(body)
+        visit_plain(body)
         ws
         run(Resbody::Standalone, rescue_body)
       end

data/lib/unparser/emitter/retry.rb

@@ -4,6 +4,7 @@ module Unparser
   class Emitter
     # Emitter for retry nodes
     class Retry < self
+      include Terminated
 
       handle :retry
 

data/lib/unparser/emitter/send.rb

@@ -16,17 +16,8 @@ module Unparser
 
       children :receiver, :selector
 
-      # Test for terminated expression
-      #
-      # @return [Boolean]
-      #
-      # @api private
-      #
       def terminated?
-        [
-          Index::Reference,
-          Regular
-        ].include?(effective_emitter)
+        effective_emitter.terminated?
       end
 
     private
@@ -38,16 +29,26 @@ module Unparser
       # @api private
       #
       def dispatch
-        effective_emitter.new(node, parent).write_to_buffer
+        effective_emitter.write_to_buffer
       end
 
       # Return effective emitter
       #
-      # @return [Class: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
         case selector
         when INDEX_REFERENCE
           Index::Reference
@@ -57,7 +58,6 @@ module Unparser
           non_index_emitter
         end
       end
-      memoize :effective_emitter
 
       # Return non index emitter
       #
@@ -86,7 +86,6 @@ module Unparser
       def string_selector
         selector.to_s
       end
-      memoize :string_selector
 
       # Test for unary operator implemented as method
       #

data/lib/unparser/emitter/send/arguments.rb

@@ -3,7 +3,6 @@
 module Unparser
   class Emitter
     class Send
-
       # Emitter for arguments of send nodes
       class Arguments < Emitter
 
@@ -19,7 +18,7 @@ module Unparser
           return if children.empty?
 
           parentheses do
-            delimited(effective_arguments)
+            delimited_plain(effective_arguments)
           end
         end
 

data/lib/unparser/emitter/send/attribute_assignment.rb

@@ -5,6 +5,7 @@ module Unparser
     class Send
       # Emitter for send as attribute assignment
       class AttributeAssignment < self
+        include Unterminated
 
         # Perform regular dispatch
         #
@@ -16,7 +17,7 @@ module Unparser
           emit_receiver
           emit_attribute
           emit_operator
-          visit_terminated(arguments.first)
+          visit(arguments.first)
         end
 
       private
@@ -28,7 +29,7 @@ module Unparser
         # @api private
         #
         def emit_receiver
-          visit_terminated(receiver)
+          visit(receiver)
           write(T_DOT)
         end
 

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

@@ -5,6 +5,7 @@ module Unparser
     class Send
       # Emitter for binary sends
       class Binary < self
+        include Unterminated
 
       private
 
@@ -15,7 +16,7 @@ module Unparser
         # @api private
         #
         def dispatch
-          visit_terminated(receiver)
+          visit(receiver)
           emit_operator
           emit_right
         end
@@ -47,7 +48,7 @@ module Unparser
         # @api private
         #
         def emit_right
-          visit_terminated(right_node)
+          visit(right_node)
         end
 
       end # Binary

data/lib/unparser/emitter/send/index.rb

@@ -26,11 +26,12 @@ module Unparser
         # @api private
         #
         def emit_receiver
-          visit_terminated(first_child)
+          visit(first_child)
         end
 
         # Emitter for index reference nodes
         class Reference < self
+          include Terminated
 
         private
 
@@ -42,13 +43,26 @@ module Unparser
           #
           def emit_operation
             parentheses(*INDEX_PARENS) do
-              delimited(arguments)
+              delimited_plain(arguments)
             end
           end
         end # Reference
 
         # Emitter for assign to index nodes
         class Assign < self
+          include Unterminated
+
+          # Test if assign will be emitted terminated
+          #
+          # @return [Boolean]
+          #
+          # @api private
+          #
+          def terminated?
+            mlhs?
+          end
+
+        private
 
           define_group(:indices, 2..-2)
           define_child(:value, -1)

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

@@ -5,6 +5,7 @@ module Unparser
     class Send
       # Emitter for "regular" receiver.selector(arguments...) case
       class Regular < self
+        include Terminated
 
       private
 
@@ -28,7 +29,7 @@ module Unparser
         #
         def emit_receiver
           return unless first_child
-          visit_terminated(receiver)
+          visit(receiver)
           write(T_DOT)
         end
 

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

@@ -5,6 +5,7 @@ module Unparser
     class Send
       # Emitter for unary sends
       class Unary < self
+        include Unterminated
 
       private
 
@@ -26,7 +27,7 @@ module Unparser
             write('+')
           end
 
-          visit_terminated(receiver)
+          visit(receiver)
         end
 
       end # Unary

data/lib/unparser/emitter/splat.rb

@@ -4,6 +4,7 @@ module Unparser
   class Emitter
     # Emitter for splats
     class KwSplat < self
+      include Terminated
 
       handle :kwsplat
 
@@ -25,6 +26,7 @@ module Unparser
 
     # Emitter for splats
     class Splat < self
+      include Terminated
 
       handle :splat
 

data/lib/unparser/emitter/super.rb

@@ -5,6 +5,7 @@ module Unparser
 
     # Emitter for zsuper nodes
     class ZSuper < self
+      include Terminated
 
       handle :zsuper
 
@@ -24,6 +25,7 @@ module Unparser
 
     # Emitter for super nodes
     class Super < self
+      include Terminated
 
       handle :super
 

data/lib/unparser/emitter/undef.rb

@@ -4,6 +4,7 @@ module Unparser
   class Emitter
     # Emitter for undef nodes
     class Undef < self
+      include Unterminated
 
       handle :undef
 

data/lib/unparser/emitter/variable.rb

@@ -5,6 +5,7 @@ module Unparser
 
     # Emitter for various variable accesses
     class Variable < self
+      include Terminated
 
       handle :ivar, :lvar, :cvar, :gvar, :back_ref
 
@@ -26,6 +27,7 @@ module Unparser
 
     # Emitter for constant access
     class Const < self
+      include Terminated
 
       handle :const
 
@@ -59,6 +61,8 @@ module Unparser
 
     # Emitter for nth_ref nodes (regexp captures)
     class NthRef < self
+      include Terminated
+
       PREFIX = '$'.freeze
       handle :nth_ref
 

data/lib/unparser/emitter/yield.rb

@@ -5,6 +5,7 @@ module Unparser
 
     # Emitter for yield node
     class Yield < self
+      include Terminated
 
       handle :yield
 

data/lib/unparser/preprocessor.rb

@@ -3,7 +3,7 @@
 module Unparser
   # Preprocessor to normalize AST generated by parser
   class Preprocessor
-    include Adamantium::Flat, NodeHelpers, AbstractType, Concord.new(:node), Procto.call(:result)
+    include Adamantium::Flat, NodeHelpers, AbstractType, Concord.new(:node, :parent_type), Procto.call(:result)
 
     # Return preprocessor result
     #
@@ -23,10 +23,10 @@ module Unparser
     #
     # @api private
     #
-    def self.run(node)
+    def self.run(node, parent_type = nil)
       return EMPTY if node.nil?
       REGISTRY.fetch(node.type, [Noop]).reduce(node) do |current, processor|
-        processor.call(current)
+        processor.call(current, parent_type)
       end
     end
 
@@ -49,14 +49,14 @@ module Unparser
 
     # Visit node
     #
-    # @param [Parser::AST::Node]
+    # @param [Parser::AST::Node] child
     #
     # @return [undefined]
     #
     # @api private
     #
-    def visit(node)
-      self.class.run(node)
+    def visit(child)
+      self.class.run(child, node.type)
     end
 
     # Return children
@@ -77,7 +77,7 @@ module Unparser
     #
     def visited_children
       children.map do |node|
-        if node.kind_of?(Parser::AST::Node)
+        if node.is_a?(Parser::AST::Node)
           visit(node)
         else
           node
@@ -155,6 +155,12 @@ module Unparser
     class CompactDSTR < self
 
       register :dstr
+      register :dsym
+
+      MAP = IceNine.deep_freeze(
+        dstr: :str,
+        dsym: :sym
+      )
 
       # Return preprocessor result
       #
@@ -163,8 +169,8 @@ module Unparser
       # @api private
       #
       def result
-        if children.all? { |child| child.type.equal?(:str) }
-          node.updated(:str, [children.map { |child| child.children.first }.join])
+        if children.any? && children.all? { |child| child.type.equal?(:str) }
+          node.updated(MAP.fetch(node.type), [children.map { |child| child.children.first }.join])
         else
           node
         end
@@ -201,7 +207,8 @@ module Unparser
 
     # Preprocessor for begin nodes. Removes begin nodes with one child.
     #
-    # These superflownosely currently get generated by unparser.
+    # This reduces the amount of complex logic needed inside unparser to emit "nice" syntax with minimal
+    # tokens.
     #
     class Begin < self
 
@@ -214,10 +221,10 @@ module Unparser
       # @api private
       #
       def result
-        if children.one?
+        if children.one? && !parent_type.equal?(:regexp)
           visit(children.first)
         else
-          Noop.call(node)
+          Noop.call(node, parent_type)
         end
       end