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

Remove alias macro rb_str_splice

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

12
string.c
View File

@ -5343,8 +5343,6 @@ rb_str_update(VALUE str, long beg, long len, VALUE val)
ENC_CODERANGE_SET(str, cr); ENC_CODERANGE_SET(str, cr);
} }
#define rb_str_splice(str, beg, len, val) rb_str_update(str, beg, len, val)
static void static void
rb_str_subpat_set(VALUE str, VALUE re, VALUE backref, VALUE val) rb_str_subpat_set(VALUE str, VALUE re, VALUE backref, VALUE val)
{ {
@ -5395,7 +5393,7 @@ rb_str_aset(VALUE str, VALUE indx, VALUE val)
rb_raise(rb_eIndexError, "string not matched"); rb_raise(rb_eIndexError, "string not matched");
} }
beg = rb_str_sublen(str, beg); beg = rb_str_sublen(str, beg);
rb_str_splice(str, beg, str_strlen(indx, NULL), val); rb_str_update(str, beg, str_strlen(indx, NULL), val);
return val; return val;
default: default:
@ -5403,7 +5401,7 @@ rb_str_aset(VALUE str, VALUE indx, VALUE val)
{ {
long beg, len; long beg, len;
if (rb_range_beg_len(indx, &beg, &len, str_strlen(str, NULL), 2)) { if (rb_range_beg_len(indx, &beg, &len, str_strlen(str, NULL), 2)) {
rb_str_splice(str, beg, len, val); rb_str_update(str, beg, len, val);
return val; return val;
} }
} }
@ -5411,7 +5409,7 @@ rb_str_aset(VALUE str, VALUE indx, VALUE val)
case T_FIXNUM: case T_FIXNUM:
idx = NUM2LONG(indx); idx = NUM2LONG(indx);
rb_str_splice(str, idx, 1, val); rb_str_update(str, idx, 1, val);
return val; return val;
} }
} }
@ -5453,7 +5451,7 @@ rb_str_aset_m(int argc, VALUE *argv, VALUE str)
rb_str_subpat_set(str, argv[0], argv[1], argv[2]); rb_str_subpat_set(str, argv[0], argv[1], argv[2]);
} }
else { else {
rb_str_splice(str, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]); rb_str_update(str, NUM2LONG(argv[0]), NUM2LONG(argv[1]), argv[2]);
} }
return argv[2]; return argv[2];
} }
@ -5490,7 +5488,7 @@ rb_str_insert(VALUE str, VALUE idx, VALUE str2)
else if (pos < 0) { else if (pos < 0) {
pos++; pos++;
} }
rb_str_splice(str, pos, 0, str2); rb_str_update(str, pos, 0, str2);
return str; return str;
} }