diff options
| author | cremno <[email protected]> | 2014-04-22 00:43:52 +0200 |
|---|---|---|
| committer | cremno <[email protected]> | 2014-04-27 22:33:22 +0200 |
| commit | 91c22f32f4d5afbd53efc16933ca8cd78586b1a3 (patch) | |
| tree | 2b850534d9b5261b49ab8f8c8153a4838961a230 /src | |
| parent | bbc237044d0fb1792dff8c5d2466f4e644821239 (diff) | |
| download | mruby-91c22f32f4d5afbd53efc16933ca8cd78586b1a3.tar.gz mruby-91c22f32f4d5afbd53efc16933ca8cd78586b1a3.zip | |
rename `mrb_str_buf_append` to `mrb_str_cat_str`
The new name is better and less confusing, because:
- `mrb_str_append` calls `mrb_str_to_str` and this function doesn't
- `mrb_str_buf_append` _is_ `mrb_str_cat` for `mrb_value` strings
Diffstat (limited to 'src')
| -rw-r--r-- | src/array.c | 4 | ||||
| -rw-r--r-- | src/codegen.c | 2 | ||||
| -rw-r--r-- | src/string.c | 15 |
3 files changed, 10 insertions, 11 deletions
diff --git a/src/array.c b/src/array.c index 403a63807..febc3a7a8 100644 --- a/src/array.c +++ b/src/array.c @@ -946,7 +946,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_append(mrb, result, sep); + mrb_str_cat_str(mrb, result, sep); } val = RARRAY_PTR(ary)[i]; @@ -958,7 +958,7 @@ join_ary(mrb_state *mrb, mrb_value ary, mrb_value sep, mrb_value list) case MRB_TT_STRING: str_join: - mrb_str_buf_append(mrb, result, val); + mrb_str_cat_str(mrb, result, val); break; default: diff --git a/src/codegen.c b/src/codegen.c index 0cecc8d28..68cc891aa 100644 --- a/src/codegen.c +++ b/src/codegen.c @@ -1929,7 +1929,7 @@ codegen(codegen_scope *s, node *tree, int val) mrb_value str = mrb_str_buf_new(mrb, 4); mrb_str_cat_lit(mrb, str, "$"); - mrb_str_buf_append(mrb, str, mrb_fixnum_to_str(mrb, fix, 10)); + mrb_str_cat_str(mrb, str, mrb_fixnum_to_str(mrb, fix, 10)); sym = new_sym(s, mrb_intern_str(mrb, str)); genop(s, MKOP_ABx(OP_GETGLOBAL, cursp(), sym)); push(); diff --git a/src/string.c b/src/string.c index 9c66ae18f..f9d0791bd 100644 --- a/src/string.c +++ b/src/string.c @@ -1254,13 +1254,6 @@ mrb_str_substr(mrb_state *mrb, mrb_value str, mrb_int beg, mrb_int len) return str2; } -mrb_value -mrb_str_buf_append(mrb_state *mrb, mrb_value str, mrb_value str2) -{ - mrb_str_cat(mrb, str, RSTRING_PTR(str2), RSTRING_LEN(str2)); - return str; -} - mrb_int mrb_str_hash(mrb_state *mrb, mrb_value str) { @@ -2469,10 +2462,16 @@ mrb_str_cat_cstr(mrb_state *mrb, mrb_value str, const char *ptr) } mrb_value +mrb_str_cat_str(mrb_state *mrb, mrb_value str, mrb_value str2) +{ + return mrb_str_cat(mrb, str, RSTRING_PTR(str2), RSTRING_LEN(str2)); +} + +mrb_value mrb_str_append(mrb_state *mrb, mrb_value str, mrb_value str2) { str2 = mrb_str_to_str(mrb, str2); - return mrb_str_buf_append(mrb, str, str2); + return mrb_str_cat_str(mrb, str, str2); } #define CHAR_ESC_LEN 13 /* sizeof(\x{ hex of 32bit unsigned int } \0) */ |
