to_source 0.2.4 → 0.2.5

data/Changelog.md

@@ -1,3 +1,12 @@
+# v0.2.5 2012-12-14
+
+* [fixed] Emit unary operators correctly
+* [fixed] Define with optional splat and block argument
+* [fixed] Emit arguments to break keyword
+* [change] Uglify output of binary operators with unneded paranteses. Correct output > nice output.
+* [fixed] Emit nested binary operators correctly.
+* [fixed] Emit element reference on self correctly. self[foo].
+
 # v0.2.4 2012-12-07
 
 * [feature] Allow to emit pattern variables as root node

data/Gemfile

@@ -2,6 +2,6 @@ source :rubygems
 
 gemspec
 
-gem 'devtools',         :git => 'https://github.com/mbj/devtools.git', :branch => 'rspec-2-mutant'
+gem 'devtools', :git => 'https://github.com/datamapper/devtools.git'
 
 eval File.read('Gemfile.devtools')

data/Gemfile.devtools

@@ -1,5 +1,5 @@
-group :development do 
-  gem 'rake',    '~> 0.9.2'
+group :development do
+  gem 'rake',    '~> 10.0'
   gem 'rspec',   '~> 2.12.0'
   gem 'yard',    '~> 0.8.3'
 end
@@ -26,26 +26,19 @@ group :metrics do
   gem 'flog',      '~> 2.5.1'
   gem 'reek',      '~> 1.2.8', :git => 'https://github.com/dkubb/reek.git'
   gem 'roodi',     '~> 2.1.0'
-  gem 'yardstick', '~> 0.7.0'
-  gem 'simplecov'
+  gem 'yardstick', '~> 0.8.0'
+  gem 'mutant',    '~> 0.2.5'
 
   platforms :ruby_18, :ruby_19 do
     # this indirectly depends on ffi which does not build on ruby-head
     gem 'yard-spellcheck', '~> 0.1.5'
   end
 
-  platforms :mri_18 do
-    gem 'arrayfields', '~> 4.7.4'  # for metric_fu
-    gem 'fattr',       '~> 2.2.0'  # for metric_fu
-    gem 'json',        '~> 1.7.3'  # for metric_fu rake task
-    gem 'map',         '~> 6.0.1'  # for metric_fu
-    gem 'metric_fu',   '~> 2.1.1'
-    gem 'mspec',       '~> 1.5.17'
-    gem 'rcov',        '~> 1.0.0'
+  platforms :mri_19 do
+    gem 'simplecov',   '~> 0.7'
   end
 
   platforms :rbx do
     gem 'pelusa', '~> 0.2.1'
-    gem 'anima',  '~> 0.0.1', :git => 'https://github.com/mbj/anima.git'
   end
 end

data/lib/to_source/visitor.rb

@@ -148,6 +148,10 @@ module ToSource
     #
     def break(node)
       emit('break')
+      if node.value.class != Rubinius::AST::NilLiteral
+        emit(' ')
+        dispatch(node.value)
+      end
     end
 
     # Emit next
@@ -1047,6 +1051,39 @@ module ToSource
       end
     end
 
+    UNARY_OPERATORS = %w(
+      ! ~ -@ +@
+    ).map(&:to_sym).to_set.freeze
+
+    UNARY_MAPPING = {
+      :-@ => :-,
+      :+@ => :+,
+    }.freeze
+
+    # Emit unary operator
+    #
+    # @param [Rubinius::AST::Node] node
+    #
+    # @return [true]
+    #   if node was emitted
+    #
+    # @return [false]
+    #   otherwise
+    #
+    # @api private
+    #
+    def unary_operator(node)
+      name = node.name
+
+      if UNARY_OPERATORS.include?(name)
+        emit(UNARY_MAPPING.fetch(name, name))
+        dispatch(node.receiver)
+        return true
+      end
+
+      false
+    end
+
     # Emit send node
     #
     # @param [Rubinius::AST::Node] node
@@ -1056,11 +1093,7 @@ module ToSource
     # @api private
     #
     def send(node)
-      if node.name == :'!'
-        emit('!')
-        dispatch(node.receiver)
-        return
-      end
+      return if unary_operator(node)
 
       if receiver(node)
         emit('.')
@@ -1141,10 +1174,7 @@ module ToSource
     # @api private
     #
     def element_reference(node)
-      unless node.receiver.is_a?(Rubinius::AST::Self)
-        dispatch(node.receiver)
-      end
-
+      dispatch(node.receiver)
       arguments(node,'[',']')
     end
 
@@ -1378,9 +1408,11 @@ module ToSource
     # @api private
     #
     def and(node)
+      emit('(')
       dispatch(node.left)
       emit(' && ')
       dispatch(node.right)
