ruby2ruby 1.1.5 → 1.1.6

data/History.txt

@@ -1,19 +1,28 @@
-== 1.1.5 / 2007-02-13
+=== 1.1.6 / 2007-06-05
+
+* 2 minor enhancements:
+  * Extended tests for dstr/dsym/drgx to test against embedded slashes and quotes.
+  * Updated for dasgn_curr changes to PT.
+* 2 bug fixes:
+  * Fixed a bug with begin/rescue/ensure.
+  * Fixed argscat and blockpass bug. blah(42, *args, &block) handled.
+
+=== 1.1.5 / 2007-02-13
 
 * 3 minor enhancements:
-	* Can now heckle ActiveRecord::Base in full.
-	* Cleaned up 1-liner generating code.
-	* Made clean/simple rescues 1-liners.
+  * Can now heckle ActiveRecord::Base in full.
+  * Cleaned up 1-liner generating code.
+  * Made clean/simple rescues 1-liners.
 * 7 bug fixes:
-	* Finally got the rest of block_pass working.
-	* Fixed block_pass on procs in iters. UGH!
-	* Fixed attrasgn in masgn.
-	* Fixed splat in masgn.
-	* Fixed unary/prefix methods.
-	* Fixed attrasgn for []= where there were multiple args inside [].
-	* Fixed a couple resbody bugs.
+  * Finally got the rest of block_pass working.
+  * Fixed block_pass on procs in iters. UGH!
+  * Fixed attrasgn in masgn.
+  * Fixed splat in masgn.
+  * Fixed unary/prefix methods.
+  * Fixed attrasgn for []= where there were multiple args inside [].
+  * Fixed a couple resbody bugs.
 
-== 1.1.4 / 2007-01-15
+=== 1.1.4 / 2007-01-15
 
 * 4 minor enhancements:
   * Added some extra rewriting code and tests for various bmethods. Ugh.
@@ -26,14 +35,14 @@
   * Fixed dmethod. I think the tests were bogus before.
   * Fixed improper end in method rescues (bug 7396).
 
-== 1.1.3 / 2006-12-20
+=== 1.1.3 / 2006-12-20
 
 * 1 minor enhancement
   * Unit tests do self-translation and retesting for 3 generations! Solid. BAM!
 * 1 bug fixes
   * iasgn inside masgn was totally borked in ruby2ruby.
 
-== 1.1.2 / 2006-12-19
+=== 1.1.2 / 2006-12-19
 
 * 2 minor enhancements
   * Improved []= and [] to be more idiomatic.
@@ -43,14 +52,14 @@
   * NEARLY have RubyToRuby self-cloning and passing tests again.
   * Minor cleanup
 
-== 1.1.1 / 2006-11-13
+=== 1.1.1 / 2006-11-13
 
 * 3 bug fixes
   * Fixed procs
   * Cleaned return when no return values.
   * Rewrote process_if. No more elsif but no more bugs. :)
 
-== 1.1.0 / 2006-10-11
+=== 1.1.0 / 2006-10-11
 
 * 2 major enhancements
   * Released separately from ZenHacks.

data/lib/ruby2ruby.rb

@@ -11,7 +11,7 @@ class NilClass # Objective-C trick
 end
 
 class RubyToRuby < SexpProcessor
-  VERSION = '1.1.5'
+  VERSION = '1.1.6'
   LINE_LENGTH = 78
 
   def self.translate(klass_or_str, method = nil)
@@ -90,12 +90,16 @@ class RubyToRuby < SexpProcessor
 
   def process_argscat(exp)
     args = []
+
     ary = exp.shift
     ary.shift # :array
     until ary.empty? do
       args << process(ary.shift)
     end
+
     args << "*#{process(exp.shift)}"
+    args << process(exp.shift) unless exp.empty? # optional block arg
+
     args.join ', '
   end
 
@@ -169,7 +173,7 @@ class RubyToRuby < SexpProcessor
   end
 
   def process_block_pass(exp)
-    bname = [:block_arg, process(exp.shift)]
+    bname = s(:block_arg, process(exp.shift)) # FIX
     call = exp.shift
 
     if Array === call.last then # HACK - I _really_ need rewrites to happen first
@@ -179,6 +183,7 @@ class RubyToRuby < SexpProcessor
       when :array then
         # do nothing
       else
+        has_args = Array === call.last and call.last.first == :array
         call << [:array] unless has_args
       end
       call.last << bname
@@ -362,8 +367,27 @@ class RubyToRuby < SexpProcessor
     "(#{process exp.shift}...#{process exp.shift})"
   end
 
+  def util_dthing(exp, dump=false)
+    s = []
+    s << exp.shift.dump[1..-2]
+    until exp.empty?
+      pt = exp.shift
+      s << case pt.first
+           when :str then
+             if dump then
+               pt.last.dump[1..-2]
+             else
+               pt.last.gsub(%r%/%, '\/')
+             end
+           else
+             "#\{#{process(pt)}}"
+           end
+    end
+    s
+  end
+
   def process_dregx(exp)
-    "/#{process_dstr(exp)[1..-2]}/"
+    "/#{util_dthing(exp).join}/"
   end
 
   def process_dregx_once(exp)
@@ -371,16 +395,7 @@ class RubyToRuby < SexpProcessor
   end
 
   def process_dstr(exp)
