kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

merge revision(s) 34650:

Browse source 
* 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
This commit is contained in:
naruse 2012-02-17 00:54:14 +00:00
parent a81c766340
commit bae9e4a0bc
4 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
Fri Feb 17 09:53:46 2012 NARUSE, Yui <naruse@ruby-lang.org>
* 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@ruby-lang.org>
* ext/dbm/extconf.rb: merge trunk's ext/dbm/extconf.rb and

4
tool/enc-unicode.rb
View file

@ -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

6
tool/transcode-tblgen.rb
View file

@ -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

2
version.h
View file

@ -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