From: Florian Frank <flori@...>
Date: 2007-06-06T01:16:13+09:00
Subject: [PATCH] Some small bug fixes for Ruby 1.9

This is a multi-part message in MIME format.
--------------090909030609000805040207
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit

Hi,

I have a small patch: The first stops irb's completion from crashing because of
methods, that now return symbols instead of strings. The second makes it
possible to build 1.9. with an installed Ruby 1.8. for bootstrapping.

-- 
Florian Frank

--------------090909030609000805040207
Content-Type: text/x-patch;
 name="symbol-and-compile.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
 filename="symbol-and-compile.patch"

Index: lib/irb/completion.rb
===================================================================
--- lib/irb/completion.rb	(revision 12440)
+++ lib/irb/completion.rb	(working copy)
@@ -89,7 +89,7 @@
 	rescue Exception
 	  candidates = []
 	end
-	candidates.grep(/^#{message}/).collect{|e| receiver + "::" + e}
+	candidates.grep(/^#{message}/).collect{|e| receiver.to_s + "::" + e}
 
       when /^(:[^:.]+)\.([^.]*)$/
 	# Symbol
@@ -188,7 +188,7 @@
       candidates.grep(/^#{message}/).collect do |e|
 	case e
 	when /^[a-zA-Z_]/
-	  receiver + "." + e
+	  receiver.to_s + "." + e
 	when /^[0-9]/
 	when *Operators
 	  #receiver + " " + e
Index: ext/extmk.rb
===================================================================
--- ext/extmk.rb	(revision 12440)
+++ ext/extmk.rb	(working copy)
@@ -69,7 +69,7 @@
       unless installrb.empty?
         config = CONFIG.dup
         install_dirs(target_prefix).each {|var, val| config[var] = val}
-        FileUtils.rm_f(installrb.values.collect {|f| RbConfig.expand(f, config)}, verbose: true)
+        FileUtils.rm_f(installrb.values.collect {|f| RbConfig.expand(f, config)}, :verbose => true)
       end
     end
     return false

--------------090909030609000805040207--