unparser 0.1.5 → 0.1.6

data/lib/unparser/constants.rb

@@ -1,18 +1,22 @@
+# encoding: utf-8
+
 module Unparser
   # All unparser constants maybe included in other libraries.
   module Constants
 
+    # All unary operators of the ruby language
     UNARY_OPERATORS = %w(
       ! ~ -@ +@
     ).map(&:to_sym).to_set
 
+    # All binary operators of the ruby language
     BINARY_OPERATORS = %w(
       + - * / & | && || << >> ==
       === != <= < <=> > >= =~ !~ ^
       ** %
     ).map(&:to_sym).to_set
 
-    COMMENT = '#'.freeze
+    COMMENT = '#'
 
     WS       = ' '
     NL       = "\n"
@@ -34,6 +38,10 @@ module Unparser
     M_PO  = '('
     M_PC  = ')'
 
+    SNGL_QUOTE = "'"
+    DBL_QUOTE  = '"'
+
+    # Keywords
     K_DO       = 'do'
     K_DEF      = 'def'
     K_END      = 'end'
@@ -77,12 +85,16 @@ module Unparser
     K_FILE     = '__FILE__'
     K_THEN     = 'then'
 
-    TERMINATED = [
-      :int, :float, :self, :kwbegin, :const, :regexp, :args, :lvar,
-      :ivar, :gvar, :cvar, :if, :case, :module, :class, :sclass, :super,
-      :yield, :zsuper, :break, :next, :defined?, :str, :block, :while, :loop, :until,
-      :def, :defs, :true, :false, :nil, :array, :hash, :sym, :return
-    ].to_set
+    # Nodes that can be emitted in tokens that terminate their expression.
+    #
+    # These nodes dont require parentheses to be exactly reproduced in context of a more complex expression.
+    #
+    TERMINATED = %w(
+      int float self kwbegin const regexp args lvar
+      ivar gvar cvar if case module class sclass super
+      yield zsuper break next defined? str block while loop until
+      def defs true false nil array hash sym return
+    ).map(&:to_sym).to_set
 
     KEYWORDS = constants.each_with_object([]) do |name, keywords|
       value = const_get(name).freeze

data/lib/unparser/emitter.rb

@@ -1,8 +1,10 @@
+# encoding: utf-8
+
 module Unparser
 
   # Emitter base class
   class Emitter
-    include Adamantium::Flat, AbstractType, Constants
+    include Adamantium::Flat, AbstractType, Constants, NodeHelpers
     include Concord.new(:node, :parent)
 
     # Registry for node emitters
@@ -14,6 +16,16 @@ module Unparser
 
     CURLY_BRACKETS = IceNine.deep_freeze(%w({ }))
 
+    # Return node type
+    #
+    # @return [Symbol]
+    #
+    # @api private
+    #
+    def node_type
+      node.type
+    end
+
     # Define remaining children
     #
     # @param [Enumerable<Symbol>] names
@@ -201,7 +213,6 @@ module Unparser
       conditional_parentheses(!emitter.terminated?) do
         emitter.write_to_buffer
       end
-      emitter.write_to_buffer
     end
 
     # Visit within parentheses
@@ -256,10 +267,12 @@ module Unparser
     # @api private
     #
     def delimited(nodes, delimiter = DEFAULT_DELIMITER)
-      max = nodes.length - 1
-      nodes.each_with_index do |node, index|
+      return if nodes.empty?
+      head, *tail = nodes
+      visit(head)
+      tail.each do |node|
+        write(delimiter)
         visit(node)
-        write(delimiter) if index < max
       end
     end
 
@@ -456,34 +469,19 @@ module Unparser
     # @api private
     #
     def parent_type
-      parent && parent.node && parent.node.type
+      parent.node_type
     end
 
-    # Helper for building nodes
+    # Delegate to emitter
     #
-    # @param [Symbol]
-    #
-    # @return [Parser::AST::Node]
-    #
-    # @api private
-    #
-    def s(type, *children)
-      Parser::AST::Node.new(type, *children)
-    end
-
-    # Helper to introduce an end-of-line comment
+    # @param [Class:Emitter] emitter
     #
     # @return [undefined]
     #
     # @api private
     #
-    def eol_comment
-      write(WS)
-      comment = buffer.capture_content do
-        write(COMMENT, WS)
-        yield
-      end
-      comments.skip_eol_comment(comment)
+    def run(emitter, node = node)
+      emitter.new(node, self).write_to_buffer
     end
 
   end # Emitter

data/lib/unparser/emitter/alias.rb

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

data/lib/unparser/emitter/argument.rb

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

data/lib/unparser/emitter/assignment.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
 
@@ -75,7 +77,7 @@ module Unparser
           def emit_left
             if base
               visit(base)
-              write(T_DCL)
+              write(T_DCL) if base.type != :cbase
             end
             write(name.to_s)
           end

data/lib/unparser/emitter/begin.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
 
@@ -15,12 +17,7 @@ module Unparser
       # @api private
       #
       def emit_inner
-        childs = children
-        max = childs.length - 1
-        childs.each_with_index do |child, index|
-          visit(child)
-          nl if index < max
-        end
+        delimited(children, NL)
       end
 
       # Emitter for implicit begins

data/lib/unparser/emitter/binary.rb

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

data/lib/unparser/emitter/block.rb

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

data/lib/unparser/emitter/break.rb

@@ -1,12 +1,12 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     # Emitter for break nodes
-    class Break < self
+    class Break < Return
 
       handle :break
 
-      children :arguments
-
     private
 
       # Perform dispatch
@@ -18,8 +18,7 @@ module Unparser
       def dispatch
         conditional_parentheses(parent_type == :or || parent_type == :and) do
           write(K_BREAK)
-          return unless arguments
-          visit_parentheses(arguments)
+          emit_break_return_arguments
         end
       end
 

data/lib/unparser/emitter/case.rb

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

data/lib/unparser/emitter/cbase.rb

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

data/lib/unparser/emitter/class.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     # Emitter for class nodes
@@ -21,9 +23,6 @@ module Unparser
         emit_superclass
         emit_body
         k_end
-        unless parent_type == :send
-          eol_comment { visit(name) }
-        end
       end
 
       # Emit superclass
@@ -47,6 +46,8 @@ module Unparser
 
       children :object, :body
 
+    private
+
       # Perform dispatch
       #
       # @return [undefined]

data/lib/unparser/emitter/def.rb

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

data/lib/unparser/emitter/defined.rb

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

data/lib/unparser/emitter/empty.rb

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

data/lib/unparser/emitter/ensure.rb

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

data/lib/unparser/emitter/flipflop.rb

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

data/lib/unparser/emitter/for.rb

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

data/lib/unparser/emitter/hookexe.rb

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     # Base class for pre and postexe emitters

data/lib/unparser/emitter/if.rb

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

data/lib/unparser/emitter/literal.rb

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

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

@@ -0,0 +1,33 @@
+# encoding: utf-8
+
+module Unparser
+  class Emitter
+    class Literal
+
+      # Array literal emitter
+      class Array < self
+        OPEN      = '['.freeze
+        CLOSE     = ']'.freeze
+        DELIMITER = ', '.freeze
+
+        handle :array
+
+      private
+
+        # Perform dispatch
+        #
+        # @return [undefined]
+        #
+        # @api private
+        #
+        def dispatch
+          parentheses(OPEN, CLOSE) do
+            delimited(children, DELIMITER)
+          end
+        end
+
+      end # Array
+
+    end # Literal
+  end # Emitter
+end # Unparser

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     class Literal
@@ -15,7 +17,25 @@ module Unparser
         #
         def dispatch
           util = self.class
-          visit_parentheses(dynamic_body, util::OPEN, util::CLOSE)
+          if interpolation?
+            visit_parentheses(dynamic_body, util::OPEN, util::CLOSE)
+          else
+            delimited(children, WS)
+          end
+        end
+
+        # Test for interpolation
+        #
+        # @return [true]
+        #   if dynamic component was interpolated
+        #
+        # @return [false]
+        #   otherwise
+        #
+        # @api private
+        #
+        def interpolation?
+          children.any? { |child| child.type != :str }
         end
 
         # Return dynamic body

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

@@ -1,3 +1,5 @@
+# encoding: utf-8
+
 module Unparser
   class Emitter
     class Literal
@@ -61,9 +63,11 @@ module Unparser
           emit_interpolated_segment(node)
         end
 
-        ESCAPES = IceNine.deep_freeze(
-          "\n" => '\n'
-        )
+        pairs = Parser::Lexer::ESCAPES.invert.map do |key, value|
+          [key, "\\#{value}"] unless key == WS
+        end.compact
+
+        ESCAPES = ::Hash[pairs]
 
         REPLACEMENTS = ::Regexp.union(ESCAPES.keys)
 
@@ -79,8 +83,8 @@ module Unparser
           util = self.class
           string = node.children.first
           segment = string
-            .gsub(util::DELIMITER, util::REPLACEMENT)
             .gsub(REPLACEMENTS, ESCAPES)
+            .gsub(util::DELIMITER, util::REPLACEMENT)
           write(segment)
         end
 
@@ -112,7 +116,7 @@ module Unparser
           handle :dyn_regexp_body
 
           DELIMITER   = '/'.freeze
-          REPLACEMENT = '/'.freeze
+          REPLACEMENT = '\/'.freeze
 
         end # Regexp