ruby2ruby 1.2.1 → 1.2.2

data/.autotest

@@ -16,6 +16,8 @@ Autotest.add_hook :initialize do |at|
   end
 end
 
-require 'autotest/rcov'
-Autotest::RCov.command = 'rcov_info'
-Autotest::RCov.pattern = 'test/test_ruby2ruby.rb'
+if ENV['RCOV'] then
+  require 'autotest/rcov'
+  Autotest::RCov.command = 'rcov_info'
+  Autotest::RCov.pattern = 'test/test_ruby2ruby.rb'
+end

data/History.txt

@@ -1,3 +1,18 @@
+=== 1.2.2 / 2009-01-20
+
+* 3 minor enhancements:
+
+  * Added -s to display sexp before printing r2r
+  * Added a bunch of backslash and masgn tests.
+  * Refactored tests.
+
+* 4 bug fixes:
+
+  * Fixed iters to deal with empty bodies.
+  * Fixed process_call for a number of cases incl [], []=, and args processing.
+  * Fixed process_hash to always generate braces if in arglist.
+  * Switched process_alias to producing alias again, needed for globals.
+
 === 1.2.1 / 2008-11-04
 
 * 1 bug fix:

data/bin/r2r_show

@@ -1,15 +1,17 @@
-#!/usr/local/bin/ruby -ws
+#!/usr/bin/ruby -ws
 
-begin require 'rubygems' rescue LoadError end
+require 'rubygems'
 require 'ruby2ruby'
 require 'parse_tree'
 
 $h ||= false
+$s ||= false
 
 if $h then
   puts "usage: #{File.basename $0} [options] [file...]"
   puts "options:"
-  puts "-h      : display usage"
+  puts "-h     : display usage"
+  puts "-s     : print the sexp before displaying the translated ruby"
 
   exit 1
 end
@@ -22,7 +24,9 @@ ruby2ruby  = Ruby2Ruby.new
 ARGV.each do |file|
   ruby = file == "-" ? $stdin.read : File.read(file)
 
-  sexp = parse_tree.parse_tree_for_string(ruby, file).first
+  sexp = parse_tree.process(ruby, nil, file)
+
+  p sexp if $s
 
   puts ruby2ruby.process(sexp)
 end

data/lib/ruby2ruby.rb

@@ -5,7 +5,7 @@ require 'sexp_processor'
 require 'unified_ruby'
 
 class Ruby2Ruby < SexpProcessor
-  VERSION = '1.2.1'
+  VERSION = '1.2.2'
   LINE_LENGTH = 78
 
   ##
@@ -54,7 +54,7 @@ class Ruby2Ruby < SexpProcessor
   # Processors
 
   def process_alias(exp)
-    "alias_method #{process(exp.shift)}, #{process(exp.shift)}"
+    "alias #{process(exp.shift)} #{process(exp.shift)}"
   end
 
   def process_and(exp)
@@ -186,29 +186,29 @@ class Ruby2Ruby < SexpProcessor
       Ruby2Ruby::ASSIGN_NODES.include? receiver_node_type
 
     name = exp.shift
-    args_exp = exp.shift rescue nil
-    if args_exp && args_exp.first == :array # FIX
-      args = "#{process(args_exp)[1..-2]}"
-    else
-      args = process args_exp
-      args = nil if args.empty?
-    end
+    args = exp.shift rescue nil
 
     case name
     when :<=>, :==, :<, :>, :<=, :>=, :-, :+, :*, :/, :%, :<<, :>>, :** then
-      "(#{receiver} #{name} #{args})"
+      "(#{receiver} #{name} #{process args})"
     when :[] then
-      "#{receiver}[#{args}]"
+      receiver = "self" if receiver.nil?
+      "#{receiver}[#{process args}]"
+    when :[]= then
+      receiver = "self" if receiver.nil?
+      lhs = args.pop
+      "#{receiver}[#{process args}] = #{process lhs}"
     when :"-@" then
       "-#{receiver}"
     when :"+@" then
       "+#{receiver}"
     else
