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
---
 ext/json/lib/json/pure/generator.rb | 2 +-
 ext/json/lib/json/pure/parser.rb    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'ext/json/lib')

diff --git a/ext/json/lib/json/pure/generator.rb b/ext/json/lib/json/pure/generator.rb
index 0fe73be41a..c8bbfd09ee 100644
--- a/ext/json/lib/json/pure/generator.rb
+++ b/ext/json/lib/json/pure/generator.rb
@@ -40,7 +40,7 @@ module JSON
   # Convert a UTF8 encoded Ruby string _string_ to a JSON string, encoded with
   # UTF16 big endian characters as \u????, and return it.
   def utf8_to_json(string) # :nodoc:
-    string = string.gsub(/["\\\/\x0-\x1f]/) { |c| MAP[c] }
+    string = string.gsub(/["\\\/\x0-\x1f]/) { MAP[$&] }
     string.gsub!(/(
                     (?:
                       [\xc2-\xdf][\x80-\xbf]    |
diff --git a/ext/json/lib/json/pure/parser.rb b/ext/json/lib/json/pure/parser.rb
index e886ba8d2c..39bee54269 100644
--- a/ext/json/lib/json/pure/parser.rb
+++ b/ext/json/lib/json/pure/parser.rb
@@ -122,7 +122,8 @@ module JSON
       def parse_string
         if scan(STRING)
           return '' if self[1].empty?
-          self[1].gsub(%r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff]))n) do |c|
+          self[1].gsub(%r((?:\\[\\bfnrt"/]|(?:\\u(?:[A-Fa-f\d]{4}))+|\\[\x20-\xff]))n) do
+            c = $&
             if u = UNESCAPE_MAP[c[1]]
               u
             else # \uXXXX
-- 
cgit v1.2.3