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

Rename rb_str_splice_{0,1} -> rb_str_update_{0,1}

Browse Source
This commit is contained in:
Matt Valentine-House 2023-02-09 13:22:59 +00:00 committed by Peter Zhu
parent 601b83dcfc
commit d620855101
Notes: git 2023-02-09 20:02:45 +00:00 
Merged: https://github.com/ruby/ruby/pull/7278
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
string.c
View File

@ -5256,7 +5256,7 @@ rb_str_drop_bytes(VALUE str, long len)
} }
static void static void
rb_str_splice_1(VALUE str, long beg, long len, VALUE val, long vbeg, long vlen) rb_str_update_1(VALUE str, long beg, long len, VALUE val, long vbeg, long vlen)
{ {
char *sptr; char *sptr;
long slen; long slen;
@ -5298,9 +5298,9 @@ rb_str_splice_1(VALUE str, long beg, long len, VALUE val, long vbeg, long vlen)
} }
static inline void static inline void
rb_str_splice_0(VALUE str, long beg, long len, VALUE val) rb_str_update_0(VALUE str, long beg, long len, VALUE val)
{ {
rb_str_splice_1(str, beg, len, val, 0, RSTRING_LEN(val)); rb_str_update_1(str, beg, len, val, 0, RSTRING_LEN(val));
} }
void void
@ -5336,7 +5336,7 @@ rb_str_update(VALUE str, long beg, long len, VALUE val)
/* error check */ /* error check */
beg = p - RSTRING_PTR(str); /* physical position */ beg = p - RSTRING_PTR(str); /* physical position */
len = e - p; /* physical length */ len = e - p; /* physical length */
rb_str_splice_0(str, beg, len, val); rb_str_update_0(str, beg, len, val);
rb_enc_associate(str, enc); rb_enc_associate(str, enc);
cr = ENC_CODERANGE_AND(ENC_CODERANGE(str), ENC_CODERANGE(val)); cr = ENC_CODERANGE_AND(ENC_CODERANGE(str), ENC_CODERANGE(val));
if (cr != ENC_CODERANGE_BROKEN) if (cr != ENC_CODERANGE_BROKEN)
@ -5373,7 +5373,7 @@ rb_str_subpat_set(VALUE str, VALUE re, VALUE backref, VALUE val)
len = end - start; len = end - start;
StringValue(val); StringValue(val);
enc = rb_enc_check_str(str, val); enc = rb_enc_check_str(str, val);
rb_str_splice_0(str, start, len, val); rb_str_update_0(str, start, len, val);
rb_enc_associate(str, enc); rb_enc_associate(str, enc);
} }
@ -6367,7 +6367,7 @@ rb_str_bytesplice(int argc, VALUE *argv, VALUE str)
str_check_beg_len(val, &vbeg, &vlen); str_check_beg_len(val, &vbeg, &vlen);
enc = rb_enc_check(str, val); enc = rb_enc_check(str, val);
str_modify_keep_cr(str); str_modify_keep_cr(str);
rb_str_splice_1(str, beg, len, val, vbeg, vlen); rb_str_update_1(str, beg, len, val, vbeg, vlen);
rb_enc_associate(str, enc); rb_enc_associate(str, enc);
cr = ENC_CODERANGE_AND(ENC_CODERANGE(str), ENC_CODERANGE(val)); cr = ENC_CODERANGE_AND(ENC_CODERANGE(str), ENC_CODERANGE(val));
if (cr != ENC_CODERANGE_BROKEN) if (cr != ENC_CODERANGE_BROKEN)