naruse	2008-02-13 16:26:52 +0900 (Wed, 13 Feb 2008)

  New Revision: 15456

  Modified files:
    trunk/ChangeLog
    trunk/bootstraptest/test_method.rb
    trunk/enc/depend
    trunk/instruby.rb
    trunk/lib/uri/generic.rb
    trunk/mkconfig.rb

  Log:
    * lib/uri/generic.rb: revert r15442. 2nd argument of String#sub parse
      escapes. [ruby-dev:33726]
    
    * bootstraptest/test_method.rb enc/depend instruby.rb lib/mkmf.rb
      mkconfig.rb: revert r15443. ditto.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15456&r2=15455&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/uri/generic.rb?r1=15456&r2=15455&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/bootstraptest/test_method.rb?r1=15456&r2=15455&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/mkconfig.rb?r1=15456&r2=15455&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/instruby.rb?r1=15456&r2=15455&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/depend?r1=15456&r2=15455&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15455)
+++ ChangeLog	(revision 15456)
@@ -1,3 +1,11 @@
+Wed Feb 13 16:21:48 2008  NARUSE, Yui  <naruse@r...>
+
+	* lib/uri/generic.rb: revert r15442. 2nd argument of String#sub parse
+	  escapes. [ruby-dev:33726]
+
+	* bootstraptest/test_method.rb enc/depend instruby.rb lib/mkmf.rb
+	  mkconfig.rb: revert r15443. ditto.
+
 Wed Feb 13 11:20:26 2008  NAKAMURA Usaku  <usa@r...>
 
 	* enc/depend: fix typo.
Index: mkconfig.rb
===================================================================
--- mkconfig.rb	(revision 15455)
+++ mkconfig.rb	(revision 15456)
@@ -159,7 +159,7 @@
 	config[v] = false
 	RbConfig::expand(key, config)
 	config[v] = key
-	key = key.gsub(/\#{Regexp.quote(pat)}(?=\\s|\\z)/n, sub) if pat
+	key = key.gsub(/\#{Regexp.quote(pat)}(?=\\s|\\z)/n) {sub} if pat
 	key
       else
 	var
Index: enc/depend
===================================================================
--- enc/depend	(revision 15455)
+++ enc/depend	(revision 15456)
@@ -46,12 +46,12 @@
 	echo EXPORTS > <%=df%>
 	echo <%=EXPORT_PREFIX%>Init_<%=File.basename(e)%> >> <%=df%>
 %   end
-	<%=link_so.sub(/\$\(OBJS\)/, obj).sub(/\$\(DEFFILE\)/, df.to_s).gsub(/-(?:implib|pdb):/, "\\&enc/#{e.sub(/[^\/]+\z/, '')}")%>
+	<%=link_so.sub(/\$\(OBJS\)/) {obj}.sub(/\$\(DEFFILE\)/) {df}.gsub(/-(?:implib|pdb):/) {|s|"#{s}enc/#{e.sub(/[^\/]+\z/, '')}"}%>
 
 % end
 % dependencies.each do |e|
 enc/<%=e%>.$(OBJEXT): $(srcdir)/enc/<%=e%>.c
-	<%=COMPILE_C.sub(/\$\(<(?:.*)\)/, "$(srcdir)/enc/#{e}.c")%>
+	<%=COMPILE_C.sub(/\$\(<(?:.*)\)/) {"$(srcdir)/enc/#{e}.c"}%>
 % end
 
 clean:
Index: bootstraptest/test_method.rb
===================================================================
--- bootstraptest/test_method.rb	(revision 15455)
+++ bootstraptest/test_method.rb	(revision 15456)
@@ -657,7 +657,7 @@
 
 
 tests.each{|setup, methods| setup = setup.dup; setup.strip!
-  setup = BASE.gsub(/<TEST>/, setup)
+  setup = BASE.gsub(/<TEST>/){setup}
   methods.split(/\n/).each{|m| m = m.dup; m.strip!
     next if m.empty?
     expr = "#{setup}; #{m}"
Index: lib/uri/generic.rb
===================================================================
--- lib/uri/generic.rb	(revision 15455)
+++ lib/uri/generic.rb	(revision 15456)
@@ -1105,7 +1105,7 @@
 
     @@to_s = Kernel.instance_method(:to_s)
     def inspect
-      @@to_s.bind(self).call.sub!(/>\z/, " URL:#{self}>")
+      @@to_s.bind(self).call.sub!(/>\z/) {" URL:#{self}>"}
     end
 
     def coerce(oth)
Index: instruby.rb
===================================================================
--- instruby.rb	(revision 15455)
+++ instruby.rb	(revision 15456)
@@ -275,7 +275,7 @@
       shebang = f.gets
       body = f.read
 
-      if shebang.sub!(/^\#!.*?ruby\b/, "#!" + ruby_shebang)
+      if shebang.sub!(/^\#!.*?ruby\b/) {"#!" + ruby_shebang}
         f.rewind
         f.print shebang, body
         f.truncate(f.pos)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/