naruse	2012-02-17 09:54:14 +0900 (Fri, 17 Feb 2012)

  New Revision: 34651

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=34651

  Log:
    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.

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/tool/enc-unicode.rb
    branches/ruby_1_9_3/tool/transcode-tblgen.rb
    branches/ruby_1_9_3/version.h

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 34650)
+++ ruby_1_9_3/ChangeLog	(revision 34651)
@@ -1,3 +1,10 @@
+Fri Feb 17 09:53:46 2012  NARUSE, Yui  <naruse@r...>
+
+	* tool/transcode-tblgen.rb (import_ucm): don't use \h because the
+	  script should work with ruby 1.8.
+
+	* tool/enc-unicode.rb: ditto.
+
 Thu Feb 16 17:54:14 2012  NARUSE, Yui  <naruse@r...>
 
 	* ext/dbm/extconf.rb: merge trunk's ext/dbm/extconf.rb and
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 34650)
+++ ruby_1_9_3/version.h	(revision 34651)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 126
+#define RUBY_PATCHLEVEL 127
 
 #define RUBY_RELEASE_DATE "2012-02-17"
 #define RUBY_RELEASE_YEAR 2012
Index: ruby_1_9_3/tool/enc-unicode.rb
===================================================================
--- ruby_1_9_3/tool/enc-unicode.rb	(revision 34650)
+++ ruby_1_9_3/tool/enc-unicode.rb	(revision 34651)
@@ -137,7 +137,7 @@
         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 @@
       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
Index: ruby_1_9_3/tool/transcode-tblgen.rb
===================================================================
--- ruby_1_9_3/tool/transcode-tblgen.rb	(revision 34650)
+++ ruby_1_9_3/tool/transcode-tblgen.rb	(revision 34651)
@@ -753,13 +753,13 @@
   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

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