diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | tool/enc-unicode.rb | 4 | ||||
| -rwxr-xr-x | tool/transcode-tblgen.rb | 6 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,10 @@ +Fri Feb 17 09:44:55 2012 NARUSE, Yui <[email protected]> + + * 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 <[email protected]> * enum.c (id_lshift): use constant ID. 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 |