yugui	2009-01-16 00:37:28 +0900 (Fri, 16 Jan 2009)

  New Revision: 21550

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

  Log:
    merges r21489 from trunk into ruby_1_9_1.
    * enc/trans/make_transdb.rb (converters): should not depend on the
      hash order for cross compile.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/enc/trans/make_transdb.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21549)
+++ ruby_1_9_1/ChangeLog	(revision 21550)
@@ -1,3 +1,8 @@
+Tue Jan 13 17:29:02 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* enc/trans/make_transdb.rb (converters): should not depend on the
+	  hash order for cross compile.
+
 Tue Jan 13 16:39:11 2009  NAKAMURA Usaku  <usa@r...>
 
 	* include/ruby/intern.h, thread.c, win32/Makefile.sub (rb_fdset_t,
Index: ruby_1_9_1/enc/trans/make_transdb.rb
===================================================================
--- ruby_1_9_1/enc/trans/make_transdb.rb	(revision 21549)
+++ ruby_1_9_1/enc/trans/make_transdb.rb	(revision 21550)
@@ -22,6 +22,7 @@
 
 files = {}
 names_t = []
+converter_list = []
 transdirs.each do |transdir|
   names = Dir.entries(transdir)
   names_t += names.map {|n| /(?!\A)\.trans\z/ =~ n ? $` : nil }.compact
@@ -44,6 +45,7 @@
               [path, $., from_to, *converters[from_to].values_at(3, 4)]
             else
               converters[from_to] = [$1, $2, fn[0..-3], path, $.]
+              converter_list << from_to
             end
           end
         end
@@ -51,7 +53,9 @@
     end
   end
 end
-result = converters.map {|k, v| %[rb_declare_transcoder("%s", "%s", "%s");\n] % v}.join
+result = converter_list.map do |from_to|
+  %[rb_declare_transcoder("%s", "%s", "%s");\n] % converters[from_to]
+end.join("")
 open(outhdr, 'wb') do |f|
   f.print result
 end

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