ruby2ruby 1.1.8 → 1.1.9

data/History.txt

@@ -1,3 +1,22 @@
+=== 1.1.9 / 2008-06-09
+
+* 5 minor enhancements:
+
+  * Added more defensive programming in the tests to make it work with 1.9 and rubinius better.
+  * Converted r2r_show to more plain parse style, no more discover_new_classes.
+  * Made Proc#to_sexp and #to_ruby more resiliant.
+  * Started to work on fallback to ruby_parser code. Should prolly do flog first.
+  * Updated rakefile and readme format for hoe. Much cleaner!
+
+* 6 bug fixes:
+
+  * Added 1.9 fixes.
+  * Added code to tests to isolate rubyinline builds.
+  * Fixed miniunit-deprecated assertions
+  * Fixes for const2/3, esp in class names
+  * Renamed ProcStoreTmp#name to #new_name. dur.
+  * Skip proc tests in 1.9 since they require ParseTree.
+
 === 1.1.8 / 2007-08-21
 
 * 6 minor enhancements:

data/README.txt

@@ -1,6 +1,7 @@
-ruby2ruby
-    http://seattlerb.rubyforge.org/
-    http://rubyforge.org/projects/seattlerb
+= ruby2ruby
+
+* http://seattlerb.rubyforge.org/
+* http://rubyforge.org/projects/seattlerb
 
 == DESCRIPTION:
 

data/Rakefile

@@ -1,6 +1,7 @@
 # -*- ruby -*-
 
-dirs = %w(../../ParseTree/dev/lib ../../ParseTree/dev/test:lib)
+dirs = (%w(lib ../../ParseTree/dev/test) +
+        %w(ParseTree RubyInline ruby_parser).map { |p| "../../#{p}/dev/lib" })
 $:.push(*dirs)
 ENV['RUBY_FLAGS'] = "-I" + dirs.join(":")
 
@@ -8,14 +9,16 @@ require 'rubygems'
 require 'hoe'
 require './lib/ruby2ruby.rb'
 
-Hoe.new('ruby2ruby', RubyToRuby::VERSION) do |p|
-  p.rubyforge_name = 'seattlerb'
-  p.summary = 'ruby2ruby provides a means of generating pure ruby code easily from ParseTree\'s Sexps.'
-  p.description = p.paragraphs_of('README.txt', 2).join
-  p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1].map {|u| u.strip }
-  p.changes = p.paragraphs_of('History.txt', 0..4).join("\n\n")
-  p.clean_globs << File.expand_path("~/.ruby_inline")
-  p.extra_deps << "ParseTree"
+Hoe.new('ruby2ruby', RubyToRuby::VERSION) do |r2r|
+  r2r.rubyforge_name = 'seattlerb'
+  r2r.developer('Ryan Davis', 'ryand-ruby@zenspider.com')
+
+  r2r.clean_globs << File.expand_path("~/.ruby_inline")
+  r2r.extra_deps << "ParseTree"
+
+  r2r.multiruby_skip << "rubinius"
 end
 
+task :test => :clean
+
 # vim: syntax=Ruby

data/bin/r2r_show

@@ -2,43 +2,28 @@
 
 begin require 'rubygems' rescue LoadError end
 require 'ruby2ruby'
+require 'parse_tree'
 
-def discover_new_classes_from
-  old_classes = []
-  ObjectSpace.each_object(Module) do |klass|
-    old_classes << klass
-  end
+$h ||= false
 
-  yield
+if $h then
+  puts "usage: #{File.basename $0} [options] [file...]"
+  puts "options:"
+  puts "-h      : display usage"
 
-  new_classes = []
-  ObjectSpace.each_object(Module) do |klass|
-    new_classes << klass
-  end
-
-  new_classes -= old_classes
-  new_classes = [ eval($c) ] if defined? $c
-  new_classes
+  exit 1
 end
 
-$f = true unless defined? $f
-
-new_classes = discover_new_classes_from do
-  ARGV.unshift "-" if ARGV.empty?
-  ARGV.each do |name|
-    if name == "-" then
-      code = $stdin.read
-      code = "class Example; def example; #{code}; end; end" if $f
-      eval code unless code.nil?
-    else
-      require name
-    end
-  end
-end
+ARGV.push "-" if ARGV.empty?
 
-result = ParseTree.new.parse_tree(*new_classes)
+parse_tree = ParseTree.new
+ruby2ruby  = Ruby2Ruby.new
 
-result = result[0][3][2][1][2..-1] if $f
+ARGV.each do |file|
+  ruby = file == "-" ? $stdin.read : File.read(file)
 
-puts RubyToRuby.new.process(result.first)
+  sexp = parse_tree.parse_tree_for_string(ruby, file).first
+
+  puts ruby2ruby.process(sexp)
+end
 

data/lib/ruby2ruby.rb

@@ -1,14 +1,13 @@
 #!/usr/bin/env ruby -w
 
 begin require 'rubygems'; rescue LoadError; end
-require 'parse_tree'
 require 'sexp_processor'
 require 'unified_ruby'
 
 class Ruby2Ruby < SexpProcessor
   include UnifiedRuby
 
-  VERSION = '1.1.8'
+  VERSION = '1.1.9'
   LINE_LENGTH = 78
 
   ##
@@ -28,6 +27,7 @@ class Ruby2Ruby < SexpProcessor
                  ]
 
   def self.translate(klass_or_str, method = nil)
+    require 'parse_tree'
     self.new.process(ParseTree.translate(klass_or_str, method))
   end
 
@@ -274,7 +274,10 @@ class Ruby2Ruby < SexpProcessor
   end
 
   def process_cdecl(exp)
-    "#{exp.shift} = #{process(exp.shift)}"
+    lhs = exp.shift
+    lhs = process lhs if Sexp === lhs
+    rhs = process exp.shift
+    "#{lhs} = #{rhs}"
   end
 
   def process_class(exp)
@@ -1000,30 +1003,39 @@ class Ruby2Ruby < SexpProcessor
   end
 
   def util_module_or_class(exp, is_class=false)
-    s = "#{exp.shift}"
+    result = []
+
+    name = exp.shift
+    name = process name if Sexp === name
+
+    result << name
 
     if is_class then
       superk = process(exp.shift)
-      s << " < #{superk}" if superk
+      result << " < #{superk}" if superk
     end
 
-    s << "\n"
+    result << "\n"
 
     body = []
     begin
       code = process(exp.shift).chomp
       body << code unless code.nil? or code.empty?
     end until exp.empty?
+
     unless body.empty? then
       body = indent(body.join("\n\n")) + "\n"
     else
       body = ""
     end
-    s + body + "end"
+    result << body
+    result << "end"
+
+    result.join
   end
 
   def indent(s)
-    s.to_s.map{|line| @indent + line}.join
+    s.to_s.split(/\n/).map{|line| @indent + line}.join("\n")
   end
 end
 
@@ -1042,8 +1054,10 @@ class Method
   end
 
   def to_sexp
+    require 'parse_tree'
+    parser = ParseTree.new(false)
     with_class_and_method_name do |klass, method|
-      ParseTree.new(false).parse_tree_for_method(klass, method)
+      parser.parse_tree_for_method(klass, method)
     end
   end
 
@@ -1054,7 +1068,7 @@ end
 
 class ProcStoreTmp
   @@n = 0
-  def self.name
+  def self.new_name
     @@n += 1
     return :"myproc#{@@n}"
   end
@@ -1062,7 +1076,7 @@ end
 
 class UnboundMethod
   def to_ruby
