summaryrefslogtreecommitdiff
path: root/tool/transcode-tblgen.rb
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-05 00:05:11 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-05-05 00:05:11 +0000
commit3abca796f4e5cd2162217d6a508b0667302a8cba (patch)
tree92457456e449c01a80d9dbaf543ffaef4c20803b /tool/transcode-tblgen.rb
parent92c89f12fb25f19285b411717b4b37f46434e097 (diff)
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: svn+ssh://ci.ruby-lang.org/ruby/trunk@23344 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool/transcode-tblgen.rb')
-rw-r--r--tool/transcode-tblgen.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/tool/transcode-tblgen.rb b/tool/transcode-tblgen.rb
index 83fc198..f7f05c4 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