+      emit(')')
     end
 
     # Emit or
@@ -1392,9 +1424,11 @@ module ToSource
     # @api private
     #
     def or(node)
+      emit('(')
       dispatch(node.left)
       emit(' || ')
       dispatch(node.right)
+      emit(')')
     end
 
     # Emit and operation with assignment
@@ -1611,6 +1645,7 @@ module ToSource
       if defaults
         emit(', ') unless empty
         dispatch(node.defaults)
+        empty = false
       end
 
       if splat
@@ -1807,12 +1842,13 @@ module ToSource
 
       operand = node.arguments.array[0]
 
+      emit('(')
       dispatch(node.receiver)
 
       emit(" #{name.to_s} ")
       dispatch(operand)
 
-      self
+      emit(')')
     end
   end
 end

data/spec/unit/to_source/visitor/class_methods/run_spec.rb

@@ -361,6 +361,10 @@ describe ToSource::Visitor,'.run' do
       assert_source 'foo[index]'
     end
 
+    context 'as element reference on self' do
+      assert_source 'self[foo]'
+    end
+
     context 'without arguments' do
       assert_source 'foo.bar'
     end
@@ -501,6 +505,10 @@ describe ToSource::Visitor,'.run' do
     assert_source 'break'
   end
 
+  context 'break with arguments' do
+    assert_source 'break a'
+  end
+
   context 'next' do
     assert_source 'next'
   end
@@ -534,43 +542,43 @@ describe ToSource::Visitor,'.run' do
   context 'binary operators' do
     %w(+ - * / & | && || << >> == === != <= < <=> > >= =~ !~ ^ **).each do |operator|
       context "on literals #{operator}" do
-        assert_source "1 #{operator} 2"
+        assert_source "(1 #{operator} 2)"
       end
 
       context "on self #{operator}" do
-        assert_source "self #{operator} b"
+        assert_source "(self #{operator} b)"
       end
 
       context "on calls #{operator}" do
-        assert_source "a #{operator} b"
+        assert_source "(a #{operator} b)"
       end
 
     end
 
-    pending 'nested binary operators' do
-      assert_source "(a or b) || c"
+    context 'nested binary operators' do
+      assert_source '(a || (b || c))'
     end
   end
 
   context 'expansion of shortcuts' do
     context 'on += operator' do
-      assert_converts 'a = a + 2', 'a += 2'
+      assert_converts 'a = (a + 2)', 'a += 2'
     end
 
     context 'on -= operator' do
-      assert_converts 'a = a - 2', 'a -= 2'
+      assert_converts 'a = (a - 2)', 'a -= 2'
     end
 
     context 'on **= operator' do
-      assert_converts 'a = a ** 2', 'a **= 2'
+      assert_converts 'a = (a ** 2)', 'a **= 2'
     end
 
     context 'on *= operator' do
-      assert_converts 'a = a * 2', 'a *= 2'
+      assert_converts 'a = (a * 2)', 'a *= 2'
     end
 
     context 'on /= operator' do
-      assert_converts 'a = a / 2', 'a /= 2'
+      assert_converts 'a = (a / 2)', 'a /= 2'
     end
 
     context 'on &&= operator' do
@@ -591,19 +599,15 @@ describe ToSource::Visitor,'.run' do
       assert_source '!!1'
     end
 
-    pending 'unary match' do
-      assert_source '~a'
-    end
-
-    pending 'unary match' do
+    context 'unary match' do
       assert_source '~a'
     end
 
-    pending 'unary minus' do
+    context 'unary minus' do
       assert_source '-a'
     end
 
-    pending 'unary plus' do
+    context 'unary plus' do
       assert_source '+a'
     end
   end
@@ -994,6 +998,22 @@ describe ToSource::Visitor,'.run' do
         RUBY
       end
 
+      context 'with optional and splat argument' do
+        assert_source <<-RUBY
+          def foo(baz = true, *bor)
+            bar
+          end
+        RUBY
+      end
+
+      context 'with optional and splat and block argument' do
+        assert_source <<-RUBY
+          def foo(baz = true, *bor, &block)
+            bar
+          end
+        RUBY
+      end
+
       context 'with required optional and splat argument' do
         assert_source <<-RUBY
           def foo(bar, baz = true, *bor)

data/to_source.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'to_source'
-  s.version     = '0.2.4'
+  s.version     = '0.2.5'
   s.authors     = ['Josep M. Bach', 'Markus Schirp']
   s.email       = ['josep.m.bach@gmail.com', 'mbj@seonic.net']
   s.homepage    = 'http://github.com/txus/to_source'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: to_source
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-10 00:00:00.000000000 Z
+date: 2012-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adamantium