akr	2008-09-02 19:20:11 +0900 (Tue, 02 Sep 2008)

  New Revision: 19067

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=19067

  Log:
    * enc/trans/make_transdb.rb: error message improved.

  Modified files:
    trunk/ChangeLog
    trunk/enc/trans/make_transdb.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 19066)
+++ ChangeLog	(revision 19067)
@@ -1,3 +1,7 @@
+Tue Sep  2 19:19:55 2008  Tanaka Akira  <akr@f...>
+
+	* enc/trans/make_transdb.rb: error message improved.
+
 Tue Sep  2 14:05:50 2008  NAKAMURA Usaku  <usa@r...>
 
 	* enc/trans/utf_16_32.trans (from_UTF_8): rename from to_UTF_16BE
Index: enc/trans/make_transdb.rb
===================================================================
--- enc/trans/make_transdb.rb	(revision 19066)
+++ enc/trans/make_transdb.rb	(revision 19067)
@@ -19,16 +19,17 @@
   }.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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/