diff options
| author | Tatsuhiko Kubo <[email protected]> | 2014-08-28 12:40:23 +0900 |
|---|---|---|
| committer | Tatsuhiko Kubo <[email protected]> | 2014-08-28 19:13:57 +0900 |
| commit | d958aa2cb1c250cb20e444f834773af311810908 (patch) | |
| tree | 13051210e54b595413becea8fa531c35a97cea51 | |
| parent | c457aa2193fb8b9a7cb8ba4e47203544964b7560 (diff) | |
| download | mruby-d958aa2cb1c250cb20e444f834773af311810908.tar.gz mruby-d958aa2cb1c250cb20e444f834773af311810908.zip | |
Unify duplicated functions (noregexp() and regexp_check()).
| -rw-r--r-- | include/mruby/string.h | 3 | ||||
| -rw-r--r-- | mrbgems/mruby-string-utf8/src/string.c | 15 | ||||
| -rw-r--r-- | src/string.c | 5 |
3 files changed, 5 insertions, 18 deletions
diff --git a/include/mruby/string.h b/include/mruby/string.h index 0bd4cfc0f..ef69b5a75 100644 --- a/include/mruby/string.h +++ b/include/mruby/string.h @@ -107,6 +107,9 @@ mrb_int mrb_str_hash(mrb_state *mrb, mrb_value str); mrb_value mrb_str_dump(mrb_state *mrb, mrb_value str); mrb_value mrb_str_inspect(mrb_state *mrb, mrb_value str); +void noregexp(mrb_state *mrb, mrb_value self); +void regexp_check(mrb_state *mrb, mrb_value obj); + /* For backward compatibility */ #define mrb_str_cat2(mrb, str, ptr) mrb_str_cat_cstr(mrb, str, ptr) #define mrb_str_buf_cat(mrb, str, ptr, len) mrb_str_cat(mrb, str, ptr, len) diff --git a/mrbgems/mruby-string-utf8/src/string.c b/mrbgems/mruby-string-utf8/src/string.c index a1b779f95..ba3a72a85 100644 --- a/mrbgems/mruby-string-utf8/src/string.c +++ b/mrbgems/mruby-string-utf8/src/string.c @@ -106,21 +106,6 @@ mrb_str_size(mrb_state *mrb, mrb_value str) #define RSTRING_LEN_UTF8(s) mrb_utf8_strlen(s, -1) -static mrb_value -noregexp(mrb_state *mrb, mrb_value self) -{ - mrb_raise(mrb, E_NOTIMP_ERROR, "Regexp class not implemented"); - return mrb_nil_value(); -} - -static void -regexp_check(mrb_state *mrb, mrb_value obj) -{ - if (mrb_regexp_p(mrb, obj)) { - noregexp(mrb, obj); - } -} - static inline mrb_int mrb_memsearch_qs(const unsigned char *xs, mrb_int m, const unsigned char *ys, mrb_int n) { diff --git a/src/string.c b/src/string.c index a0a069c06..6cb580f73 100644 --- a/src/string.c +++ b/src/string.c @@ -637,14 +637,13 @@ mrb_string_value_ptr(mrb_state *mrb, mrb_value ptr) return RSTRING_PTR(str); } -static mrb_value +void noregexp(mrb_state *mrb, mrb_value self) { mrb_raise(mrb, E_NOTIMP_ERROR, "Regexp class not implemented"); - return mrb_nil_value(); } -static void +void regexp_check(mrb_state *mrb, mrb_value obj) { if (mrb_regexp_p(mrb, obj)) { |