diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-26 13:25:09 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-26 13:25:09 +0000 |
| commit | 777c450ecf556c0688a5c314dbc8b4152c43537a (patch) | |
| tree | ffa466f109290de98efa81e3b2603f901fd44eaf | |
| parent | f9c4602ec9d807b26e88476ab9a8b3e5e94e541f (diff) | |
| download | ruby-777c450ecf556c0688a5c314dbc8b4152c43537a.tar.gz ruby-777c450ecf556c0688a5c314dbc8b4152c43537a.tar.xz ruby-777c450ecf556c0688a5c314dbc8b4152c43537a.zip | |
* tool/transcode-tb (ActionMap#each_firstbyte):
if :asis collides other mappings, use another.
* tool/transcode-tb (ActionMap#generate_info):
add :asis for ASIS.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23295 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | tool/transcode-tblgen.rb | 7 |
2 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,11 @@ +Sun Apr 26 22:17:02 2009 NARUSE, Yui <naruse@ruby-lang.org> + + * tool/transcode-tb (ActionMap#each_firstbyte): + if :asis collides other mappings, use another. + + * tool/transcode-tb (ActionMap#generate_info): + add :asis for ASIS. + Sun Apr 26 21:59:43 2009 NARUSE, Yui <naruse@ruby-lang.org> * transcode.c (ASIS): added for multi byte direct map. diff --git a/tool/transcode-tblgen.rb b/tool/transcode-tblgen.rb index 266b5a850..83fc198da 100644 --- a/tool/transcode-tblgen.rb +++ b/tool/transcode-tblgen.rb @@ -237,7 +237,10 @@ class ActionMap else ss.each_firstbyte {|byte, rest| h[byte] ||= {} - if h[byte][rest] + if h[byte][rest].nil? + elsif action == :asis + next + elsif h[byte][rest] != :asis raise "ambiguous %s or %s (%02X/%s)" % [h[byte][rest], action, byte, rest] end h[byte][rest] = action @@ -316,6 +319,8 @@ class ActionMap case info when :nomap "NOMAP" + when :asis + "ASIS" when :undef "UNDEF" when :invalid |