unparser 0.1.15 → 0.1.16

data/lib/unparser/emitter/binary.rb

@@ -4,6 +4,7 @@ module Unparser
   class Emitter
     # Base class for binary emitters
     class Binary < self
+      include Unterminated
 
       children :left, :right
 
@@ -14,16 +15,6 @@ module Unparser
 
       handle(*MAP.keys)
 
-      # Test if expression is terminated
-      #
-      # @return [false]
-      #
-      # @api private
-      #
-      def terminated?
-        false
-      end
-
     private
 
       # Perform dispatch
@@ -33,9 +24,9 @@ module Unparser
       # @api private
       #
       def dispatch
-        visit_terminated(left)
+        visit(left)
         write(WS, MAP.fetch(node.type), WS)
-        visit_terminated(right)
+        visit(right)
       end
 
     end # Binary

data/lib/unparser/emitter/block.rb

@@ -5,6 +5,7 @@ module Unparser
 
     # Block emitter
     class Block < self
+      include Terminated
 
       handle :block
 

data/lib/unparser/emitter/case.rb

@@ -4,6 +4,7 @@ module Unparser
   class Emitter
     # Emitter for case nodes
     class Case < self
+      include Terminated
 
       handle :case
 
@@ -59,17 +60,18 @@ module Unparser
       def emit_condition
         return unless condition
         write(WS)
-        visit_terminated(condition)
+        visit(condition)
       end
 
     end # Case
 
     # Emitter for when nodes
     class When < self
+      include Terminated
 
       handle :when
 
-      define_group :captures, 0 .. -2
+      define_group :captures, 0..-2
 
     private
 

data/lib/unparser/emitter/cbase.rb

@@ -4,6 +4,7 @@ module Unparser
   class Emitter
     # Emitter for toplevel constant reference nodes
     class CBase < self
+      include Terminated
 
       handle :cbase
 

data/lib/unparser/emitter/class.rb

@@ -4,7 +4,7 @@ module Unparser
   class Emitter
     # Emitter for class nodes
     class Class < self
-      include LocalVariableRoot
+      include LocalVariableRoot, Terminated
 
       handle :class
 
@@ -42,6 +42,7 @@ module Unparser
 
     # Emitter for sclass nodes
     class SClass  < self
+      include Terminated
 
       handle :sclass
 

data/lib/unparser/emitter/def.rb

@@ -4,7 +4,7 @@ module Unparser
   class Emitter
     # Emitter for def node
     class Def < self
-      include LocalVariableRoot
+      include LocalVariableRoot, Terminated
 
     private
 

data/lib/unparser/emitter/defined.rb

@@ -4,6 +4,7 @@ module Unparser
   class Emitter
     # Emitter for defined? nodes
     class Defined < self
+      include Terminated
 
       handle :defined?
 
@@ -20,7 +21,7 @@ module Unparser
       def dispatch
         write(K_DEFINED)
         parentheses do
-          visit_terminated(subject)
+          visit(subject)
         end
       end
 

data/lib/unparser/emitter/flipflop.rb

@@ -4,6 +4,7 @@ module Unparser
   class Emitter
     # Emitter for flip flops
     class FlipFlop < self