-    s = exp.shift.dump[0..-2]
-    until exp.empty?
-      pt = exp.shift
-      if pt.first == :str
-        s << process(pt)[1..-2]
-      else
-        s << '#{' + process(pt) + '}'
-      end
-    end
-    s + '"'
+    "\"#{util_dthing(exp, true).join}\""
   end
 
   def process_dsym(exp)
@@ -534,8 +549,9 @@ class RubyToRuby < SexpProcessor
 
   def process_lit(exp)
     obj = exp.shift
-    if obj.is_a? Range # to get around how parsed ranges turn into lits and lose parens
-      "(" + obj.inspect + ")"
+    case obj
+    when Range then
+      "(#{obj.inspect})"
     else
       obj.inspect
     end
@@ -722,7 +738,8 @@ class RubyToRuby < SexpProcessor
         code << "else"
         code << indent(els)
       else
-        unless stack.first == "process_block" then
+        unless stack.first == "process_block" ||
+               stack.first == "process_ensure" then
           code << "end\n"
         else
           r = [body, resbody.gsub(/rescue\n\s+/, 'rescue ')].join(' ')
@@ -909,7 +926,6 @@ class RubyToRuby < SexpProcessor
         end
       when :bmethod then
         body[0] = :scope
-        body.block.delete_at(1) # nuke the decl # REFACTOR
         masgn = body.masgn(true)
         if masgn then
           splat = self.splat(masgn[-1][-1])
@@ -939,8 +955,6 @@ class RubyToRuby < SexpProcessor
         body.find_and_replace_all(:dvar, :lvar)
       when :masgn then
         dasgn = body.masgn(true)
-        # DAMNIT body.block.dasgn_curr(true) - multiple values so can't use
-        body.block.delete_at(1) # nuke the decl
         splat = self.splat(dasgn[-1][-1])
         args.push(splat)
         body.find_and_replace_all(:dvar, :lvar)

data/test/test_ruby2ruby.rb

@@ -10,12 +10,58 @@ class TestRubyToRuby < Test::Unit::TestCase
     @processor = RubyToRuby.new
   end
 
+  def test_lit_regexp_slash
+    inn = s(:lit, /blah\/blah/)
+    out = '/blah\/blah/'
+
+    assert_equal out, @processor.process(inn)
+
+    r = eval(out)
+    assert_equal(/blah\/blah/, r)
+  end
+
+  def util_thingy(type)
+    s(type,
+      "blah",
+      s(:call, s(:lit, 1), :+, s(:array, s(:lit, 1))),
+      s(:str, 'blah"blah/blah'))
+  end
+
+  def test_dregx_slash
+    inn = util_thingy(:dregx)
+    out = '/blah#{(1 + 1)}blah"blah\/blah/'
+
+    assert_equal out, @processor.process(inn)
+
+    r = eval(out)
+    assert_equal(/blah2blah"blah\/blah/, r)
+  end
+
+  def test_dstr_quote
+    inn = util_thingy(:dstr)
+    out = '"blah#{(1 + 1)}blah\"blah/blah"'
+
+    assert_equal out, @processor.process(inn)
+
+    r = eval(out)
+    assert_equal "blah2blah\"blah/blah", r
+  end
+
+  def test_dsym_quote
+    inn = util_thingy(:dsym)
+    out = ':"blah#{(1 + 1)}blah\"blah/blah"'
+
+    assert_equal out, @processor.process(inn)
+
+    r = eval(out)
+    assert_equal :"blah2blah\"blah/blah", r
+  end
+
   def test_rewrite_defn_define_method
     inn = s(:defn, :splatted,
             s(:bmethod,
               s(:masgn, s(:dasgn_curr, :args)),
               s(:block,
-                s(:dasgn_curr, :y),
                 s(:dasgn_curr, :y, s(:call, s(:dvar, :args), :first)),
                 s(:call, s(:dvar, :y), :+, s(:array, s(:lit, 42))))))
     out = s(:defn, :splatted,
@@ -34,7 +80,6 @@ class TestRubyToRuby < Test::Unit::TestCase
               s(:bmethod,
                 s(:masgn, s(:dasgn_curr, :params)),
                 s(:block,
-                  s(:dasgn_curr, :force_reload, s(:dasgn_curr, :association, s(:dasgn_curr, :retval))),
                   s(:lit, 42)))))
     out = s(:defn, :group,
             s(:args, :"*params"),
@@ -104,6 +149,8 @@ rescue SyntaxError => e
   exit 1
 end
 
+RubyToRuby2::LINE_LENGTH = RubyToRuby::LINE_LENGTH # HACK
+
 class TestRubyToRuby2 < TestRubyToRuby
   def setup
     @processor = RubyToRuby2.new

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0.9
+rubygems_version: 0.9.4
 specification_version: 1
 name: ruby2ruby
 version: !ruby/object:Gem::Version 
-  version: 1.1.5
-date: 2007-02-13 00:00:00 -08:00
+  version: 1.1.6
+date: 2007-06-05 00:00:00 -07:00
 summary: ruby2ruby provides a means of generating pure ruby code easily from ParseTree's Sexps.
 require_paths: 
 - lib
@@ -37,10 +37,13 @@ files:
 - test/test_ruby2ruby.rb
 test_files: 
 - test/test_ruby2ruby.rb
-rdoc_options: []
-
-extra_rdoc_files: []
-
+rdoc_options: 
+- --main
+- README.txt
+extra_rdoc_files: 
+- History.txt
+- Manifest.txt
+- README.txt
 executables: []
 
 extensions: []
@@ -64,5 +67,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.0
+        version: 1.2.1
     version: