unparser 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 791317b7c757ff21dccc078c1dc82a53690194bb
+  data.tar.gz: 41cdfad7c83f3e88eae3cdf3351bb3830014345f
+SHA512:
+  metadata.gz: ed041a27c4747aacd924ed08fc8118eb13be9d82ca598c597f9dbbc9d5e8de28c67a2812b285cf4cacb7c0b4dc2925c52c3f1940060cde6eeb0788b5d1c1137d
+  data.tar.gz: 1c55d2b791abf9ca336d78745f08f56e75d1ed92106c0fd08317f3d69524080a72a5b2a3e2102c0dd93e31ef027c267334d3e1caa0e7726fd3cc733d58be5f09

data/lib/unparser/constants.rb

@@ -12,6 +12,8 @@ module Unparser
       ** %
     ).map(&:to_sym).to_set
 
+    COMMENT = '#'.freeze
+
     WS       = ' '
     NL       = "\n"
     T_DOT    = '.'
@@ -78,7 +80,8 @@ module Unparser
     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
+      :yield, :zsuper, :break, :next, :defined?, :str, :block, :while, :loop, :until,
+      :def, :defs, :true, :false, :nil, :array, :hash, :sym, :return
     ].to_set
 
     KEYWORDS = constants.each_with_object([]) do |name, keywords|

data/lib/unparser/emitter.rb

@@ -121,14 +121,6 @@ module Unparser
     #
     abstract_method :dispatch
 
-    # Return node
-    #
-    # @return [Parser::AST::Node] node
-    #
-    # @api private
-    #
-    attr_reader :node
-
     # Test if node is emitted as terminated expression
     #
     # @return [false]
@@ -404,6 +396,16 @@ module Unparser
       Parser::AST::Node.new(type, *children)
     end
 
+    # Helper to introduce comment
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def comment
+     write(WS, COMMENT, WS)
+    end
+
     # Emitter that fully relies on parser source maps
     class SourceMap < self
 

data/lib/unparser/emitter/class.rb

@@ -21,6 +21,10 @@ module Unparser
         emit_superclass
         emit_body
         k_end
+        unless parent_type == :send
+          comment
+          visit(name)
+        end
       end
 
       # Emit superclass

data/lib/unparser/emitter/module.rb

@@ -20,6 +20,10 @@ module Unparser
         visit(name)
         emit_body
         k_end
+        if parent_type != :send
+          comment
+          visit(name)
+        end
       end
 
     end # Module

data/spec/unit/unparser_spec.rb

@@ -331,6 +331,28 @@ describe Unparser do
       assert_source '$var.bar'
       assert_source '"".bar'
       assert_source 'defined?(@foo).bar'
+      assert_source 'break.foo'
+      assert_source 'next.foo'
+      assert_source 'super(a).foo'
+      assert_source 'a || return'
+      assert_source 'super.foo'
+      assert_source 'nil.foo'
+      assert_source ':sym.foo'
+      assert_source '1.foo'
+      assert_source '1.0.foo'
+      assert_source '[].foo'
+      assert_source '{}.foo'
+      assert_source 'false.foo'
+      assert_source 'true.foo'
+      assert_source 'self.foo'
+      assert_source 'yield(a).foo'
+      assert_source 'yield.foo'
+      assert_source 'Foo::Bar.foo'
+      assert_source '::BAZ.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
         begin
@@ -349,16 +371,30 @@ describe Unparser do
         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
+        def self.foo
+        end.bar
+      RUBY
+
+      assert_source <<-RUBY
+        def foo
+        end.bar
+      RUBY
+
+      assert_source <<-RUBY
+        until foo
+        end.bar
+      RUBY
+
+      assert_source <<-RUBY
+        while foo
+        end.bar
+      RUBY
+
+      assert_source <<-RUBY
+        loop do
+        end.bar
+      RUBY
 
       assert_source <<-RUBY
         class Foo
@@ -827,7 +863,7 @@ describe Unparser do
       context 'class' do
         assert_source <<-RUBY
           class TestClass
-          end
+          end # TestClass
         RUBY
 
         assert_source <<-RUBY
@@ -843,22 +879,22 @@ describe Unparser do
 
         assert_source <<-RUBY
           class SomeNameSpace::TestClass
-          end
+          end # SomeNameSpace::TestClass
         RUBY
 
         assert_source <<-RUBY
           class Some::Name::Space::TestClass
-          end
+          end # Some::Name::Space::TestClass
         RUBY
 
         assert_source <<-RUBY
           class TestClass < Object
-          end
+          end # TestClass
         RUBY
 
         assert_source <<-RUBY
           class TestClass < SomeNameSpace::Object
-          end
+          end # TestClass
         RUBY
 
         assert_source <<-RUBY
@@ -866,12 +902,12 @@ describe Unparser do
             def foo
               :bar
             end
-          end
+          end # TestClass
         RUBY
 
         assert_source <<-RUBY
           class ::TestClass
-          end
+          end # ::TestClass
         RUBY
       end
 
@@ -879,17 +915,17 @@ describe Unparser do
 
         assert_source <<-RUBY
           module TestModule
-          end
+          end # TestModule
         RUBY
 
         assert_source <<-RUBY
           module SomeNameSpace::TestModule
-          end
+          end # SomeNameSpace::TestModule
         RUBY
 
         assert_source <<-RUBY
           module Some::Name::Space::TestModule
-          end
+          end # Some::Name::Space::TestModule
         RUBY
 
         assert_source <<-RUBY
@@ -897,7 +933,7 @@ describe Unparser do
             def foo
               :bar
             end
-          end
+          end # TestModule
         RUBY
 
       end
@@ -975,10 +1011,10 @@ describe Unparser do
     end
 
     context 'binary operator' do
-       assert_source 'a || (break(foo))'
-       assert_source '(break(foo)) || (a)'
-       assert_source '(a || b).foo'
-       assert_source 'a || (b || c)'
+      assert_source 'a || (break(foo))'
+      assert_source '(break(foo)) || a'
+      assert_source '(a || b).foo'
+      assert_source 'a || (b || c)'
     end
 
     { :or => :'||', :and => :'&&' }.each do |word, symbol|

data/unparser.gemspec

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

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.1.2
 platform: ruby
 authors:
 - Markus Schirp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2013-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parser
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: concord
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: adamantium
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: equalizer
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: abstract_type
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -184,27 +173,26 @@ files:
 homepage: http://github.com/mbj/unparser
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Generate equivalent source for parser gem AST nodes
 test_files:
 - spec/spec_helper.rb