diff options
author | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-02 10:20:11 +0000 |
---|---|---|
committer | akr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-09-02 10:20:11 +0000 |
commit | f7851d9401fa51ffe12229db8bf425d82bc4d8eb (patch) | |
tree | 18a508dc218f02939368e721146d2b6c008864e1 /enc | |
parent | 7917ba63f50052b389a68c639dc59e24c319c869 (diff) | |
download | ruby-f7851d9401fa51ffe12229db8bf425d82bc4d8eb.tar.gz ruby-f7851d9401fa51ffe12229db8bf425d82bc4d8eb.tar.xz ruby-f7851d9401fa51ffe12229db8bf425d82bc4d8eb.zip |
* enc/trans/make_transdb.rb: error message improved.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@19067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enc')
-rw-r--r-- | enc/trans/make_transdb.rb | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/enc/trans/make_transdb.rb b/enc/trans/make_transdb.rb index 50d4f169f..38845978a 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 |