-    name = ProcStoreTmp.name
+    name = ProcStoreTmp.new_name
     ProcStoreTmp.send(:define_method, name, self)
     m = ProcStoreTmp.new.method(name)
     result = m.to_ruby.sub(/def #{name}(?:\(([^\)]*)\))?/,
@@ -1073,22 +1087,22 @@ end
 
 class Proc
   def to_method
-    name = ProcStoreTmp.name
+    name = ProcStoreTmp.new_name
     ProcStoreTmp.send(:define_method, name, self)
     ProcStoreTmp.new.method(name)
   end
 
   def to_sexp
-    body = self.to_method.to_sexp[2][1..-1]
-    [:proc, *body]
+    sexp = self.to_method.to_sexp
+    body = sexp[2]
+    body[0] = :block
+    args = body.delete_at 1
+    body = body[1] if body.size == 2
+
+    [:iter, [:fcall, :proc], args, body]
   end
 
   def to_ruby
-    ruby = self.to_method.to_ruby
-    ruby.sub!(/\A(def \S+)\(([^\)]*)\)/, '\1 |\2|')     # move args
-    ruby.sub!(/\Adef[^\n\|]+/, 'proc { ')               # strip def name
-    ruby.sub!(/end\Z/, '}')                             # strip end
-    ruby.gsub!(/\s+$/, '')                              # trailing WS bugs me
-    ruby
+    Ruby2Ruby.new.process(self.to_sexp).sub(/^\Aproc do/, 'proc {').sub(/end\Z/, '}')
   end
 end

data/test/test_ruby2ruby.rb

@@ -4,19 +4,43 @@ $TESTING = true
 
 $: << 'lib'
 
+SKIP_PROCS = RUBY_VERSION >= "1.9" or defined? RUBY_ENGINE
+
 require 'test/unit'
 require 'ruby2ruby'
 require 'pt_testcase'
+require 'fileutils'
+require 'tmpdir'
+
+FileUtils.rm_rf File.expand_path("~/.ruby_inline") # for self-translation
 
 class TestRuby2Ruby < Test::Unit::TestCase
+
+  alias :refute_nil :assert_not_nil unless defined? Mini
+
   def setup
+    super
     @processor = Ruby2Ruby.new
   end
 
+  def teardown
+    unless $DEBUG then
+      FileUtils.rm_rf @rootdir
+      ENV.delete 'INLINEDIR'
+    end if defined?(@rootdir) && @rootdir
+  end
+
+  def util_setup_inline
+    @rootdir = File.join(Dir.tmpdir, "test_ruby_to_ruby.#{$$}")
+    Dir.mkdir @rootdir, 0700 unless test ?d, @rootdir
+    ENV['INLINEDIR'] = @rootdir
+  end
+
   def test_proc_to_ruby
+    util_setup_inline
     block = proc { puts "something" }
-    assert_equal %Q|proc {\n  puts("something")\n}|, block.to_ruby
-  end
+    assert_equal 'proc { puts("something") }', block.to_ruby
+  end unless SKIP_PROCS
 
   def test_lit_regexp_slash
     inn = s(:lit, /blah\/blah/)
@@ -66,17 +90,19 @@ class TestRuby2Ruby < Test::Unit::TestCase
   end
 
   def test_proc_to_sexp
+    util_setup_inline
     p = proc { 1 + 1 }
-    s = [:proc, nil, [:call, [:lit, 1], :+, [:array, [:lit, 1]]]]
+    s = [:iter, [:fcall, :proc], nil, [:call, [:lit, 1], :+, [:array, [:lit, 1]]]]
     assert_equal s, p.to_sexp
-  end
+  end unless SKIP_PROCS
 
   def test_unbound_method_to_ruby
-    r = "proc { ||\n  p = proc { (1 + 1) }\n  s = [:proc, nil, [:call, [:lit, 1], :+, [:array, [:lit, 1]]]]\n  assert_equal(s, p.to_sexp)\n}"
+    util_setup_inline
+    r = "proc { ||\n  util_setup_inline\n  p = proc { (1 + 1) }\n  s = [:iter, [:fcall, :proc], nil, [:call, [:lit, 1], :+, [:array, [:lit, 1]]]]\n  assert_equal(s, p.to_sexp)\n}"
     m = self.class.instance_method(:test_proc_to_sexp)
 
     assert_equal r, m.to_ruby
-  end
+  end unless SKIP_PROCS
 
   eval ParseTreeTestCase.testcases.map { |node, data|
     next if node == "vcall" # HACK
@@ -85,8 +111,8 @@ class TestRuby2Ruby < Test::Unit::TestCase
        pt = #{data['ParseTree'].inspect}
        rb = #{(data['Ruby2Ruby'] || data['Ruby']).inspect}
 
-       assert_not_nil pt, \"ParseTree for #{node} undefined\"
-       assert_not_nil rb, \"Ruby for #{node} undefined\"
+       refute_nil pt, \"ParseTree for #{node} undefined\"
+       refute_nil rb, \"Ruby for #{node} undefined\"
 
        assert_equal rb, @processor.process(pt)
      end"
@@ -99,21 +125,17 @@ end
 
 def morph_and_eval(processor, target, gen, n)
   begin
-    old_name = target.name
-    new_name = target.name.sub(/\d*$/, gen.to_s)
+    processor = Object.const_get processor if Symbol === processor
+    target    = Object.const_get target    if Symbol === target
+    old_name  = target.name
+    new_name  = target.name.sub(/\d*$/, gen.to_s)
     ruby = processor.translate(target).sub(old_name, new_name)
 
     eval ruby
     target.constants.each do |constant|
       eval "#{new_name}::#{constant} = #{old_name}::#{constant}"
     end
-  rescue SyntaxError => e
-    warn "Self-Translation Generation #{n} failed:"
-    warn "#{e.class}: #{e.message}"
-    warn ""
-    warn ruby
-    warn ""
-  rescue => e
+  rescue Exception => e
     warn "Self-Translation Generation #{n} failed:"
     warn "#{e.class}: #{e.message}"
     warn ""
@@ -138,29 +160,32 @@ end
 # t  new    2    3
 
 # Self-Translation: 1st Generation - morph Ruby2Ruby using Ruby2Ruby
-morph_and_eval Ruby2Ruby, Ruby2Ruby, 2, 1 do
+morph_and_eval :Ruby2Ruby, :Ruby2Ruby, 2, 1 do
   class TestRuby2Ruby1 < TestRuby2Ruby
     def setup
+      super
       @processor = Ruby2Ruby2.new
     end
   end
-end
+end unless SKIP_PROCS
 
 # Self-Translation: 2nd Generation - morph TestRuby2Ruby using Ruby2Ruby
-morph_and_eval Ruby2Ruby, TestRuby2Ruby, 2, 2 do
+morph_and_eval :Ruby2Ruby, :TestRuby2Ruby, 2, 2 do
   # Self-Translation: 3rd Generation - test Ruby2Ruby2 with TestRuby2Ruby1
   class TestRuby2Ruby3 < TestRuby2Ruby2
     def setup
+      super
       @processor = Ruby2Ruby2.new
     end
   end
-end
+end unless SKIP_PROCS
 
 # Self-Translation: 4th (and final) Generation - fully circular
-morph_and_eval(Ruby2Ruby2, Ruby2Ruby2, 3, 4) do
+morph_and_eval(:Ruby2Ruby2, :Ruby2Ruby2, 3, 4) do
   class TestRuby2Ruby4 < TestRuby2Ruby3
     def setup
+      super
       @processor = Ruby2Ruby3.new
     end
   end
-end rescue nil # for Ruby2Ruby2 at the top
+end unless SKIP_PROCS

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ruby2ruby
 version: !ruby/object:Gem::Version 
-  version: 1.1.8
+  version: 1.1.9
 platform: ruby
 authors: 
 - Ryan Davis
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2007-12-22 00:00:00 -08:00
+date: 2008-06-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -28,10 +28,11 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.4.0
+        version: 1.5.3
     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: ryand-ruby@zenspider.com
+email: 
+- ryand-ruby@zenspider.com
 executables: 
 - r2r_show
 extensions: []
@@ -72,9 +73,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: seattlerb
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
-summary: ruby2ruby provides a means of generating pure ruby code easily from ParseTree's Sexps.
+summary: ruby2ruby provides a means of generating pure ruby code easily from ParseTree's Sexps
 test_files: 
 - test/test_ruby2ruby.rb