From 40d8d38909fe15a96887f4097d95d7323fc93fb7 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 12 Feb 2008 06:18:06 +0000
Subject: * ext/json/lib/json/pure/generator.rb,
 ext/json/lib/json/pure/parser.rb, ext/openssl/lib/openssl/x509.rb,
 ext/win32ole/sample/olegen.rb, lib/date/format.rb, lib/irb/context.rb,
 lib/irb/workspace.rb, lib/net/http.rb, lib/net/imap.rb,
 lib/rdoc/generator.rb, lib/rdoc/markup/to_html.rb,
 lib/rdoc/markup/to_latex.rb, lib/rdoc/parsers/parse_c.rb,
 lib/rdoc/ri/formatter.rb, lib/rexml/parsers/baseparser.rb,
 lib/rexml/quickpath.rb, lib/rexml/text.rb, lib/rss/parser.rb,
 lib/uri/common.rb, lib/uri/generic.rb, lib/webrick/httpresponse.rb,
 lib/webrick/httpservlet/filehandler.rb, lib/yaml/baseemitter.rb,
 lib/yaml/encoding.rb: performance tuning arround String#gsub.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15442 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rexml/parsers/baseparser.rb | 2 +-
 lib/rexml/quickpath.rb          | 9 +++------
 lib/rexml/text.rb               | 5 +++--
 3 files changed, 7 insertions(+), 9 deletions(-)

(limited to 'lib/rexml')

diff --git a/lib/rexml/parsers/baseparser.rb b/lib/rexml/parsers/baseparser.rb
index 85f2c4e46d..162d029a62 100644
--- a/lib/rexml/parsers/baseparser.rb
+++ b/lib/rexml/parsers/baseparser.rb
@@ -482,7 +482,7 @@ module REXML
         rv.gsub!( /\r\n?/, "\n" )
         matches = rv.scan( REFERENCE_RE )
         return rv if matches.size == 0
-        rv.gsub!( /&#0*((?:\d+)|(?:x[a-fA-F0-9]+));/ ) {|m|
+        rv.gsub!( /&#0*((?:\d+)|(?:x[a-fA-F0-9]+));/ ) {
           m=$1
           m = "0#{m}" if m[0] == ?x
           [Integer(m)].pack('U*')
diff --git a/lib/rexml/quickpath.rb b/lib/rexml/quickpath.rb
index c099db8579..cdf4c53017 100644
--- a/lib/rexml/quickpath.rb
+++ b/lib/rexml/quickpath.rb
@@ -170,15 +170,12 @@ module REXML
 			rest = path[ind+1..-1]
 
 			# have to change 'a [=<>] b [=<>] c' into 'a [=<>] b and b [=<>] c'
-			predicate.gsub!( /([^\s(and)(or)<>=]+)\s*([<>=])\s*([^\s(and)(or)<>=]+)\s*([<>=])\s*([^\s(and)(or)<>=]+)/u ) { 
-				"#$1 #$2 #$3 and #$3 #$4 #$5"
-			}
+			predicate.gsub!( /([^\s(and)(or)<>=]+)\s*([<>=])\s*([^\s(and)(or)<>=]+)\s*([<>=])\s*([^\s(and)(or)<>=]+)/u,
+				'\1 \2 \3 and \3 \4 \5' )
 			# Let's do some Ruby trickery to avoid some work:
 			predicate.gsub!( /&/u, "&&" )
 			predicate.gsub!( /=/u, "==" )
-			predicate.gsub!( /@(\w[-\w.]*)/u ) {
-				"attribute(\"#$1\")" 
-			}
+			predicate.gsub!( /@(\w[-\w.]*)/u, 'attribute("\1")' ) 
 			predicate.gsub!( /\bmod\b/u, "%" )
 			predicate.gsub!( /\b(\w[-\w.]*\()/u ) {
 				fname = $1
diff --git a/lib/rexml/text.rb b/lib/rexml/text.rb
index 73a72ae527..8bc87dbf32 100644
--- a/lib/rexml/text.rb
+++ b/lib/rexml/text.rb
@@ -345,7 +345,7 @@ module REXML
         copy.gsub!( SETUTITSBUS[2], SLAICEPS[2] )
         copy.gsub!( SETUTITSBUS[3], SLAICEPS[3] )
         copy.gsub!( SETUTITSBUS[4], SLAICEPS[4] )
-        copy.gsub!( /&#0*((?:\d+)|(?:x[a-f0-9]+));/ ) {|m|
+        copy.gsub!( /&#0*((?:\d+)|(?:x[a-f0-9]+));/ ) {
           m=$1
           #m='0' if m==''
           m = "0#{m}" if m[0] == ?x
@@ -380,7 +380,8 @@ module REXML
 
     # Unescapes all possible entities
     def Text::unnormalize( string, doctype=nil, filter=nil, illegal=nil )
-      string.gsub( /\r\n?/, "\n" ).gsub( REFERENCE ) { |ref|
+      string.gsub( /\r\n?/, "\n" ).gsub( REFERENCE ) {
+        ref = $&
         if ref[1] == ?#
           if ref[2] == ?x
             [ref[3...-1].to_i(16)].pack('U*')
-- 
cgit v1.2.3