unparser 0.1.7 → 0.1.8

data/lib/unparser/emitter/literal/dynamic.rb

@@ -20,7 +20,7 @@ module Unparser
           if interpolation?
             visit_parentheses(dynamic_body, util::OPEN, util::CLOSE)
           else
-            delimited(children, WS)
+            emit_non_interpolated
           end
         end
 
@@ -54,6 +54,18 @@ module Unparser
           OPEN = CLOSE = '"'.freeze
           handle :dstr
 
+        private
+
+          # Emit non interpolated form
+          #
+          # @return [undefined]
+          #
+          # @api private
+          #
+          def emit_non_interpolated
+            delimited(children, WS)
+          end
+
         end # String
 
         # Dynamic symbol literal emitter
@@ -64,6 +76,18 @@ module Unparser
 
           handle :dsym
 
+        private
+
+          # Emit non interpolated form
+          #
+          # @return [undefined]
+          #
+          # @api private
+          #
+          def emit_non_interpolated
+            visit_parentheses(dynamic_body, OPEN, CLOSE)
+          end
+
         end # Symbol
 
       end

data/lib/unparser/emitter/literal/hash.rb

@@ -45,7 +45,7 @@ module Unparser
           #
           def dispatch
             write(key.children.first.to_s, COLON)
-            visit(value)
+            visit_terminated(value)
           end
 
         end # Colon
@@ -82,9 +82,9 @@ module Unparser
           children.map do |pair|
             key, _value = *pair
             if key.type == :sym && key.children.first.to_s =~ BAREWORD
-              s(:pair_colon, pair.children)
+              n(:pair_colon, pair.children)
             else
-              s(:pair_rocket, pair.children)
+              n(:pair_rocket, pair.children)
             end
           end
         end

data/lib/unparser/emitter/literal/primitive.rb

@@ -14,7 +14,7 @@ module Unparser
         # Emitter for primitives based on Object#inspect
         class Inspect < self
 
-          handle :float, :int, :sym
+          handle :sym, :str
 
         private
 
@@ -30,64 +30,26 @@ module Unparser
 
         end # Inspect
 
-        # Literal emitter with macro regeneration base class
-        class MacroSafe < self
+        # Emiter for numeric literals
+        class Numeric < self
+
+          handle :int, :float
 
         private
 
-          # Perform dispatch
+          # Dispatch value
           #
           # @return [undefined]
           #
           # @api private
           #
           def dispatch
-            if source == macro
-              write(macro)
-              return
+            conditional_parentheses(parent.kind_of?(Emitter::Send) && value < 0) do
+              write(value.inspect)
             end
-            write(value.inspect)
-          end
-
-          # Return source, if present
-          #
-          # @return [String]
-          #   if present
-          #
-          # @return [nil]
-          #   otherwise
-          #
-          # @api private
-          #
-          def source
-            location = node.location || return
-            expression = location.expression || return
-            expression.source
           end
 
-          # Return marco
-          #
-          # @return [String]
-          #
-          # @api private
-          #
-          def macro
-            self.class::MACRO
-          end
-
-          # String macro safe emitter
-          class String < self
-            MACRO = '__FILE__'.freeze
-            handle :str
-          end # String
-
-          # Integer macro safe emitter
-          class Integer < self
-            MACRO = '__LINE__'.freeze
-            handle :int
-          end # Integer
-
-        end # MacroSave
+        end # Numeric
       end # Primitive
     end # Literal
   end # Emitter

data/lib/unparser/emitter/literal/regexp.rb

@@ -7,6 +7,7 @@ module Unparser
       # Emitter for regexp literals
       class Regexp < self
         DELIMITER = '/'.freeze
+        ESCAPED_DELIMITER = '\/'.freeze
 
         handle :regexp
 
@@ -50,7 +51,7 @@ module Unparser
           when :str
             buffer.append_without_prefix(escape(node).children.first)
           else
-            visit(s(:interpolated, [node]))
+            visit(s(:interpolated, node))
           end
         end
 
@@ -78,28 +79,16 @@ module Unparser
 
         # Return escaped child
         #
+        # @param [Parser::AST::Node] child
+        #
         # @return [Parser::AST::Node]
         #
         # @api private
         #
         def escape(child)
-          return child unless child.type == :str
           source = child.children.first
-          Parser::AST::Node.new(:str, [Unparser.transquote(source, delimiter, DELIMITER)])
-        end
-
-        # Return closing delimiter
-        #
-        # @return [String]
-        #
-        # @api private
-        #
-        def delimiter
-          location = node.location
-          return DELIMITER unless location
-          location.end.source[-1]
+          s(:str, source.gsub(DELIMITER, ESCAPED_DELIMITER))
         end
-        memoize :delimiter
 
       end # Regexp
 

data/lib/unparser/emitter/module.rb

@@ -4,6 +4,7 @@ module Unparser
   class Emitter
     # Emitter for module nodes
     class Module < self
+      include LocalVariableRoot
 
       handle :module
 

data/lib/unparser/emitter/repetition.rb

@@ -51,12 +51,64 @@ module Unparser
       # @api private
       #
       def dispatch
+        if postcontrol?
+          emit_postcontrol
+        else
+          emit_normal
+        end
+      end
+
+      # Test for postcontrol
+      #
+      # @return [true]
+      #   if repetition must be emitted as post control
+      #
+      # @return [false]
+      #   otherwise
+      #
+      # @api private
+      #
+      def postcontrol?
+        return false unless body
+        AST.first_assignment_in_body_and_used_in_condition?(local_variable_root, body, condition)
+      end
+
+      # Emit keyword
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def emit_keyword
         write(MAP.fetch(node.type), WS)
+      end
+
+      # Emit embedded
+      #
+      # @return [undefned]
+      #
+      # @api private
+      #
+      def emit_normal
+        emit_keyword
         visit(condition)
         emit_body
         k_end
       end
 
+      # Emit postcontrol
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def emit_postcontrol
+        visit(body)
+        ws
+        emit_keyword
+        visit(condition)
+      end
+
     end # Repetition
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/resbody.rb

@@ -7,10 +7,9 @@ module Unparser
 
         children :exception, :assignment, :body
 
+      # Emitter for resbody in standalone form
       class Standalone < self
 
-        handle :resbody
-
       private
 
         # Perform dispatch
@@ -49,8 +48,11 @@ module Unparser
         end
       end
 
+      # Emitter for resbody in keyworkd-embedded form
       class Embedded < self
 
+        handle :resbody
+
       private
 
         # Perform dispatch

data/lib/unparser/emitter/rescue.rb

@@ -13,6 +13,8 @@ module Unparser
 
       EMBEDDED_TYPES = [:def, :defs, :kwbegin, :ensure].to_set.freeze
 
+      NOINDENT_STANDALONE_RESCUE = [:root, :begin, :pair_rocket, :pair_colon, :lvasgn, :ivasgn].to_set.freeze
+
     private
 
       # Perform dispatch
@@ -23,7 +25,11 @@ module Unparser
       #
       def dispatch
         if standalone?
-          emit_standalone
+          if NOINDENT_STANDALONE_RESCUE.include?(parent_type)
+            emit_standalone
+          else
+            indented { emit_standalone }
+          end
         else
           emit_embedded
         end
@@ -40,7 +46,11 @@ module Unparser
       # @api private
       #
       def standalone?
-        !EMBEDDED_TYPES.include?(parent_type) && body
+        if parent_type == :ensure
+          !parent.node.children.first.equal?(node)
+        else
+          !EMBEDDED_TYPES.include?(parent_type) && body
+        end
       end
 
       # Emit standalone form

data/lib/unparser/emitter/root.rb

@@ -4,17 +4,8 @@ module Unparser
   class Emitter
     # Root emitter a special case
     class Root < self
-      include Concord::Public.new(:buffer, :comments)
-
-      # Return root node type
-      #
-      # @return [nil]
-      #
-      # @api private
-      #
-      def node_type
-        nil
-      end
+      include Concord::Public.new(:node, :buffer, :comments)
+      include LocalVariableRoot
 
     end # Root
   end # Emitter

data/lib/unparser/emitter/send.rb

@@ -30,7 +30,6 @@ module Unparser
       #
       def terminated?
         [
-          Unary,
           Index::Reference,
           Regular
         ].include?(effective_emitter)
@@ -212,7 +211,25 @@ module Unparser
       # @api private
       #
       def emit_arguments
-        run(Arguments, s(:arguments, arguments))
+        if arguments.empty? && receiver.nil? && local_variable_clash?
+          write('()')
+        else
+          run(Arguments, n(:arguments, arguments))
+        end
+      end
+
+      # Test for local variable clash
+      #
+      # @return [true]
+      #   if selector clashes with a local variable
+      #
+      # @return [false]
+      #   otherwise
+      #
+      # @api private
+      #
+      def local_variable_clash?
+        AST.local_variable_defined_for_node?(local_variable_root, node, selector)
       end
 
     end # Send

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

@@ -57,13 +57,51 @@ module Unparser
           # @api private
           #
           def emit_arguments
-            index, *assignment = arguments
+            case arguments.length
+            when 0
+              emit_regular_with_empty_args
+            when 1
+              emit_mlhs_arguments
+            else
+              emit_normal_arguments
+            end
+          end
+
+          # Emit mlhs arguments
+          #
+          # @return [undefined]
+          #
+          # @api private
+          #
+          def emit_mlhs_arguments
             parentheses(*INDEX_PARENS) do
-              delimited([index])
+              delimited(arguments)
+            end
+          end
+
+          # Emit normal arguments
+          #
+          # @return [undefined]
+          #
+          # @api private
+          #
+          def emit_normal_arguments
+            *indices, value = arguments
+            parentheses(*INDEX_PARENS) do
+              delimited(indices)
             end
-            return if assignment.empty? # mlhs
             write(WS, T_ASN, WS)
-            delimited(assignment)
+            visit(value)
+          end
+
+          # Emit regular with empty ars
+          #
+          # @return [undefined]
+          #
+          # @api private
+          #
+          def emit_regular_with_empty_args
+            write(T_DOT, '[]=()')
           end
 
         end # Assign

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

@@ -22,6 +22,10 @@ module Unparser
         def dispatch
           name = selector
           write(MAP.fetch(name, name).to_s)
+          if receiver.type == :int && selector == :'+@' && receiver.children.first > 0
+            write('+')
+          end
+
           visit_terminated(receiver)
         end