unparser 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 542027219be6631d4a41c34550f0b6cbf0c1335b
-  data.tar.gz: 622b9928d15fd69b03532eca141ea7e13e2f606f
+  metadata.gz: 3273de4b72cb214d459c8519c3a3e6c3a0d06e4e
+  data.tar.gz: dc7c765cef957d3fafcdfbf36691b56695c29443
 SHA512:
-  metadata.gz: 94566c0a67b0b1f47fc0a80248b2bcac686ec2e63f07e36ea258f034190e989cebde63c332a620caa42269556c7de4504f5225670d38c973f4b62f5e59f2b246
-  data.tar.gz: 633ec7ea22ade4ed28dd99796de71ac8088b94d389aa6edff71ae1934f2dff93576ab36b9681b2f15ddd2755d3bd9683d03efb69ceee7699f4be37f027823273
+  metadata.gz: e27666e1e5c927f64ac11777754b9e9f6df2ad61c8c62c9ca801c026ceda16b75dee95f37ae8e6b313d8ac4ac03ba273f3f7fb355f40fd03c3843a1d2ab0ea5b
+  data.tar.gz: 7c65227ff6738eb937e677a0b17d5fd2d1908a336f187786a0ab42ca68e3c6e38c3e25e233595ad4579579b2076cdff5b7eb66c194daab369e9e2e8b6ba86279

data/TODO

@@ -1 +1,2 @@
-Refactor Emitter::Send, it is ugly.
+* Refactor Emitter::Send, it is ugly.
+* Remove duplicated logic with empty or non empty bodies

data/bin/unparse

@@ -0,0 +1,16 @@
+#!/usr/bin/env ruby
+
+trap('INT') do |status|
+  exit! 128+status
+end
+
+require 'unparser'
+require 'parser/current'
+
+ARGV.each do |file|
+  source = File.read(file)
+  node = Parser::CurrentRuby.parse(source)
+  $stderr.puts "File: #{file}"
+  $stderr.puts node.inspect
+  puts Unparser.unparse(node)
+end

data/lib/unparser.rb

@@ -88,5 +88,5 @@ require 'unparser/emitter/repetition'
 require 'unparser/emitter/root'
 require 'unparser/emitter/match'
 require 'unparser/emitter/empty'
-
-Unparser::Emitter::REGISTRY.freeze
+# make it easy for zombie
+require 'unparser/finalize'

data/lib/unparser/emitter/case.rb

@@ -79,7 +79,12 @@ module Unparser
       def dispatch
         write(K_WHEN, WS)
         emit_captures
-        indented { visit(children.last) }
+        body = children.last
+        if body
+          indented { visit(body) }
+        else
+          nl
+        end
       end
 
       # Emit captures

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

@@ -51,8 +51,8 @@ module Unparser
 
         # Array literal emitter
         class Array < self
-          OPEN = '['.freeze
-          CLOSE = ']'.freeze
+          OPEN      = '['.freeze
+          CLOSE     = ']'.freeze
           DELIMITER = ', '.freeze
 
           handle :array

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

@@ -9,22 +9,6 @@ module Unparser
 
       private
 
-        # Dispatch node
-        #
-        # @return [undefined]
-        #
-        # @api private
-        #
-        def dispatch
-          if node.location
-            emit_source_map
-          else
-            dispatch_value
-          end
-        end
-
-        abstract_method :disaptch_value
-
         # Emitter for primitives based on Object#inspect
         class Inspect < self
 
@@ -38,7 +22,7 @@ module Unparser
           #
           # @api private
           #
-          def dispatch_value
+          def dispatch
             buffer.append(value.inspect)
           end
 

data/lib/unparser/emitter/repetition.rb

@@ -10,7 +10,7 @@ module Unparser
 
       MAP = {
         :while_post => K_WHILE,
-        :until_until => K_UNTIL
+        :until_post => K_UNTIL
       }.freeze
 
       handle *MAP.keys

