From 783541e0a4425a6b7523ba0d640f7227c932b572 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 4 Sep 2008 01:43:50 +0000 Subject: [PATCH] * tool/transcode-tblgen.rb (citrus_decode_mapsrc): support older 1.8. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19116 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ tool/transcode-tblgen.rb | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 951c41a64d..ab6e0c37c6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Sep 4 10:43:47 2008 Nobuyoshi Nakada + + * tool/transcode-tblgen.rb (citrus_decode_mapsrc): support older 1.8. + Thu Sep 4 10:33:43 2008 Nobuyoshi Nakada * io.c (argf_next_argv, argf_set_encoding): copy struct wise. diff --git a/tool/transcode-tblgen.rb b/tool/transcode-tblgen.rb index 207cb5118d..3032b115ac 100644 --- a/tool/transcode-tblgen.rb +++ b/tool/transcode-tblgen.rb @@ -486,13 +486,13 @@ def citrus_decode_mapsrc(ces, csid, mapsrcs) mapsrcs.split(',').each do |mapsrc| path = [$srcdir] mode = nil - if mapsrc.start_with?('UCS') + if mapsrc.rindex('UCS', 0) mode = :from_ucs from = mapsrc[4..-1] - path << SUBDIR.find{|x| from.start_with?(x) } + path << SUBDIR.find{|x| from.rindex(x, 0) } else mode = :to_ucs - path << SUBDIR.find{|x| mapsrc.start_with?(x) } + path << SUBDIR.find{|x| mapsrc.rindex(x, 0) } end path << mapsrc.gsub(':', '@') path = File.join(*path)