mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
tool/enc-unicode.rb: rewrote without flip-flop
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64814 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
450107efe4
commit
04a353fe02
1 changed files with 2 additions and 1 deletions
|
@ -535,6 +535,7 @@ if header
|
||||||
IO.popen([*NAME2CTYPE, out: tmp], "w") {|f| output.show(f, *syms)}
|
IO.popen([*NAME2CTYPE, out: tmp], "w") {|f| output.show(f, *syms)}
|
||||||
end while syms.pop
|
end while syms.pop
|
||||||
fds.each(&:close)
|
fds.each(&:close)
|
||||||
|
ff = nil
|
||||||
IO.popen(%W[diff -DUSE_UNICODE_AGE_PROPERTIES #{fds[1].path} #{fds[0].path}], "r") {|age|
|
IO.popen(%W[diff -DUSE_UNICODE_AGE_PROPERTIES #{fds[1].path} #{fds[0].path}], "r") {|age|
|
||||||
IO.popen(%W[diff -DUSE_UNICODE_PROPERTIES #{fds[2].path} -], "r", in: age) {|f|
|
IO.popen(%W[diff -DUSE_UNICODE_PROPERTIES #{fds[2].path} -], "r", in: age) {|f|
|
||||||
ansi = false
|
ansi = false
|
||||||
|
@ -545,7 +546,7 @@ if header
|
||||||
line.sub!(/\/\*ANSI\*\//, '1') if ansi
|
line.sub!(/\/\*ANSI\*\//, '1') if ansi
|
||||||
line.gsub!(/\(int\)\((?:long|size_t)\)&\(\(struct uniname2ctype_pool_t \*\)0\)->uniname2ctype_pool_(str\d+),\s+/,
|
line.gsub!(/\(int\)\((?:long|size_t)\)&\(\(struct uniname2ctype_pool_t \*\)0\)->uniname2ctype_pool_(str\d+),\s+/,
|
||||||
'uniname2ctype_offset(\1), ')
|
'uniname2ctype_offset(\1), ')
|
||||||
if (/^(uniname2ctype_hash) /=~line)..(/^\}/=~line)
|
if ff = (!ff ? /^(uniname2ctype_hash) /=~line : /^\}/!~line) # no line can match both, exclusive flip-flop
|
||||||
line.sub!(/^( *(?:register\s+)?(.*\S)\s+hval\s*=\s*)(?=len;)/, '\1(\2)')
|
line.sub!(/^( *(?:register\s+)?(.*\S)\s+hval\s*=\s*)(?=len;)/, '\1(\2)')
|
||||||
end
|
end
|
||||||
puts line
|
puts line
|
||||||
|
|
Loading…
Reference in a new issue