kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* lib/uri/generic.rb: revert r15442. 2nd argument of String#sub parse

Browse source 
escapes. [ruby-dev:33726]

* bootstraptest/test_method.rb enc/depend instruby.rb lib/mkmf.rb
  mkconfig.rb: revert r15443. ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15456 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2008-02-13 07:26:52 +00:00
parent f6628871b5
commit a8739621cf
6 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Wed Feb 13 16:21:48 2008 NARUSE, Yui <naruse@ruby-lang.org>
* 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@ruby-lang.org> Wed Feb 13 11:20:26 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* enc/depend: fix typo. * enc/depend: fix typo.

2
bootstraptest/test_method.rb
View file

@ -657,7 +657,7 @@ C1.new.m(1,2,3,4,5,6,7,8,9)
tests.each{|setup, methods| setup = setup.dup; setup.strip! 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! methods.split(/\n/).each{|m| m = m.dup; m.strip!
next if m.empty? next if m.empty?
expr = "#{setup}; #{m}" expr = "#{setup}; #{m}"

4
enc/depend
View file

@ -46,12 +46,12 @@ $(ENCSODIR)/<%=e%>.$(DLEXT): <%=obj%>
echo EXPORTS > <%=df%> echo EXPORTS > <%=df%>
echo <%=EXPORT_PREFIX%>Init_<%=File.basename(e)%> >> <%=df%> echo <%=EXPORT_PREFIX%>Init_<%=File.basename(e)%> >> <%=df%>
% end % 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 % end
% dependencies.each do |e| % dependencies.each do |e|
enc/<%=e%>.$(OBJEXT): $(srcdir)/enc/<%=e%>.c enc/<%=e%>.$(OBJEXT): $(srcdir)/enc/<%=e%>.c
<%=COMPILE_C.sub(/\$\(<(?:.*)\)/, "$(srcdir)/enc/#{e}.c")%> <%=COMPILE_C.sub(/\$\(<(?:.*)\)/) {"$(srcdir)/enc/#{e}.c"}%>
% end % end
clean: clean:

2
instruby.rb
View file

@ -275,7 +275,7 @@ install?(:local, :comm, :bin) do
shebang = f.gets shebang = f.gets
body = f.read body = f.read
if shebang.sub!(/^\#!.*?ruby\b/, "#!" + ruby_shebang) if shebang.sub!(/^\#!.*?ruby\b/) {"#!" + ruby_shebang}
f.rewind f.rewind
f.print shebang, body f.print shebang, body
f.truncate(f.pos) f.truncate(f.pos)

2
lib/uri/generic.rb
View file

@ -1105,7 +1105,7 @@ module URI
@@to_s = Kernel.instance_method(:to_s) @@to_s = Kernel.instance_method(:to_s)
def inspect def inspect
@@to_s.bind(self).call.sub!(/>\z/, " URL:#{self}>") @@to_s.bind(self).call.sub!(/>\z/) {" URL:#{self}>"}
end end
def coerce(oth) def coerce(oth)

2
mkconfig.rb
View file

@ -159,7 +159,7 @@ print <<EOS
config[v] = false config[v] = false
RbConfig::expand(key, config) RbConfig::expand(key, config)
config[v] = key 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 key
else else
var var