data/lib/unparser/finalize.rb

@@ -0,0 +1 @@
+Unparser::Emitter::REGISTRY.freeze

data/spec/integration/unparser/spike_spec.rb

@@ -73,10 +73,11 @@ describe Unparser, 'spike' do
       assert_generates s(:int,  1),  '1'
       assert_generates s(:int, -1), '-1'
       assert_source '1'
-      assert_source '0x1'
-      assert_source '1_000'
-      assert_source '1e10'
-      assert_source '?c'
+      assert_generates '0x1', '1'
+      assert_generates '1_000', '1000'
+      assert_generates '1e10',  '10000000000.0'
+      assert_generates '?c', '"c"', RUBIES  - %w(1.8)
+      assert_generates '?c', '99', %w(1.8)
     end
 
     context 'string' do
@@ -147,6 +148,7 @@ describe Unparser, 'spike' do
       assert_source '[1, *@foo]'
       assert_source '[*@foo, 1]',     RUBIES - %w(1.8)
       assert_source '[*@foo, *@baz]', RUBIES - %w(1.8)
+      assert_generates '%w(foo bar)', %q(["foo", "bar"])
     end
 
     context 'hash' do
@@ -193,9 +195,9 @@ describe Unparser, 'spike' do
   end
 
   context 'magic keywords' do
-    assert_generates  '__ENCODING__', 'Encoding::UTF_8', RUBIES - %w(1.8)
-    assert_source '__FILE__'
-    assert_source '__LINE__'
+    assert_generates '__ENCODING__', 'Encoding::UTF_8', RUBIES - %w(1.8)
+    assert_generates '__FILE__', '"(string)"'
+    assert_generates '__LINE__', '1'
   end
 
   context 'assignment' do
@@ -497,7 +499,7 @@ describe Unparser, 'spike' do
     RUBY
 
     assert_source <<-RUBY
-      alias foo bar
+      alias :foo :bar
     RUBY
   end
 
@@ -894,6 +896,15 @@ describe Unparser, 'spike' do
       end
     RUBY
 
+    assert_source <<-RUBY
+      case foo
+      when bar
+      when baz
+        bar
+      end
+    RUBY
+
+
     assert_source <<-RUBY
       case foo
       when bar
@@ -970,6 +981,13 @@ describe Unparser, 'spike' do
       end while baz
     RUBY
 
+    assert_source <<-RUBY
+      begin
+        foo
+        bar
+      end until baz
+    RUBY
+
     assert_source <<-RUBY
       begin
         foo

data/unparser.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name     = 'unparser'
-  s.version  = '0.0.5'
+  s.version  = '0.0.6'
 
   s.authors  = ['Markus Schirp']
   s.email    = 'mbj@schir-dso.com'
@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.test_files       = `git ls-files -- {spec,features}/*`.split("\n")
   s.require_paths    = %w(lib)
   s.extra_rdoc_files = %w(README.md)
+  s.executables      = [ 'unparse' ]
 
   s.add_dependency('parser',        '~> 2.0.0.beta9')
   s.add_dependency('concord',       '~> 0.1.0')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: unparser
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Markus Schirp
@@ -82,7 +82,8 @@ dependencies:
         version: 0.0.5
 description: Generate equivalent source for parser gem AST nodes
 email: mbj@schir-dso.com
-executables: []
+executables:
+- unparse
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -99,6 +100,7 @@ files:
 - README.md
 - Rakefile
 - TODO
+- bin/unparse
 - config/devtools.yml
 - config/flay.yml
 - config/flog.yml
@@ -153,6 +155,7 @@ files:
 - lib/unparser/emitter/undef.rb
 - lib/unparser/emitter/variable.rb
 - lib/unparser/emitter/yield.rb
+- lib/unparser/finalize.rb
 - spec/integration/unparser/spike_spec.rb
 - spec/spec_helper.rb
 - spec/unit/unparser/buffer/append_spec.rb