+      include Unterminated
 
       MAP = IceNine.deep_freeze(
         iflipflop: '..',
@@ -23,9 +24,9 @@ module Unparser
       # @api private
       #
       def dispatch
-        visit_terminated(left)
+        visit(left)
         write(MAP.fetch(node.type))
-        visit_terminated(right)
+        visit(right)
       end
     end # FlipFLop
   end # Emitter

data/lib/unparser/emitter/flow_modifier.rb

@@ -13,6 +13,10 @@ module Unparser
 
       handle(*MAP.keys)
 
+      def terminated?
+        children.empty?
+      end
+
     private
 
       # Perform dispatch
@@ -22,9 +26,13 @@ module Unparser
       # @api private
       #
       def dispatch
-        conditional_parentheses((parent_type.equal?(:or) || parent_type.equal?(:and)) && children.any?) do
-          write(MAP.fetch(node.type))
-          emit_arguments if children.any?
+        write(MAP.fetch(node.type))
+        case children.length
+        when 0
+        when 1
+          emit_single_argument
+        else
+          emit_arguments
         end
       end
 
@@ -53,8 +61,17 @@ module Unparser
       # @api private
       #
       def emit_argument(node)
-        conditional_parentheses(PARENS.include?(node.type)) do
-          visit(node)
+        visit_plain(node)
+      end
+
+      # Emit single argument
+      #
+      # @api private
+      #
+      def emit_single_argument
+        ws
+        conditional_parentheses(PARENS.include?(first_child.type)) do
+          visit_plain(first_child)
         end
       end
 

data/lib/unparser/emitter/for.rb

@@ -4,6 +4,7 @@ module Unparser
   class Emitter
     # Emitter for for nodes
     class For < self
+      include Terminated
 
       handle :for
 
@@ -31,7 +32,7 @@ module Unparser
       # @api private
       #
       def emit_condition
-        visit(condition)
+        visit_plain(condition)
         write(WS, K_IN, WS)
         visit(assignment)
         write(WS, K_DO)

data/lib/unparser/emitter/if.rb

@@ -4,11 +4,14 @@ module Unparser
   class Emitter
     # Emitter if nodes
     class If < self
-
       handle :if
 
       children :condition, :if_branch, :else_branch
 
+      def terminated?
+        !postcondition?
+      end
+
     private
 
       # Perform dispatch
@@ -46,7 +49,7 @@ module Unparser
       # @api private
       #
       def emit_postcondition
-        visit(if_branch || else_branch)
+        visit_plain(if_branch || else_branch)
         write(WS, keyword, WS)
         emit_condition
       end
@@ -92,7 +95,11 @@ module Unparser
       # @api private
       #
       def emit_condition
-        visit_terminated(condition)
+        if condition.type.equal?(:match_current_line)
+          visit_plain(condition)
+        else
+          visit(condition)
+        end
       end
 
       # Emit if branch

data/lib/unparser/emitter/literal.rb

@@ -4,6 +4,7 @@ module Unparser
   class Emitter
     # Namespace class for literal emiters
     class Literal < self
+      include Terminated
     end # Literal
   end # Emitter
 end # Unparser

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

@@ -27,7 +27,7 @@ module Unparser
           #
           def dispatch
             write(OPEN)
-            visit(subject)
+            visit_plain(subject)
             write(CLOSE)
           end
 

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

@@ -20,7 +20,7 @@ module Unparser
         def emit_value
           value_type = value.type
           conditional_parentheses(value_type.equal?(:if)) do
-            visit_terminated(value)
+            visit(value)
           end
         end
 

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

@@ -28,6 +28,88 @@ module Unparser
 
         end # Inspect
 
+        # Emitter for complex literals
+        class Complex < self
+
+          handle :complex
+
+          RATIONAL_FORMAT = 'i'.freeze
+
+          MAP = IceNine.deep_freeze(
+            Float    => :float,
+            Rational => :rational,
+            Fixnum   => :int,
+            Bignum   => :int
+          )
+
+        private
+
+          # Dispatch value
+          #
+          # @return [undefined]
+          #
+          def dispatch
+            emit_imaginary
+            write(RATIONAL_FORMAT)
+          end
+
+          # Emit imaginary component
+          #
+          # @return [undefined]
+          #
+          # @api private
+          #
+          def emit_imaginary
+            visit(imaginary_node)
+          end
+
+          # Return imaginary node
+          #
+          # @return [Parser::AST::Node]
+          #
+          # @api private
+          #
+          def imaginary_node
+            imaginary = value.imaginary
+            s(MAP.fetch(imaginary.class), imaginary)
+          end
+
+        end # Rational
+
+        # Emitter for rational literals
+        class Rational < self
+
+          handle :rational
+
+          RATIONAL_FORMAT = 'r'.freeze
+
+        private
+
+          # Dispatch value
+          #
+          # @return [undefined]
+          #
+          def dispatch
+            integer = value.to_i
+            float   = value.to_f
+
+            write_rational(integer.to_f.equal?(float) ? integer : float)
+          end
+
+          # Write rational format
+          #
+          # @param [#to_s]
+          #
+          # @return [undefined]
+          #
+          # @api private
+          #
+          def write_rational(value)
+            write(value.to_s, RATIONAL_FORMAT)
+          end
+
+        end # Rational
+
         # Emiter for numeric literals
         class Numeric < self
 
@@ -42,7 +124,7 @@ module Unparser
           # @api private
           #
           def dispatch
-            conditional_parentheses(parent.kind_of?(Emitter::Send) && value < 0) do
+            conditional_parentheses(parent.is_a?(Emitter::Send) && value < 0) do
               write(value.inspect)
             end
           end

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

@@ -5,6 +5,7 @@ module Unparser
     class Literal
       # Abstract base class for literal range emitter
       class Range < self
+        include Unterminated
 
         TOKENS = IceNine.deep_freeze(
           irange: '..',
@@ -24,9 +25,9 @@ module Unparser
         # @api private
         #
         def dispatch
-          visit_terminated(begin_node)
+          visit(begin_node)
           write(TOKENS.fetch(node.type))
-          visit_terminated(end_node)
+          visit(end_node)
         end
 
       end # Range

data/lib/unparser/emitter/match.rb

@@ -5,6 +5,7 @@ module Unparser
 
     # Base class for special match node emitters
     class Match < self
+      include Unterminated
 
       OPERATOR = '=~'.freeze
 

data/lib/unparser/emitter/module.rb

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

data/lib/unparser/emitter/op_assign.rb

@@ -5,6 +5,7 @@ module Unparser
 
     # Base class for and and or op-assign
     class BinaryAssign < self
+      include Unterminated
 
       children :target, :expression
 
@@ -26,13 +27,14 @@ module Unparser
       def dispatch
         visit(target)
         write(WS, MAP.fetch(node.type), WS)
-        visit_terminated(expression)
+        visit(expression)
       end
 
     end # BinaryAssign
 
     # Emitter for op assign
     class OpAssign < self
+      include Unterminated
 
       handle :op_asgn
 

data/lib/unparser/emitter/redo.rb

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