diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-05 00:05:11 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-05 00:05:11 +0000 |
| commit | 414d5071ff87e4ef65bad838f8217643e483ae78 (patch) | |
| tree | 92457456e449c01a80d9dbaf543ffaef4c20803b /tool/transcode-tblgen.rb | |
| parent | 7d8615882a1ee4f624fe7efaf829dbb5c73a098b (diff) | |
| download | ruby-414d5071ff87e4ef65bad838f8217643e483ae78.tar.gz ruby-414d5071ff87e4ef65bad838f8217643e483ae78.tar.xz ruby-414d5071ff87e4ef65bad838f8217643e483ae78.zip | |
Fix: DON'T move in_p because before in_p is replaced by buffered data.
* transcode.c: NOMAP is now multibyte direct map.
* transcode.c: remove ASIS.
* transcode_data.h: ditto.
* tool/transcode-tb (ActionMap#generate_info): remove :asis.
* tool/transcode-tb (ActionMap#generate_info): add :nomap0.
* enc/trans/utf8_mac.trans: replace :asis by :nomap0.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23344 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool/transcode-tblgen.rb')
| -rw-r--r-- | tool/transcode-tblgen.rb | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/tool/transcode-tblgen.rb b/tool/transcode-tblgen.rb index 83fc198da..f7f05c41e 100644 --- a/tool/transcode-tblgen.rb +++ b/tool/transcode-tblgen.rb @@ -238,9 +238,9 @@ class ActionMap ss.each_firstbyte {|byte, rest| h[byte] ||= {} if h[byte][rest].nil? - elsif action == :asis + elsif action == :nomap0 next - elsif h[byte][rest] != :asis + elsif h[byte][rest] != :nomap0 raise "ambiguous %s or %s (%02X/%s)" % [h[byte][rest], action, byte, rest] end h[byte][rest] = action @@ -317,10 +317,9 @@ class ActionMap def generate_info(info) case info - when :nomap + when :nomap, :nomap0 + # :nomap0 is low priority. it never collides. "NOMAP" - when :asis - "ASIS" when :undef "UNDEF" when :invalid |