unparser 0.1.5 → 0.1.6

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     class Literal

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

@@ -0,0 +1,136 @@
+# encoding: utf-8
+
+module Unparser
+  class Emitter
+    class Literal
+
+      # Abstract namespace class for hash pair emitters
+      class HashPair < self
+
+        # Pair emitter that emits hash-rocket separated key values
+        class Rocket < self
+          HASHROCKET = ' => '.freeze
+
+          handle :pair_rocket, :pair
+
+        private
+
+          # Perform dispatch
+          #
+          # @return [undefined]
+          #
+          # @api private
+          #
+          def dispatch
+            delimited(children, HASHROCKET)
+          end
+
+        end # Rocket
+
+        # Pair emitter that emits colon separated key values
+        class Colon < self
+          COLON      = ': '.freeze
+
+          handle :pair_colon
+
+          children :key, :value
+
+        private
+
+          # Perform dispatch
+          #
+          # @return [undefined]
+          #
+          # @api private
+          #
+          def dispatch
+            write(key.children.first.to_s, COLON)
+            visit(value)
+          end
+
+        end # Colon
+
+      end # HashPair
+
+      # Emitter for hash bodies
+      class HashBody < self
+
+        DELIMITER = ', '.freeze
+        BAREWORD = /\A[A-Za-z_][A-Za-z_0-9]*[?!]?\z/.freeze
+
+        handle :hash_body
+
+      private
+
+        # Perform dispatch
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def dispatch
+          delimited(effective_body, DELIMITER)
+        end
+
+        # Return effective body
+        #
+        # @return [Enumerable<Parser::AST::Node>]
+        #
+        # @api private
+        #
+        def effective_body
+          children.map do |pair|
+            key, _value = *pair
+            if key.type == :sym && key.children.first.to_s =~ BAREWORD
+              s(:pair_colon, pair.children)
+            else
+              s(:pair_rocket, pair.children)
+            end
+          end
+        end
+
+      end # HashBody
+
+      # Emitter for Hash literals
+      class Hash < self
+
+        DELIMITER = ', '.freeze
+        OPEN      = '{'.freeze
+        CLOSE     = '}'.freeze
+
+        handle :hash
+
+      private
+
+        # Perform dispatch
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def dispatch
+          if children.empty?
+            write(OPEN, CLOSE)
+          else
+            emit_hash_body
+          end
+        end
+
+        # Emit hash body
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def emit_hash_body
+          parentheses(OPEN, CLOSE) do
+            write(WS)
+            run(HashBody)
+            write(WS)
+          end
+        end
+
+      end # Hash
+    end # Literal
+  end # Emitter
+end # Unparser

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     class Literal
@@ -12,7 +14,7 @@ module Unparser
         # Emitter for primitives based on Object#inspect
         class Inspect < self
 
-          handle :float, :sym, :int
+          handle :float, :int, :sym
 
         private
 
@@ -23,7 +25,7 @@ module Unparser
           # @api private
           #
           def dispatch
-            buffer.append(value.inspect)
+            write(value.inspect)
           end
 
         end # Inspect

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     class Literal

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     class Literal
@@ -46,7 +48,7 @@ module Unparser
         def write_body(node)
           case node.type
           when :str
-            write(escape(node).children.first)
+            buffer.append_without_prefix(escape(node).children.first)
           else
             visit(s(:interpolated, [node]))
           end
@@ -95,7 +97,7 @@ module Unparser
         def delimiter
           location = node.location
           return DELIMITER unless location
-          location.expression.source[-1]
+          location.end.source[-1]
         end
         memoize :delimiter
 

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     class Literal

data/lib/unparser/emitter/match.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
 

data/lib/unparser/emitter/module.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     # Emitter for module nodes
@@ -20,9 +22,6 @@ module Unparser
         visit(name)
         emit_body
         k_end
-        if parent_type != :send
-          eol_comment { visit(name) }
-        end
       end
 
     end # Module

data/lib/unparser/emitter/next.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     # Emitter for next nodes

data/lib/unparser/emitter/op_assign.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
 
