unparser 0.1.0 → 0.1.1

data/lib/unparser/constants.rb

@@ -76,7 +76,9 @@ module Unparser
     K_THEN     = 'then'
 
     TERMINATED = [
-      :int, :float, :self, :kwbegin, :const, :regexp
+      :int, :float, :self, :kwbegin, :const, :regexp, :args, :lvar,
+      :ivar, :gvar, :cvar, :if, :case, :module, :class, :sclass, :super,
+      :yield, :zsuper, :break, :next, :defined?, :str, :block
     ].to_set
 
     KEYWORDS = constants.each_with_object([]) do |name, keywords|

data/lib/unparser/emitter/assignment.rb

@@ -134,9 +134,7 @@ module Unparser
         # @api private
         #
         def dispatch
-          if parent_type == :mlhs
-            parentheses { delimited(children) }
-          else
+          maybe_parentheses(parent_type == :mlhs) do
             delimited(children)
           end
         end

data/lib/unparser/emitter/binary.rb

@@ -10,7 +10,7 @@ module Unparser
         :and => T_AND
       }.freeze
 
-      handle *MAP.keys
+      handle(*MAP.keys)
 
       # Test if expression is terminated
       #

data/lib/unparser/emitter/block.rb

@@ -33,9 +33,7 @@ module Unparser
       def emit_block_arguments
         return if arguments.children.empty?
         ws
-        parentheses(T_PIPE, T_PIPE) do
-          visit(arguments)
-        end
+        visit_parentheses(arguments, T_PIPE, T_PIPE)
       end
 
     end # Block

data/lib/unparser/emitter/break.rb

@@ -16,10 +16,10 @@ module Unparser
       # @api private
       #
       def dispatch
-        write(K_BREAK)
-        return unless arguments
-        parentheses do
-          visit(arguments)
+        maybe_parentheses(parent_type == :or || parent_type == :and) do
+          write(K_BREAK)
+          return unless arguments
+          visit_parentheses(arguments)
         end
       end
 

data/lib/unparser/emitter/def.rb

@@ -45,9 +45,7 @@ module Unparser
       #
       def emit_arguments
         return if arguments.children.empty?
-        parentheses do
-          visit(arguments)
-        end
+        visit_parentheses(arguments)
       end
 
       # Instance def emitter

data/lib/unparser/emitter/defined.rb

@@ -17,9 +17,7 @@ module Unparser
       #
       def dispatch
         write(K_DEFINED)
-        parentheses do
-          visit(subject)
-        end
+        visit_parentheses(subject)
       end
 
     end # Defined

data/lib/unparser/emitter/if.rb

@@ -34,7 +34,7 @@ module Unparser
       # @api private
       #
       def unless?
-        !if_branch
+        !if_branch && else_branch
       end
 
       # Return keyword
@@ -64,8 +64,13 @@ module Unparser
       # @api private
       #
       def emit_if_branch
-        return unless if_branch
-        visit_indented(if_branch)
+        if if_branch
+          visit_indented(if_branch)
+        end
+
+        if !if_branch && !else_branch
+          nl
+        end
       end
 
       # Emit else branch

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

@@ -15,9 +15,7 @@ module Unparser
         #
         def dispatch
           util = self.class
-          parentheses(util::OPEN, util::CLOSE) do
-            visit(dynamic_body)
-          end
+          visit_parentheses(dynamic_body, util::OPEN, util::CLOSE)
         end
 
         # Return dynamic body

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

@@ -93,7 +93,7 @@ module Unparser
         # @api private
         #
         def emit_interpolated_segment(node)
-          parentheses(OPEN, CLOSE) { visit(node) }
+          visit_parentheses(node, OPEN, CLOSE)
         end
 
         # Dynamic string body

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

@@ -17,9 +17,7 @@ module Unparser
         # @api private
         #
         def dispatch
-          parentheses(OPEN, CLOSE) do
-            visit(dynamic_body)
-          end
+          visit_parentheses(dynamic_body, OPEN, CLOSE)
         end
 
         # Return dynamic body

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

@@ -18,11 +18,9 @@ module Unparser
         #
         def dispatch
           parentheses(DELIMITER, DELIMITER) do
-            # stupid for now
             body.each do |child|
               write_body(child)
             end
-            #visit(dynamic_body)
           end
           visit(children.last)
         end

data/lib/unparser/emitter/next.rb

@@ -14,9 +14,11 @@ module Unparser
       # @api private
       #
       def dispatch
-        write(K_NEXT)
-        return if children.empty?
-        parentheses { visit(children.first) }
+        maybe_parentheses(parent_type == :or || parent_type == :and) do
+          write(K_NEXT)
+          return if children.empty?
+          visit_parentheses(children.first)
+        end
       end
 
     end # Next

data/lib/unparser/emitter/return.rb

@@ -17,20 +17,8 @@ module Unparser
       #
       def dispatch
         write(K_RETURN)
-        emit_argument
-      end
-
-      # Emit argument
-      #
-      # @return [undefined]
-      #
-      # @api private
-      #
-      def emit_argument
         return unless argument
-        parentheses do
-          visit(argument)
-        end
+        visit_parentheses(argument)
       end
 
     end # Return

data/lib/unparser/emitter.rb

@@ -202,13 +202,42 @@ module Unparser
     #
     def visit_terminated(node)
       emitter = emitter(node)
-      unless emitter.terminated?
-        parentheses { emitter.write_to_buffer }
-        return
+      maybe_parentheses(!emitter.terminated?) do
+        emitter.write_to_buffer
       end
       emitter.write_to_buffer
     end
 
+    # Visit within parentheses
+    #
+    # @param [Parser::AST::Node] node
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def visit_parentheses(node, *arguments)
+      parentheses(*arguments) do
+        visit(node)
+      end
+    end
+
+    # Call block in optional parentheses
+    #
+    # @param [true, false] flag
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def maybe_parentheses(flag)
+      if flag
+        parentheses { yield }
+      else
+        yield
+      end
+    end
+
     # Return emitter for node
     #
     # @param [Parser::AST::Node] node

data/spec/unit/unparser_spec.rb

@@ -143,6 +143,7 @@ describe Unparser do
         assert_generates '1..2', %q(1..2)
         assert_source   '(0.0 / 0.0)..1'
         assert_source   '1..(0.0 / 0.0)'
+        assert_source   '(0.0 / 0.0)..100'
       end
 
       context 'erange' do
@@ -317,9 +318,67 @@ describe Unparser do
         end
       RUBY
 
-      # Special cases
+      assert_source <<-RUBY
+        foo.bar do
+        end.baz
+      RUBY
+
       assert_source '(1..2).max'
+      assert_source '1..2.max'
       assert_source '(a = b).bar'
+      assert_source '@ivar.bar'
+      assert_source '//.bar'
+      assert_source '$var.bar'
+      assert_source '"".bar'
+      assert_source 'defined?(@foo).bar'
+
+      assert_source <<-RUBY
+        begin
+        rescue
+        end.bar
+      RUBY
+
+      assert_source <<-RUBY
+        case foo
+        when bar
+        end.baz
+      RUBY
+
+      assert_source <<-RUBY
+        class << self
+        end.bar
+      RUBY
+
+      assert_source 'break.foo'
+      assert_source 'next.foo'
+      assert_source 'super(a).foo'
+      assert_source 'super.foo'
+      assert_source 'yield(a).foo'
+      assert_source 'yield.foo'
+      assert_source 'array[i].foo'
+      assert_source '(array[i] = 1).foo'
+      assert_source 'array[1..2].foo'
+      assert_source '(a.attribute ||= foo).bar'
+
+      assert_source <<-RUBY
+        class Foo
+        end.bar
+      RUBY
+
+      assert_source <<-RUBY
+        module Foo
+        end.bar
+      RUBY
+
+      assert_source <<-RUBY
+        if foo
+        end.baz
+      RUBY
+
+      assert_source <<-RUBY
+        local = 1
+        local.bar
+      RUBY
 
       assert_source 'foo.bar(*args)'
       assert_source 'foo.bar(*arga, foo, *argb)'
@@ -604,6 +663,11 @@ describe Unparser do
           9
         end
       RUBY
+
+      assert_source <<-RUBY
+        if foo
+        end
+      RUBY
     end
 
     context 'def' do
@@ -900,6 +964,8 @@ describe Unparser do
         assert_source "a #{operator} b"
         assert_source "(a #{operator} b).foo"
       end
+
+      assert_source 'left / right'
     end
 
     context 'nested binary operators' do
@@ -917,6 +983,7 @@ describe Unparser do
 
     { :or => :'||', :and => :'&&' }.each do |word, symbol|
       assert_generates "a #{word} break foo", "a #{symbol} (break(foo))"
+      assert_generates "a #{word} next foo", "a #{symbol} (next(foo))"
     end
 
     context 'expansion of shortcuts' do

data/unparser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = 'unparser'
-  s.version  = '0.1.0'
+  s.version  = '0.1.1'
 
   s.authors  = ['Markus Schirp']
   s.email    = 'mbj@schir-dso.com'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-05 00:00:00.000000000 Z
+date: 2013-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser