summaryrefslogtreecommitdiff
path: root/enc
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-02 10:20:11 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-02 10:20:11 +0000
commit797faf92d96c00ba28edc9613a5205b6ff87e45b (patch)
tree18a508dc218f02939368e721146d2b6c008864e1 /enc
parent298d66296d3cf90f66a82b7f13150971a9430993 (diff)
* enc/trans/make_transdb.rb: error message improved.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
-rw-r--r--enc/trans/make_transdb.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/enc/trans/make_transdb.rb b/enc/trans/make_transdb.rb
index 50d4f169f3..38845978a3 100644
--- a/enc/trans/make_transdb.rb
+++ b/enc/trans/make_transdb.rb
@@ -19,16 +19,17 @@ transdirs.each do |transdir|
}.each do |fn|
next if files[fn]
files[fn] = true
- open(File.join(transdir,fn)) do |f|
+ path = File.join(transdir,fn)
+ open(path) 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 (%s:%d)' %
- [fn, $., from_to, *converters[from_to].values_at(2, 3)]
+ raise ArgumentError, '%s:%d: transcode "%s" is already registered at %s:%d' %
+ [path, $., from_to, *converters[from_to].values_at(3, 4)]
else
- converters[from_to] = [$1, $2, fn[0..-3], $.]
+ converters[from_to] = [$1, $2, fn[0..-3], path, $.]
end
end
end