admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

mruby-string-ext: refactor prefix/suffix deletion with helpers

Browse Source 
Introduces `str_prefix_p` and `str_suffix_p` helper functions to
centralize the logic for checking string prefixes and suffixes.
`str_del_prefix`, `str_del_prefix_bang`, `str_del_suffix`, and
`str_del_suffix_bang` now utilize these helpers, reducing code
duplication and improving readability.

Co-authored-by: Gemini <gemini@google.com>
This commit is contained in:
Yukihiro "Matz" Matsumoto
2025-07-25 09:54:51 +09:00
parent d1bd883526
commit d0feaac2f0
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-string-ext/src/string.c
+20 -5
View File
@@ -1099,6 +1099,14 @@ str_codepoints(mrb_state *mrb, mrb_value self)
}
#endif
static mrb_bool
str_prefix_p(mrb_state *mrb, mrb_value str, const char *prefix_ptr, mrb_int prefix_len)
{
mrb_int str_len = RSTRING_LEN(str);
if (prefix_len > str_len) return FALSE;
return memcmp(RSTRING_PTR(str), prefix_ptr, prefix_len) == 0;
}
/*
* call-seq:
* str.delete_prefix!(prefix) -> self or nil
@@ -1120,7 +1128,7 @@ str_del_prefix_bang(mrb_state *mrb, mrb_value self)
mrb_int slen = RSTR_LEN(str);
if (plen > slen) return mrb_nil_value();
char *s = RSTR_PTR(str);
if (memcmp(s, ptr, plen) != 0) return mrb_nil_value();
if (!str_prefix_p(mrb, self, ptr, plen)) return mrb_nil_value();
if (!mrb_frozen_p(str) && (RSTR_SHARED_P(str) || RSTR_FSHARED_P(str))) {
str->as.heap.ptr += plen;
}
@@ -1151,11 +1159,19 @@ str_del_prefix(mrb_state *mrb, mrb_value self)
mrb_get_args(mrb, "s", &ptr, &plen);
mrb_int slen = RSTRING_LEN(self);
if (plen > slen) return mrb_str_dup(mrb, self);
if (memcmp(RSTRING_PTR(self), ptr, plen) != 0)
if (!str_prefix_p(mrb, self, ptr, plen))
return mrb_str_dup(mrb, self);
return mrb_str_substr(mrb, self, plen, slen-plen);
}
static mrb_bool
str_suffix_p(mrb_state *mrb, mrb_value str, const char *suffix_ptr, mrb_int suffix_len)
{
mrb_int str_len = RSTRING_LEN(str);
if (suffix_len > str_len) return FALSE;
return memcmp(RSTRING_PTR(str) + (str_len - suffix_len), suffix_ptr, suffix_len) == 0;
}
/*
* call-seq:
* str.delete_suffix!(suffix) -> self or nil
@@ -1176,8 +1192,7 @@ str_del_suffix_bang(mrb_state *mrb, mrb_value self)
mrb_get_args(mrb, "s", &ptr, &plen);
mrb_int slen = RSTR_LEN(str);
if (plen > slen) return mrb_nil_value();
char *s = RSTR_PTR(str);
if (memcmp(s+slen-plen, ptr, plen) != 0) return mrb_nil_value();
if (!str_suffix_p(mrb, self, ptr, plen)) return mrb_nil_value();
if (!mrb_frozen_p(str) && (RSTR_SHARED_P(str) || RSTR_FSHARED_P(str))) {
/* no need to modify string */
}
@@ -1206,7 +1221,7 @@ str_del_suffix(mrb_state *mrb, mrb_value self)
mrb_get_args(mrb, "s", &ptr, &plen);
mrb_int slen = RSTRING_LEN(self);
if (plen > slen) return mrb_str_dup(mrb, self);
if (memcmp(RSTRING_PTR(self)+slen-plen, ptr, plen) != 0)
if (!str_suffix_p(mrb, self, ptr, plen))
return mrb_str_dup(mrb, self);
return mrb_str_substr(mrb, self, 0, slen-plen);
}