-      unless receiver.nil? then
-        "#{receiver}.#{name}#{args ? "(#{args})" : args}"
-      else
-        "#{name}#{args ? "(#{args})" : args}"
-      end
+      args     = process args
+      args     = nil            if args.empty?
+      args     = "(#{args})"    if args
+      receiver = "#{receiver}." if receiver
+
+      "#{receiver}#{name}#{args}"
     end
   end
 
@@ -408,7 +408,11 @@ class Ruby2Ruby < SexpProcessor
 
     case self.context[1]
     when :arglist, :argscat then
-      return "#{result.join(', ')}" # HACK - this will break w/ 2 hashes as args
+      unless result.empty? then
+        return "#{result.join(', ')}" # HACK - this will break w/ 2 hashes as args
+      else
+        return "{}"
+      end
     else
       return "{ #{result.join(', ')} }"
     end
@@ -487,8 +491,10 @@ class Ruby2Ruby < SexpProcessor
     result << "#{iter} #{b}"
     result << " |#{args}|" if args
     result << "\n"
-    result << indent(body.strip)
-    result << "\n"
+    if body then
+      result << indent(body.strip)
+      result << "\n"
+    end
     result << e
     result.join
   end
@@ -525,12 +531,6 @@ class Ruby2Ruby < SexpProcessor
     lhs = exp.shift
     rhs = exp.empty? ? nil : exp.shift
 
-    unless exp.empty? then
-      rhs[1] = splat(rhs[1]) unless rhs == s(:splat)
-      lhs << rhs
-      rhs = exp.shift
-    end
-
     case lhs.first
     when :array then
       lhs.shift
@@ -558,12 +558,11 @@ class Ruby2Ruby < SexpProcessor
     unless rhs.nil? then
       t = rhs.first
       rhs = process rhs
-      rhs = rhs[1..-2] if t != :to_ary
+      rhs = rhs[1..-2] if t == :array # FIX: bad? I dunno
       return "#{lhs.join(", ")} = #{rhs}"
     else
       return lhs.join(", ")
     end
-
   end
 
   def process_match(exp)

data/test/test_ruby2ruby.rb

@@ -54,41 +54,85 @@ class TestRuby2Ruby < R2RTestCase
   def test_dregx_slash
     inn = util_thingy(:dregx)
     out = "/blah\\\"blah#\{(1 + 1)}blah\\\"blah\\/blah/"
-
-    assert_equal out, @processor.process(inn)
-
-    r = eval(out)
-    assert_equal(/blah\"blah2blah\"blah\/blah/, r)
+    util_compare inn, out, /blah\"blah2blah\"blah\/blah/
   end
 
   def test_dstr_quote
     inn = util_thingy(:dstr)
     out = "\"blah\\\"blah#\{(1 + 1)}blah\\\"blah/blah\""
-
-    assert_equal out, @processor.process(inn)
-
-    r = eval(out)
-    assert_equal "blah\"blah2blah\"blah/blah", r
+    util_compare inn, out, "blah\"blah2blah\"blah/blah"
   end
 
   def test_dsym_quote
     inn = util_thingy(:dsym)
     out = ":\"blah\\\"blah#\{(1 + 1)}blah\\\"blah/blah\""
+    util_compare inn, out, :"blah\"blah2blah\"blah/blah"
+  end
 
-    assert_equal out, @processor.process(inn)
+  def test_lit_regexp_slash
+    util_compare s(:lit, /blah\/blah/), '/blah\/blah/', /blah\/blah/
+  end
 
-    r = eval(out)
-    assert_equal :"blah\"blah2blah\"blah/blah", r
+  def test_call_self_index
+    util_compare s(:call, nil, :[], s(:arglist, s(:lit, 42))), "self[42]"
+  end
+
+  def test_call_self_index_equals
+    util_compare(s(:call, nil, :[]=, s(:arglist, s(:lit, 42), s(:lit, 24))),
+                 "self[42] = 24")
+  end
+
+  def test_masgn_wtf
+    inn = s(:block,
+            s(:masgn,
+              s(:array, s(:lasgn, :k), s(:lasgn, :v)),
+              s(:array,
+                s(:splat,
+                  s(:call,
+                    s(:call, nil, :line, s(:arglist)),
+                    :split,
+                    s(:arglist, s(:lit, /\=/), s(:lit, 2)))))),
+            s(:attrasgn,
+              s(:self),
+              :[]=,
+              s(:arglist, s(:lvar, :k),
+                s(:call, s(:lvar, :v), :strip, s(:arglist)))))
+
+    out = "k, v = *line.split(/\\=/, 2)\nself[k] = v.strip\n"
+
+    util_compare inn, out
   end
 
-  def test_lit_regexp_slash
-    inn = s(:lit, /blah\/blah/)
-    out = '/blah\/blah/'
 
-    assert_equal out, @processor.process(inn)
+  def test_masgn_splat_wtf
+    inn = s(:masgn,
+            s(:array, s(:lasgn, :k), s(:lasgn, :v)),
+            s(:array,
+              s(:splat,
+                s(:call,
+                  s(:call, nil, :line, s(:arglist)),
+                  :split,
+                  s(:arglist, s(:lit, /\=/), s(:lit, 2))))))
+    out = 'k, v = *line.split(/\\=/, 2)'
+    util_compare inn, out
+  end
+
+  def test_splat_call
+    inn = s(:call, nil, :x,
+            s(:arglist,
+              s(:splat,
+                s(:call,
+                  s(:call, nil, :line, s(:arglist)),
+                  :split,
+                  s(:arglist, s(:lit, /=/), s(:lit, 2))))))
+
+    out = 'x(*line.split(/=/, 2))'
+    util_compare inn, out
+  end
 
-    r = eval(out)
-    assert_equal(/blah\/blah/, r)
+  def util_compare sexp, expected_ruby, expected_eval = nil
+    assert_equal expected_ruby, @processor.process(sexp)
+    assert_equal expected_eval, eval(expected_ruby) if expected_eval
   end
 
   def util_setup_inline
@@ -100,7 +144,7 @@ class TestRuby2Ruby < R2RTestCase
   def util_thingy(type)
     s(type,
       'blah"blah',
-      s(:call, s(:lit, 1), :+, s(:array, s(:lit, 1))),
+      s(:call, s(:lit, 1), :+, s(:arglist, s(:lit, 1))),
       s(:str, 'blah"blah/blah'))
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby2ruby
 version: !ruby/object:Gem::Version 
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors: 
 - Ryan Davis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-04 00:00:00 -08:00
+date: 2009-01-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.0
+        version: 1.8.2
     version: 
 description: ruby2ruby provides a means of generating pure ruby code easily from ParseTree's Sexps. This makes making dynamic language processors much easier in ruby than ever before.
 email: