diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/array.c | 4 | ||||
| -rw-r--r-- | src/string.c | 16 | ||||
| -rw-r--r-- | src/vm.c | 4 |
3 files changed, 8 insertions, 16 deletions
diff --git a/src/array.c b/src/array.c index eeeef23a5..c8e88e197 100644 --- a/src/array.c +++ b/src/array.c @@ -955,7 +955,7 @@ join_ary(mrb_state *mrb, mrb_value ary, mrb_value sep, mrb_value list) for (i=0; i<RARRAY_LEN(ary); i++) { if (i > 0 && !mrb_nil_p(sep)) { - mrb_str_buf_cat(mrb, result, RSTRING_PTR(sep), RSTRING_LEN(sep)); + mrb_str_buf_append(mrb, result, sep); } val = RARRAY_PTR(ary)[i]; @@ -967,7 +967,7 @@ join_ary(mrb_state *mrb, mrb_value ary, mrb_value sep, mrb_value list) case MRB_TT_STRING: str_join: - mrb_str_buf_cat(mrb, result, RSTRING_PTR(val), RSTRING_LEN(val)); + mrb_str_buf_append(mrb, result, val); break; default: diff --git a/src/string.c b/src/string.c index f78564fb8..1e3c7db3a 100644 --- a/src/string.c +++ b/src/string.c @@ -278,14 +278,6 @@ str_buf_cat(mrb_state *mrb, struct RString *s, const char *ptr, size_t len) } mrb_value -mrb_str_buf_cat(mrb_state *mrb, mrb_value str, const char *ptr, size_t len) -{ - if (len == 0) return str; - str_buf_cat(mrb, mrb_str_ptr(str), ptr, len); - return str; -} - -mrb_value mrb_str_new(mrb_state *mrb, const char *p, size_t len) { struct RString *s; @@ -2518,12 +2510,12 @@ mrb_str_inspect(mrb_state *mrb, mrb_value str) c = *p; if (c == '"'|| c == '\\' || (c == '#' && IS_EVSTR(p, pend))) { buf[0] = '\\'; buf[1] = c; - mrb_str_buf_cat(mrb, result, buf, 2); + mrb_str_cat(mrb, result, buf, 2); continue; } if (ISPRINT(c)) { buf[0] = c; - mrb_str_buf_cat(mrb, result, buf, 1); + mrb_str_cat(mrb, result, buf, 1); continue; } switch (c) { @@ -2540,7 +2532,7 @@ mrb_str_inspect(mrb_state *mrb, mrb_value str) if (cc) { buf[0] = '\\'; buf[1] = (char)cc; - mrb_str_buf_cat(mrb, result, buf, 2); + mrb_str_cat(mrb, result, buf, 2); continue; } else { @@ -2548,7 +2540,7 @@ mrb_str_inspect(mrb_state *mrb, mrb_value str) buf[3] = '0' + c % 8; c /= 8; buf[2] = '0' + c % 8; c /= 8; buf[1] = '0' + c % 8; - mrb_str_buf_cat(mrb, result, buf, 4); + mrb_str_cat(mrb, result, buf, 4); continue; } } @@ -564,8 +564,8 @@ localjump_error(mrb_state *mrb, localjump_error_kind kind) mrb_value exc; msg = mrb_str_buf_new(mrb, sizeof(lead) + 7); - mrb_str_buf_cat(mrb, msg, lead, sizeof(lead) - 1); - mrb_str_buf_cat(mrb, msg, kind_str[kind], kind_str_len[kind]); + mrb_str_cat(mrb, msg, lead, sizeof(lead) - 1); + mrb_str_cat(mrb, msg, kind_str[kind], kind_str_len[kind]); exc = mrb_exc_new_str(mrb, E_LOCALJUMP_ERROR, msg); mrb->exc = mrb_obj_ptr(exc); } |