diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-14 15:06:19 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-14 15:06:19 +0000 |
| commit | e24346d6c6b4bdf91e1e32bfd53a328086b8d772 (patch) | |
| tree | 14b9d316039775b8c3d2a1c9cc92a1d0d3237019 | |
| parent | 22e711c4bf382422f861d598ff6dd188d0482951 (diff) | |
* enc/trans/gb18030.trans: get rid of a 1.9 feature for cross
compile. [ruby-core:21345]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@21512 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | enc/trans/gb18030.trans | 9 | ||||
| -rw-r--r-- | tool/transcode-tblgen.rb | 2 | ||||
| -rw-r--r-- | version.h | 4 |
4 files changed, 12 insertions, 8 deletions
@@ -1,3 +1,8 @@ +Thu Jan 15 00:06:12 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * enc/trans/gb18030.trans: get rid of a 1.9 feature for cross + compile. [ruby-core:21345] + Wed Jan 14 23:57:28 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> * encoding.c (rb_locale_charmap): fallback to codepage if no diff --git a/enc/trans/gb18030.trans b/enc/trans/gb18030.trans index a32ad2e478..700522c9f0 100644 --- a/enc/trans/gb18030.trans +++ b/enc/trans/gb18030.trans @@ -3,15 +3,15 @@ <% require "gb18030-tbl" - transcode_tbl_only "GB18030", "UTF-8", [["{00-7f}", :nomap], - *GB18030_TO_UCS_TBL, + transcode_tbl_only "GB18030", "UTF-8", [["{00-7f}", :nomap]] + + GB18030_TO_UCS_TBL + [ ["{90-e2}{30-39}{81-fe}{30-39}", :func_so], ["e3{30-31}{81-fe}{30-39}", :func_so], ["e332{81-99}{30-39}", :func_so], ["e3329a{30-35}", :func_so], # "E3329A35" is U+10FFFF ] - transcode_tbl_only "UTF-8", "GB18030", [["{00-7f}", :nomap], - *GB18030_TO_UCS_TBL.map {|a,b| [b,a] }, + transcode_tbl_only "UTF-8", "GB18030", [["{00-7f}", :nomap]] + + GB18030_TO_UCS_TBL.map {|a,b| [b,a] } + [ ["f0{90-bf}{80-bf}{80-bf}", :func_so], ["{f1-f3}{80-bf}{80-bf}{80-bf}", :func_so], ["f4{80-8f}{80-bf}{80-bf}", :func_so] @@ -81,5 +81,4 @@ Init_gb18030(void) { rb_register_transcoder(&rb_from_GB18030); rb_register_transcoder(&rb_to_GB18030); - } diff --git a/tool/transcode-tblgen.rb b/tool/transcode-tblgen.rb index 170c314554..0269b8933c 100644 --- a/tool/transcode-tblgen.rb +++ b/tool/transcode-tblgen.rb @@ -607,7 +607,7 @@ end TRANSCODERS = [] TRANSCODE_GENERATED_TRANSCODER_CODE = '' -def transcode_tbl_only (from, to, map) +def transcode_tbl_only(from, to, map) if VERBOSE_MODE if from.empty? || to.empty? STDERR.puts "converter for #{from.empty? ? to : from}" @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_RELEASE_DATE "2009-01-14" +#define RUBY_RELEASE_DATE "2009-01-15" #define RUBY_PATCHLEVEL 5000 #define RUBY_BRANCH_NAME "trunk" @@ -8,7 +8,7 @@ #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 1 -#define RUBY_RELEASE_DAY 14 +#define RUBY_RELEASE_DAY 15 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |