mirror of
				https://github.com/ruby/ruby.git
				synced 2022-11-09 12:17:21 -05:00 
			
		
		
		
	* 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/trunk@8725 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
		
							parent
							
								
									5a33a2c74a
								
							
						
					
					
						commit
						11921b1861
					
				
					 2 changed files with 12 additions and 7 deletions
				
			
		
							
								
								
									
										15
									
								
								ChangeLog
									
										
									
									
									
								
							
							
						
						
									
										15
									
								
								ChangeLog
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -1,19 +1,24 @@
 | 
			
		|||
Tue Jul  5 23:23:09 2005  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 | 
			
		||||
 | 
			
		||||
	* 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  <nagai@ai.kyutech.ac.jp>
 | 
			
		||||
 | 
			
		||||
	* ext/tk/tkutil.c: fix typo.
 | 
			
		||||
 | 
			
		||||
Tue Jul  5 14:52:56 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 | 
			
		||||
 | 
			
		||||
	* ext/tk/tcltklib.c: bug fix on treating Unicode strings. 
 | 
			
		||||
	* ext/tk/tcltklib.c: bug fix on treating Unicode strings.
 | 
			
		||||
 | 
			
		||||
	* ext/tk/tcltklib.c: add methods to treat encoding mode.
 | 
			
		||||
 | 
			
		||||
	* ext/tk/MANUAL_tcltklib.eng: add description of TclTkLib#encoding, 
 | 
			
		||||
	* ext/tk/MANUAL_tcltklib.eng: add description of TclTkLib#encoding,
 | 
			
		||||
	  encoding_system, and so on.
 | 
			
		||||
 | 
			
		||||
	* ext/tk/MANUAL_tcltklib.eucj: ditto.
 | 
			
		||||
 | 
			
		||||
	* ext/tk/tkutil/tkutil.c: fail to create a Tcl's list string from 
 | 
			
		||||
	* ext/tk/tkutil/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:52:56 2005  Hidetoshi NAGAI  <nagai@ai.kyutech.ac.jp>
 | 
			
		|||
 | 
			
		||||
	* 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
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
							
								
								
									
										4
									
								
								array.c
									
										
									
									
									
								
							
							
						
						
									
										4
									
								
								array.c
									
										
									
									
									
								
							| 
						 | 
				
			
			@ -1630,8 +1630,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);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue