1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

encoding.c: revert r41964

Browse Source 
* encoding.c (enc_set_index): since r41967, old terminator is dealt
  with in str_fill_term().  should not consider it here because this
  function is called before any encoding is set.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41994 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-07-16 04:32:09 +00:00
parent 3495f2b87a
commit 241b1e6324
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,9 @@
Tue Jul 16 13:32:06 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (enc_set_index): since r41967, old terminator is dealt
with in str_fill_term(). should not consider it here because this
function is called before any encoding is set.
Tue Jul 16 11:12:03 2013 Masaki Matsushita <glass.saga@gmail.com> Tue Jul 16 11:12:03 2013 Masaki Matsushita <glass.saga@gmail.com>
* proc.c (rb_block_arity): raise ArgumentError if no block given. * proc.c (rb_block_arity): raise ArgumentError if no block given.
@ -121,9 +127,6 @@ Mon Jul 15 02:21:39 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
* encoding.c (enc_inspect): use PRIsVALUE to preserve the result * encoding.c (enc_inspect): use PRIsVALUE to preserve the result
encoding. encoding.
* encoding.c (enc_set_index): deal with terminator so that
rb_enc_set_index also works.
Sun Jul 14 23:21:47 2013 Tanaka Akira <akr@fsij.org> Sun Jul 14 23:21:47 2013 Tanaka Akira <akr@fsij.org>
* configure.in: Check __builtin_popcountl, __builtin_bswap32 and * configure.in: Check __builtin_popcountl, __builtin_bswap32 and

20
encoding.c
View File

@ -752,14 +752,8 @@ rb_enc_get_index(VALUE obj)
} }
static void static void
enc_set_index(VALUE obj, int oldidx, int idx, rb_encoding *enc) enc_set_index(VALUE obj, int idx)
{ {
int termlen = rb_enc_mbminlen(enc);
int oldtermlen = rb_enc_mbminlen(rb_enc_from_index(oldidx));
if (oldtermlen < termlen && RB_TYPE_P(obj, T_STRING)) {
rb_str_fill_terminator(obj, termlen);
}
if (idx < ENCODING_INLINE_MAX) { if (idx < ENCODING_INLINE_MAX) {
ENCODING_SET_INLINED(obj, idx); ENCODING_SET_INLINED(obj, idx);
return; return;
@ -772,14 +766,15 @@ void
rb_enc_set_index(VALUE obj, int idx) rb_enc_set_index(VALUE obj, int idx)
{ {
rb_check_frozen(obj); rb_check_frozen(obj);
enc_set_index(obj, ENCODING_GET(obj), idx, must_encindex(idx)); must_encindex(idx);
enc_set_index(obj, idx);
} }
VALUE VALUE
rb_enc_associate_index(VALUE obj, int idx) rb_enc_associate_index(VALUE obj, int idx)
{ {
rb_encoding *enc; rb_encoding *enc;
int oldidx; int oldidx, oldtermlen, termlen;
/* enc_check_capable(obj);*/ /* enc_check_capable(obj);*/
rb_check_frozen(obj); rb_check_frozen(obj);
@ -794,7 +789,12 @@ rb_enc_associate_index(VALUE obj, int idx)
!rb_enc_asciicompat(enc)) { !rb_enc_asciicompat(enc)) {
ENC_CODERANGE_CLEAR(obj); ENC_CODERANGE_CLEAR(obj);
} }
enc_set_index(obj, oldidx, idx, enc); termlen = rb_enc_mbminlen(enc);
oldtermlen = rb_enc_mbminlen(rb_enc_from_index(oldidx));
if (oldtermlen < termlen && RB_TYPE_P(obj, T_STRING)) {
rb_str_fill_terminator(obj, termlen);
}
enc_set_index(obj, idx);
return obj; return obj;
} }