ruby-changes:4145
From: ko1@a...
Date: Fri, 29 Feb 2008 03:14:05 +0900 (JST)
Subject: [ruby-changes:4145] naruse - Ruby:r15635 (trunk): * string.c (str_new): remove encoding assumption of empty string.
naruse 2008-02-29 03:13:45 +0900 (Fri, 29 Feb 2008) New Revision: 15635 Modified files: trunk/ChangeLog trunk/hash.c trunk/object.c trunk/string.c trunk/version.h Log: * string.c (str_new): remove encoding assumption of empty string. * hash.c ( rb_f_getenv, env_fetch, env_inspect): result of ENV should be always ASCII-8BIT. * object.c (nil_to_s): nil.to_s should be US-ASCII. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=15635&r2=15634&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/string.c?r1=15635&r2=15634&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/hash.c?r1=15635&r2=15634&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15635&r2=15634&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/object.c?r1=15635&r2=15634&diff_format=u Index: ChangeLog =================================================================== --- ChangeLog (revision 15634) +++ ChangeLog (revision 15635) @@ -1,3 +1,12 @@ +Fri Feb 29 02:50:07 2008 NARUSE, Yui <naruse@r...> + + * string.c (str_new): remove encoding assumption of empty string. + + * hash.c ( rb_f_getenv, env_fetch, env_inspect): result of ENV should + be always ASCII-8BIT. + + * object.c (nil_to_s): nil.to_s should be US-ASCII. + Fri Feb 29 02:24:22 2008 Hidetoshi NAGAI <nagai@a...> * ext/tk/lib/tk.rb: forgot to update RELEASE_DATE Index: string.c =================================================================== --- string.c (revision 15634) +++ string.c (revision 15635) @@ -365,9 +365,6 @@ if (ptr) { memcpy(RSTRING_PTR(str), ptr, len); } - if (len == 0) { - ENCODING_CODERANGE_SET(str, rb_usascii_encindex(), ENC_CODERANGE_7BIT); - } STR_SET_LEN(str, len); RSTRING_PTR(str)[len] = '\0'; return str; Index: object.c =================================================================== --- object.c (revision 15634) +++ object.c (revision 15635) @@ -808,7 +808,7 @@ static VALUE nil_to_s(VALUE obj) { - return rb_str_new(0, 0); + return rb_usascii_str_new(0, 0); } /* Index: hash.c =================================================================== --- hash.c (revision 15634) +++ hash.c (revision 15635) @@ -1826,7 +1826,7 @@ if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted()) #endif { - VALUE str = rb_usascii_str_new2(env); + VALUE str = rb_str_new2(env); rb_obj_freeze(str); return str; @@ -1867,7 +1867,7 @@ #else if (strcmp(nam, PATH_ENV) == 0 && !rb_env_path_tainted()) #endif - return rb_usascii_str_new2(env); + return rb_str_new2(env); return env_str_new2(env); } @@ -2244,7 +2244,7 @@ rb_str_buf_cat2(str, "\""); rb_str_buf_cat(str, *env, s-*env); rb_str_buf_cat2(str, "\"=>"); - i = rb_inspect(rb_usascii_str_new2(s+1)); + i = rb_inspect(rb_str_new2(s+1)); rb_str_buf_append(str, i); } env++; Index: version.h =================================================================== --- version.h (revision 15634) +++ version.h (revision 15635) @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-02-28" +#define RUBY_RELEASE_DATE "2008-02-29" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20080228 +#define RUBY_RELEASE_CODE 20080229 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 28 +#define RUBY_RELEASE_DAY 29 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/