From bae9e4a0bc30b7a54dc8872dfcb450c715143e10 Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 17 Feb 2012 00:54:14 +0000
Subject: merge revision(s) 34650:

	* tool/transcode-tblgen.rb (import_ucm): don't use \h because the
	  script should work with ruby 1.8.

	* tool/enc-unicode.rb: ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@34651 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 tool/enc-unicode.rb      | 4 ++--
 tool/transcode-tblgen.rb | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'tool')

diff --git a/tool/enc-unicode.rb b/tool/enc-unicode.rb
index f749e3f86d..f7b2862dd7 100755
--- a/tool/enc-unicode.rb
+++ b/tool/enc-unicode.rb
@@ -137,7 +137,7 @@ def parse_scripts(data)
         make_const(current, cps, file[:title])
         (names[file[:title]] ||= []) << current
         cps = []
-      elsif /^(\h+)(?:..(\h+))?\s*;\s*(\w+)/ =~ line
+      elsif /^([0-9a-fA-F]+)(?:..([0-9a-fA-F]+))?\s*;\s*(\w+)/ =~ line
         current = $3
         $2 ? cps.concat(($1.to_i(16)..$2.to_i(16)).to_a) : cps.push($1.to_i(16))
       end
@@ -192,7 +192,7 @@ def parse_age(data)
       ages << current
       last_constname = constname
       cps = []
-    elsif /^(\h+)(?:..(\h+))?\s*;\s*(\d+\.\d+)/ =~ line
+    elsif /^([0-9a-fA-F]+)(?:..([0-9a-fA-F]+))?\s*;\s*(\d+\.\d+)/ =~ line
       current = $3
       $2 ? cps.concat(($1.to_i(16)..$2.to_i(16)).to_a) : cps.push($1.to_i(16))
     end
diff --git a/tool/transcode-tblgen.rb b/tool/transcode-tblgen.rb
index dc1f6ea911..b25901d375 100755
--- a/tool/transcode-tblgen.rb
+++ b/tool/transcode-tblgen.rb
@@ -753,13 +753,13 @@ def import_ucm(path)
   from_ucs = []
   File.foreach(File.join($srcdir, "ucm", path)) do |line|
     uc, bs, fb = nil
-    if /^<U(\h+)>\s*([\+\hx\\]+)\s*\|(\d)/ =~ line
+    if /^<U([0-9a-fA-F]+)>\s*([\+0-9a-fA-Fx\\]+)\s*\|(\d)/ =~ line
       uc = $1.hex
       bs = $2.delete('x\\')
       fb = $3.to_i
       next if uc < 128 && uc == bs.hex
-    elsif /^([<U\h>+]+)\s*([\+\hx\\]+)\s*\|(\d)/ =~ line
-      uc = $1.scan(/\h+>/).map(&:hex).pack("U*").unpack("H*")[0]
+    elsif /^([<U0-9a-fA-F>+]+)\s*([\+0-9a-fA-Fx\\]+)\s*\|(\d)/ =~ line
+      uc = $1.scan(/[0-9a-fA-F]+>/).map(&:hex).pack("U*").unpack("H*")[0]
       bs = $2.delete('x\\')
       fb = $3.to_i
     end
-- 
cgit v1.2.3