summaryrefslogtreecommitdiffstats
path: root/enc
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-02 10:12:14 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-02 10:12:14 +0000
commit7917ba63f50052b389a68c639dc59e24c319c869 (patch)
tree942c7bb6b25ddd5e3a14790f525f05c157df1d61 /enc
parent429f11309d02bbfa4bd1fc771a53b09db8949b46 (diff)
downloadruby-7917ba63f50052b389a68c639dc59e24c319c869.tar.gz
ruby-7917ba63f50052b389a68c639dc59e24c319c869.tar.xz
ruby-7917ba63f50052b389a68c639dc59e24c319c869.zip
revert last commit.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19066 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
-rw-r--r--enc/trans/make_transdb.rb9
1 files changed, 4 insertions, 5 deletions
diff --git a/enc/trans/make_transdb.rb b/enc/trans/make_transdb.rb
index 7dbe6db4a..50d4f169f 100644
--- a/enc/trans/make_transdb.rb
+++ b/enc/trans/make_transdb.rb
@@ -19,17 +19,16 @@ transdirs.each do |transdir|
}.each do |fn|
next if files[fn]
files[fn] = true
- path = File.join(transdir,fn)
- open(path) do |f|
+ open(File.join(transdir,fn)) do |f|
f.each_line do |line|
if (/^static const rb_transcoder/ =~ line)..(/"(.*?)"\s*,\s*"(.*?)"/ =~ line)
if $1 && $2
from_to = "%s to %s" % [$1, $2]
if converters[from_to]
- raise ArgumentError, '%s:%d: transcode "%s" is already registered at %s:%d' %
- [path, $., from_to, *converters[from_to].values_at(2, 3)]
+ raise ArgumentError, '%s:%d: transcode "%s" is already registered (%s:%d)' %
+ [fn, $., from_to, *converters[from_to].values_at(2, 3)]
else
- converters[from_to] = [$1, $2, path, $.]
+ converters[from_to] = [$1, $2, fn[0..-3], $.]
end
end
end