diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-09 04:07:11 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-01-09 04:07:11 +0000 |
commit | 251dec5cf13b5ac9e1d2c115958be0ad23e799c5 (patch) | |
tree | 2bb8828e71fe8200b934d7d2abbc81eef117a48e | |
parent | 8ed70a5186f23ec9c3efe0dc91bda8dc4466b28c (diff) | |
download | ruby-251dec5cf13b5ac9e1d2c115958be0ad23e799c5.tar.gz |
* string.c (rb_enc_cr_str_buf_cat): do not recalculate coderange
value if it's given from outside.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14960 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | string.c | 6 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 12 insertions, 5 deletions
@@ -1,3 +1,8 @@ +Wed Jan 9 13:03:34 2008 Yukihiro Matsumoto <matz@ruby-lang.org> + + * string.c (rb_enc_cr_str_buf_cat): do not recalculate coderange + value if it's given from outside. + Wed Jan 9 08:42:01 2008 James Edward Gray II <jeg2@ruby-lang.org> * enum.c: Updating the documentation of Enumrable#zip to reflect @@ -1076,12 +1076,14 @@ rb_enc_cr_str_buf_cat(VALUE str, const char *ptr, long len, (ptr_a8 && str_cr != ENC_CODERANGE_7BIT)) { ptr_cr = ENC_CODERANGE_UNKNOWN; } - else { + else if (ptr_cr == ENC_CODERANGE_UNKNOWN) { ptr_cr = coderange_scan(ptr, len, rb_enc_from_index(ptr_encindex)); } } else { - ptr_cr = coderange_scan(ptr, len, rb_enc_from_index(ptr_encindex)); + if (ptr_cr == ENC_CODERANGE_UNKNOWN) { + ptr_cr = coderange_scan(ptr, len, rb_enc_from_index(ptr_encindex)); + } if (str_cr == ENC_CODERANGE_UNKNOWN) { if (str_a8 || ptr_cr != ENC_CODERANGE_7BIT) { str_cr = rb_enc_str_coderange(str); @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-01-08" +#define RUBY_RELEASE_DATE "2008-01-09" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20080108 +#define RUBY_RELEASE_CODE 20080109 #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 1 -#define RUBY_RELEASE_DAY 8 +#define RUBY_RELEASE_DAY 9 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |