From c79ef69302fa52559c00186d80e9ef97250ebb3a Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 5 Jul 2005 14:23:38 +0000 Subject: * array.c (sort_2): get rid of yet another bcc's bug. fixed: [ruby-core:05152] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 17 +++++++++++------ array.c | 4 ++-- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3d23596f6d..3f1d9c8bd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,19 +1,24 @@ +Tue Jul 5 23:23:09 2005 Nobuyoshi Nakada + + * array.c (sort_2): get rid of yet another bcc's bug. + fixed: [ruby-core:05152] + Tue Jul 5 15:15:10 2005 Hidetoshi NAGAI * ext/tk/tkutil.c: fix typo. Tue Jul 5 14:51:35 2005 Hidetoshi NAGAI - * ext/tcltklib/tcltklib.c: bug fix on treating Unicode strings. + * ext/tcltklib/tcltklib.c: bug fix on treating Unicode strings. * ext/tcltklib/tcltklib.c: add methods to treat encoding mode. - * ext/tcltklib/MANUAL.eng: add description of TclTkLib#encoding, + * ext/tcltklib/MANUAL.eng: add description of TclTkLib#encoding, encoding_system, and so on. * ext/tcltklib/MANUAL.euc: ditto. - * ext/tk/tkutil.c: fail to create a Tcl's list string from an + * ext/tk/tkutil.c: fail to create a Tcl's list string from an array including multiple kind of encoded strings. * ext/tk/lib/tk.rb: ditto. @@ -22,10 +27,10 @@ Tue Jul 5 14:51:35 2005 Hidetoshi NAGAI * ext/tk/lib/remote-tk.rb: ditto. - * ext/tk/lib/tk.rb: override TclTkLib#encoding and encoding= to + * ext/tk/lib/tk.rb: override TclTkLib#encoding and encoding= to use TkCore::INTERP.encoding and encoding=. - * ext/tk/lib/tk.rb: when "require 'tk'" and $KCODE=='NONE', check + * ext/tk/lib/tk.rb: when "require 'tk'" and $KCODE=='NONE', check DEFAULT_TK_ENCODING to decide Ruby/Tk's system encoding mode. * ext/tk/lib/tk/encodedstr.rb: check both of Tk.encoding and @@ -90,7 +95,7 @@ Fri Jul 1 15:37:42 2005 Yukihiro Matsumoto Fri Jul 1 12:44:56 2005 Tanaka Akira - * lib/open-uri.rb (OpenURI.open_http): refine post_connection_check + * lib/open-uri.rb (OpenURI.open_http): refine post_connection_check call. Fri Jul 1 11:34:08 2005 Yukihiro Matsumoto diff --git a/array.c b/array.c index 8a6f585331..f16e0a663c 100644 --- a/array.c +++ b/array.c @@ -1584,8 +1584,8 @@ sort_2(ap, bp, data) if ((long)a < (long)b) return -1; return 0; } - if (TYPE(a) == T_STRING && TYPE(b) == T_STRING) { - return rb_str_cmp(a, b); + if (TYPE(a) == T_STRING) { + if (TYPE(b) == T_STRING) return rb_str_cmp(a, b); } retval = rb_funcall(a, id_cmp, 1, b); -- cgit v1.2.3