@@ -24,7 +26,7 @@ module Unparser
       def dispatch
         visit(target)
         write(WS, MAP.fetch(node.type), WS)
-        visit(expression)
+        visit_terminated(expression)
       end
 
     end # BinaryAssign

data/lib/unparser/emitter/redo.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     # Emitter for redo nodes

data/lib/unparser/emitter/repetition.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
 

data/lib/unparser/emitter/resbody.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     # Emitter for rescue body nodes

data/lib/unparser/emitter/rescue.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     # Emitter for rescue nodes

data/lib/unparser/emitter/retry.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     # Emitter for retry nodes

data/lib/unparser/emitter/return.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     # Emitter for return nodes
@@ -5,8 +7,6 @@ module Unparser
 
       handle :return
 
-      children :argument
-
     private
 
       # Perform dispatch
@@ -17,8 +17,23 @@ module Unparser
       #
       def dispatch
         write(K_RETURN)
-        return unless argument
-        visit_parentheses(argument)
+        emit_break_return_arguments
+      end
+
+      # Emit break or return arguments
+      #
+      # @return [undefined]
+      #
+      # @api private
+      #
+      def emit_break_return_arguments
+        return if children.empty?
+        head, *tail = children
+        parentheses { visit(head) }
+        tail.each do |node|
+          write(DEFAULT_DELIMITER)
+          parentheses { visit(node) }
+        end
       end
 
     end # Return

data/lib/unparser/emitter/root.rb

@@ -1,8 +1,21 @@
+# encoding: utf-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
+
     end # Root
   end # Emitter
 end # Unparser

data/lib/unparser/emitter/send.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     # Emitter for send
@@ -71,10 +73,12 @@ module Unparser
       # @api private
       #
       def non_index_emitter
-        if binary?
+        if binary_operator?
           Binary
-        elsif unary?
+        elsif unary_operator?
           Unary
+        elsif attribute_assignment?
+          AttributeAssignment
         else
           Regular
         end
@@ -91,18 +95,6 @@ module Unparser
       end
       memoize :string_selector
 
-      # Delegate to emitter
-      #
-      # @param [Class:Emitter] emitter
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def run(emitter)
-        emitter.new(node, self).write_to_buffer
-      end
-
       # Test for unary operator implemented as method
       #
       # @return [true]
@@ -113,7 +105,7 @@ module Unparser
       #
       # @api private
       #
-      def unary?
+      def unary_operator?
         UNARY_OPERATORS.include?(selector)
       end
 
@@ -127,8 +119,8 @@ module Unparser
       #
       # @api private
       #
-      def binary?
-        BINARY_OPERATORS.include?(selector) && arguments.length == 1 && arguments.first.type != :splat
+      def binary_operator?
+        BINARY_OPERATORS.include?(selector) && arguments.one? && arguments.first.type != :splat
       end
 
       # Emit selector
@@ -161,6 +153,8 @@ module Unparser
 
       # Test for assignment
       #
+      # FIXME: This also returns true for <= operator!
+      #
       # @return [true]
       #   if node represents attribute / element assignment
       #
@@ -173,6 +167,19 @@ module Unparser
         string_selector[-1] == ASSIGN_SUFFIX
       end
 
+      # Test for attribute assignment
+      #
+      # @return [true]
+      #   if node represetns and attribute assignment
+      #
+      # @return [false]
+      #
+      # @api private
+      #
+      def attribute_assignment?
+        !BINARY_OPERATORS.include?(selector) && !UNARY_OPERATORS.include?(selector) && assignment? && !mlhs?
+      end
+
       # Test for empty arguments
       #
       # @return [true]
@@ -196,6 +203,7 @@ module Unparser
       def arguments
         children[2..-1]
       end
+      memoize :arguments
 
       # Emit arguments
       #
@@ -204,11 +212,7 @@ module Unparser
       # @api private
       #
       def emit_arguments
-        args = arguments
-        return if args.empty?
-        parentheses do
-          delimited(args)
-        end
+        run(Arguments, s(:arguments, arguments))
       end
 
     end # Send