From 53ff8172e549ebd90ca11d0a4f6e6a57bbd2edf9 Mon Sep 17 00:00:00 2001 From: Tomoyuki Sahara Date: Fri, 23 Aug 2013 15:04:10 +0900 Subject: add mrb_string_type(). --- include/mruby/string.h | 1 + src/string.c | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/include/mruby/string.h b/include/mruby/string.h index 903c036f2..6dd667cc4 100644 --- a/include/mruby/string.h +++ b/include/mruby/string.h @@ -41,6 +41,7 @@ mrb_value mrb_ptr_to_str(mrb_state *, void *); mrb_value mrb_obj_as_string(mrb_state *mrb, mrb_value obj); mrb_value mrb_str_resize(mrb_state *mrb, mrb_value str, mrb_int len); mrb_value mrb_str_substr(mrb_state *mrb, mrb_value str, mrb_int beg, mrb_int len); +mrb_value mrb_string_type(mrb_state *mrb, mrb_value str); mrb_value mrb_check_string_type(mrb_state *mrb, mrb_value str); mrb_value mrb_str_buf_new(mrb_state *mrb, mrb_int capa); mrb_value mrb_str_buf_cat(mrb_state *mrb, mrb_value str, const char *ptr, size_t len); diff --git a/src/string.c b/src/string.c index 2004c9fe8..088f8efc4 100644 --- a/src/string.c +++ b/src/string.c @@ -1523,6 +1523,12 @@ mrb_ptr_to_str(mrb_state *mrb, void *p) return mrb_obj_value(p_str); } +mrb_value +mrb_string_type(mrb_state *mrb, mrb_value str) +{ + return mrb_convert_type(mrb, str, MRB_TT_STRING, "String", "to_str"); +} + mrb_value mrb_check_string_type(mrb_state *mrb, mrb_value str) { -- cgit v1.2.3 From 0e8efd4a218f3d235f88054f0d9d11f8bfdcfd33 Mon Sep 17 00:00:00 2001 From: Tomoyuki Sahara Date: Fri, 23 Aug 2013 13:42:43 +0900 Subject: Check type of arguments for #start_with and #end_with. --- mrbgems/mruby-string-ext/src/string.c | 18 ++++++++++++------ mrbgems/mruby-string-ext/test/string.rb | 2 ++ 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/mrbgems/mruby-string-ext/src/string.c b/mrbgems/mruby-string-ext/src/string.c index edebcecbc..4bb9b9621 100644 --- a/mrbgems/mruby-string-ext/src/string.c +++ b/mrbgems/mruby-string-ext/src/string.c @@ -111,16 +111,19 @@ mrb_str_concat2(mrb_state *mrb, mrb_value self) static mrb_value mrb_str_start_with(mrb_state *mrb, mrb_value self) { - mrb_value *argv; + mrb_value *argv, sub; int argc, i; mrb_get_args(mrb, "*", &argv, &argc); for (i = 0; i < argc; i++) { size_t len_l, len_r, len_cmp; + int ai = mrb_gc_arena_save(mrb); + sub = mrb_string_type(mrb, argv[i]); + mrb_gc_arena_restore(mrb, ai); len_l = RSTRING_LEN(self); - len_r = RSTRING_LEN(argv[i]); + len_r = RSTRING_LEN(sub); len_cmp = (len_l > len_r) ? len_r : len_l; - if (memcmp(RSTRING_PTR(self), RSTRING_PTR(argv[i]), len_cmp) == 0) { + if (memcmp(RSTRING_PTR(self), RSTRING_PTR(sub), len_cmp) == 0) { return mrb_true_value(); } } @@ -136,17 +139,20 @@ mrb_str_start_with(mrb_state *mrb, mrb_value self) static mrb_value mrb_str_end_with(mrb_state *mrb, mrb_value self) { - mrb_value *argv; + mrb_value *argv, sub; int argc, i; mrb_get_args(mrb, "*", &argv, &argc); for (i = 0; i < argc; i++) { size_t len_l, len_r, len_cmp; + int ai = mrb_gc_arena_save(mrb); + sub = mrb_string_type(mrb, argv[i]); + mrb_gc_arena_restore(mrb, ai); len_l = RSTRING_LEN(self); - len_r = RSTRING_LEN(argv[i]); + len_r = RSTRING_LEN(sub); len_cmp = (len_l > len_r) ? len_r : len_l; if (memcmp(RSTRING_PTR(self) + (len_l - len_cmp), - RSTRING_PTR(argv[i]) + (len_r - len_cmp), + RSTRING_PTR(sub) + (len_r - len_cmp), len_cmp) == 0) { return mrb_true_value(); } diff --git a/mrbgems/mruby-string-ext/test/string.rb b/mrbgems/mruby-string-ext/test/string.rb index 9eb6f6aaa..496730a0e 100644 --- a/mrbgems/mruby-string-ext/test/string.rb +++ b/mrbgems/mruby-string-ext/test/string.rb @@ -104,9 +104,11 @@ end assert('String#start_with?') do assert_true "hello".start_with?("heaven", "hell") assert_true !"hello".start_with?("heaven", "paradise") + assert_raise TypeError do "hello".start_with?(true) end end assert('String#end_with?') do assert_true "string".end_with?("ing", "mng") assert_true !"string".end_with?("str", "tri") + assert_raise TypeError do "hello".end_with?(true) end end -- cgit v1.2.3