[前][次][番号順一覧][スレッド一覧]

ruby-changes:22601

From: naruse <ko1@a...>
Date: Fri, 17 Feb 2012 09:53:22 +0900 (JST)
Subject: [ruby-changes:22601] naruse:r34650 (trunk): * tool/transcode-tblgen.rb (import_ucm): don't use \h because the

naruse	2012-02-17 09:53:13 +0900 (Fri, 17 Feb 2012)

  New Revision: 34650

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

  Log:
    * 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:
    trunk/ChangeLog
    trunk/tool/enc-unicode.rb
    trunk/tool/transcode-tblgen.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 34649)
+++ ChangeLog	(revision 34650)
@@ -1,3 +1,10 @@
+Fri Feb 17 09:44:55 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.
+
 Fri Feb 17 07:33:29 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* enum.c (id_lshift): use constant ID.
Index: tool/enc-unicode.rb
===================================================================
--- tool/enc-unicode.rb	(revision 34649)
+++ tool/enc-unicode.rb	(revision 34650)
@@ -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: tool/transcode-tblgen.rb
===================================================================
--- tool/transcode-tblgen.rb	(revision 34649)
+++ tool/transcode-tblgen.rb	(revision 34650)
@@ -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/

[前][次][番号順一覧][スレッド一覧]