naruse	2008-01-20 05:15:13 +0900 (Sun, 20 Jan 2008)

  New Revision: 15135

  Modified files:
    trunk/ChangeLog
    trunk/enc/make_encdb.rb

  Log:
    * enc/make_encdb.rb: fix duplication check.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/enc/make_encdb.rb?r1=15135&r2=15134&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15135&r2=15134&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15134)
+++ ChangeLog	(revision 15135)
@@ -1,3 +1,7 @@
+Sun Jan 20 05:12:44 2008  NARUSE, Yui  <naruse@r...>
+
+	* enc/make_encdb.rb: fix duplication check.
+
 Sun Jan 20 05:03:46 2008  NARUSE, Yui  <naruse@r...>
 
 	* ascii.c: remove difinition of replica KOI8-U.
Index: enc/make_encdb.rb
===================================================================
--- enc/make_encdb.rb	(revision 15134)
+++ enc/make_encdb.rb	(revision 15135)
@@ -9,27 +9,29 @@
 # ENC_ALIAS("CP932", "Windows-31J")
 #
 
-def check_duplication(encs, name, fn, line)
-  if encs.include?(name)
-    raise ArgumentError, "%s:%d: encoding %s is already registered" % [fn, line, name]
+def check_duplication(defs, name, fn, line)
+  if defs[name]
+    raise ArgumentError, "%s:%d: encoding %s is already registered(%s:%d)" %
+      [fn, line, name, *defs[name]]
+  else
+    defs[name.upcase] = [fn,line]
   end
 end
 
 count = 0
 lines = []
 encodings = []
+defs = {}
 encdir = ARGV[0]
 outhdr = ARGV[1] || 'encdb.h'
 Dir.open(encdir) {|d| d.grep(/.+\.[ch]\z/)}.sort.each do |fn|
   open(File.join(encdir,fn)) do |f|
     orig = nil
     name = nil
-    encs = []
     f.each_line do |line|
       if (/^OnigEncodingDefine/ =~ line)..(/"(.*?)"/ =~ line)
         if $1
-          check_duplication(encs, $1, fn, $.)
-          encs << $1.upcase
+          check_duplication(defs, $1, fn, $.)
           encodings << $1
           count += 1
         end
@@ -41,19 +43,18 @@
         when /^ENC_REPLICATE\(\s*"([^"]+)"\s*,\s*"([^"]+)"/
           raise ArgumentError,
           '%s:%d: ENC_REPLICATE: %s is not defined yet. (replica %s)' %
-            [fn, $., $2, $1] unless encs.include?($2.upcase)
+            [fn, $., $2, $1] unless defs[$2.upcase]
           count += 1
         when /^ENC_ALIAS\(\s*"([^"]+)"\s*,\s*"([^"]+)"/
           raise ArgumentError,
           '%s:%d: ENC_ALIAS: %s is not defined yet. (alias %s)' %
-            [fn, $., $2, $1] unless encs.include?($2.upcase)
+            [fn, $., $2, $1] unless defs[$2.upcase]
         when /^ENC_DUMMY\(\s*"([^"]+)"/
           count += 1
         else
           next
         end
-        check_duplication(encs, $1, fn, $.)
-        encs << $1.upcase
+        check_duplication(defs, $1, fn, $.)
         lines << line.sub(/;.*/m, ";\n") if line
       end
     end

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