diff options
| author | Yukihiro "Matz" Matsumoto <[email protected]> | 2021-08-30 11:40:02 +0900 |
|---|---|---|
| committer | Yukihiro "Matz" Matsumoto <[email protected]> | 2021-09-01 07:00:54 +0900 |
| commit | f6e5c902f0591e32088623d6ed4146e34f58fd85 (patch) | |
| tree | 1f68044e3f2e9030ccb2610ce99ade70fe4af4ba | |
| parent | e86c9cb57c0ee799ca66d18612e15c6c8983f872 (diff) | |
| download | mruby-f6e5c902f0591e32088623d6ed4146e34f58fd85.tar.gz mruby-f6e5c902f0591e32088623d6ed4146e34f58fd85.zip | |
string.h: obsolete `mrb_str_to_str()`, even from examples.
| -rw-r--r-- | examples/mrbgems/c_and_ruby_extension_example/src/example.c | 5 | ||||
| -rw-r--r-- | examples/mrbgems/c_extension_example/src/example.c | 5 | ||||
| -rw-r--r-- | include/mruby.h | 3 | ||||
| -rw-r--r-- | include/mruby/string.h | 7 |
4 files changed, 7 insertions, 13 deletions
diff --git a/examples/mrbgems/c_and_ruby_extension_example/src/example.c b/examples/mrbgems/c_and_ruby_extension_example/src/example.c index 1fdb1078d..f1d7971c2 100644 --- a/examples/mrbgems/c_and_ruby_extension_example/src/example.c +++ b/examples/mrbgems/c_and_ruby_extension_example/src/example.c @@ -5,9 +5,8 @@ static mrb_value mrb_c_method(mrb_state *mrb, mrb_value self) { - mrb_value self_str = mrb_str_to_str(mrb, self); - - printf("%s: A C Extension\n", mrb_str_to_cstr(mrb, self_str)); + mrb_ensure_string_type(mrb, self); + printf("%s: A C Extension\n", mrb_str_to_cstr(mrb, self)); return self; } diff --git a/examples/mrbgems/c_extension_example/src/example.c b/examples/mrbgems/c_extension_example/src/example.c index 727c7c698..fe872c933 100644 --- a/examples/mrbgems/c_extension_example/src/example.c +++ b/examples/mrbgems/c_extension_example/src/example.c @@ -5,9 +5,8 @@ static mrb_value mrb_c_method(mrb_state *mrb, mrb_value self) { - mrb_value self_str = mrb_str_to_str(mrb, self); - - printf("%s: A C Extension\n", mrb_str_to_cstr(mrb, self_str)); + mrb_ensure_string_type(mrb, self); + printf("%s: A C Extension\n", mrb_str_to_cstr(mrb, self)); return self; } diff --git a/include/mruby.h b/include/mruby.h index b96ad1a29..dfc8eaa76 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -1377,6 +1377,9 @@ MRB_API mrb_value mrb_ensure_string_type(mrb_state *mrb, mrb_value str); MRB_API mrb_value mrb_check_string_type(mrb_state *mrb, mrb_value str); /* obsolete: use mrb_ensure_string_type() instead */ #define mrb_string_type(mrb, str) mrb_ensure_string_type(mrb,str) +/* obsolete: use mrb_obj_as_string() instead */ +#define mrb_str_to_str(mrb, str) mrb_obj_as_string(mrb, str) + MRB_API mrb_value mrb_to_int(mrb_state *mrb, mrb_value val); #define mrb_as_int(mrb, val) mrb_integer(mrb_to_int(mrb, val)) diff --git a/include/mruby/string.h b/include/mruby/string.h index c45f6915d..b214aa7c8 100644 --- a/include/mruby/string.h +++ b/include/mruby/string.h @@ -359,13 +359,6 @@ MRB_API mrb_value mrb_str_to_inum(mrb_state *mrb, mrb_value str, mrb_int base, m MRB_API double mrb_str_to_dbl(mrb_state *mrb, mrb_value str, mrb_bool badcheck); /** - * Returns a converted string type. - * For type checking, non converting `mrb_to_str` is recommended. - * obsolete: use `mrb_obj_as_string()` instead. - */ -#define mrb_str_to_str(mrb, str) mrb_obj_as_string(mrb, str) - -/** * Returns true if the strings match and false if the strings don't match. * * @param mrb The current mruby state. |