to_source 0.2.7 → 0.2.8

data/Changelog.md

@@ -1,3 +1,12 @@
+# v0.2.8 2013-01-3
+
+* [Changed] Emit many times more ugly code, but correctnes > beautifulnes
+* [fixed] Emit break with parantheses
+* [fixed] Emit op assign and as "&&="
+* [fixed] Emit op assign or as "||="
+
+[Compare v0.2.7..v0.2.8](https://github.com/mbj/to_source/compare/v0.2.7...v0.2.8)
+
 # v0.2.7 2013-01-2
 
 * [fixed] Emit super with blocks correctly

data/TODO

@@ -1,3 +1,5 @@
+* Do not emit parantheses around non keywords in binary operations (this will beautify source again)
+* Rewrite this library it is ultra hacky and adhoc 
 * Fix parsing errors from ruby parser
   It breaks on def $keyword.
 * Do a metric driven refactor once flay flog and friends work.

data/lib/to_source/visitor.rb

@@ -149,8 +149,9 @@ module ToSource
     def break(node)
       emit('break')
       if node.value.class != Rubinius::AST::NilLiteral
-        emit(' ')
+        emit('(')
         dispatch(node.value)
+        emit(')')
       end
     end
 
@@ -1415,13 +1416,54 @@ module ToSource
     # @api private
     #
     def and(node)
+      binary(node, '&&')
+    end
+
+    # Call block while emitting parantheses
+    #
+    # @return [undefined]
+    #
+    # @api private
+    #
+    def parantheses
       emit('(')
-      dispatch(node.left)
-      emit(' && ')
-      dispatch(node.right)
+      yield
       emit(')')
     end
 
+    # Emit binary operation
+    #
+    # @param [Rubnius::AST::Node] node
+    #
+    # @param [Symbol] symbol
+    #   the operation symbol
+    #
+    # @api private
+    #
+    def binary(node, symbol)
+      parantheses do
+        parantheses { dispatch(node.left) }
+        emit(" #{symbol} ")
+        parantheses { dispatch(node.right) }
+      end
+    end
+
+    # Emit binary shortcut
+    #
+    # @param [Rubinius::AST::Node] node
+    #
+    # @param [Symbol] symbol
+    #
+    # @api private
+    #
+    def binary_shortcut(node, symbol)
+      parantheses do
+        dispatch(node.left)
+        emit(" #{symbol} ")
+        parantheses { dispatch(node.right.value) }
+      end
+    end
+
     # Emit or
     #
     # @param [Rubinius::AST::Node] node
@@ -1431,11 +1473,7 @@ module ToSource
     # @api private
     #
     def or(node)
-      emit('(')
-      dispatch(node.left)
-      emit(' || ')
-      dispatch(node.right)
-      emit(')')
+      binary(node, '||')
     end
 
     # Emit and operation with assignment
@@ -1447,9 +1485,7 @@ module ToSource
     # @api private
     #
     def op_assign_and(node)
-      dispatch(node.left)
-      emit(' && ')
-      dispatch(node.right)
+      binary_shortcut(node, :'&&=')
     end
 
     # Emit or operation with assignment
@@ -1461,9 +1497,7 @@ module ToSource
     # @api private
     #
     def op_assign_or(node)
-      dispatch(node.left)
-      emit(' || ')
-      dispatch(node.right)
+      binary_shortcut(node, :'||=')
     end
     alias_method :op_assign_or19, :op_assign_or
 
@@ -1845,17 +1879,14 @@ module ToSource
     def process_binary_operator(node)
       name = node.name
       return unless OPERATORS.include?(name)
-      return if node.arguments.array.length != 1
 
       operand = node.arguments.array[0]
 
-      emit('(')
-      dispatch(node.receiver)
-
-      emit(" #{name.to_s} ")
-      dispatch(operand)
-
-      emit(')')
+      parantheses do
+       parantheses { dispatch(node.receiver) }
+       emit(" #{name.to_s} ")
+       parantheses { dispatch(operand) }
+      end
     end
   end
 end

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

@@ -17,6 +17,13 @@ describe ToSource::Visitor,'.run' do
     it 'should create original source' do
       should eql(compress(expected_source))
     end
+
+    it 'should be able to round trip generated source also' do
+      generated = subject
+      ast = subject.to_ast
+      second = described_class.run(ast)
+      generated.should eql(second)
+    end
   end
 
   def self.assert_source(source)
@@ -542,7 +549,7 @@ describe ToSource::Visitor,'.run' do
   end
 
   context 'break with arguments' do
-    assert_source 'break a'
+    assert_source 'break(a)'
   end
 
   context 'next' do
@@ -578,51 +585,56 @@ 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
 
+    context 'binary operator and keywords' do
+      assert_source '((a) || (break(foo)))'
     end
 
     context 'nested binary operators' do
-      assert_source '(a || (b || c))'
+      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
+  end
 
+  context 'shortcuts' do
     context 'on &&= operator' do
-      assert_converts 'a && a = 2', 'a &&= 2'
+      assert_source '(a &&= (b))'
     end
 
     context 'on ||= operator' do
-      assert_converts 'a || a = 2', 'a ||= 2'
+      assert_source '(a ||= (2))'
     end
   end
 

data/to_source.gemspec

@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 Gem::Specification.new do |s|
   s.name        = 'to_source'
-  s.version     = '0.2.7'
+  s.version     = '0.2.8'
   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.7
+  version: 0.2.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-01 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: adamantium