diff options
| author | Tatsuhiko Kubo <[email protected]> | 2014-08-28 19:18:52 +0900 |
|---|---|---|
| committer | Tatsuhiko Kubo <[email protected]> | 2014-08-28 19:18:52 +0900 |
| commit | db29a25ada6f8e344f63586328a7c45ef6bcc67d (patch) | |
| tree | b51640e01e99ebc8d35745ffc486bb42c95e91c2 /mrbgems/mruby-string-utf8/src | |
| parent | d958aa2cb1c250cb20e444f834773af311810908 (diff) | |
| download | mruby-db29a25ada6f8e344f63586328a7c45ef6bcc67d.tar.gz mruby-db29a25ada6f8e344f63586328a7c45ef6bcc67d.zip | |
Rename functions for avoinding symbol confiliction.
Add prefix(mrb) to noregexp() and regexp_check().
Diffstat (limited to 'mrbgems/mruby-string-utf8/src')
| -rw-r--r-- | mrbgems/mruby-string-utf8/src/string.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mrbgems/mruby-string-utf8/src/string.c b/mrbgems/mruby-string-utf8/src/string.c index ba3a72a85..b232df1c5 100644 --- a/mrbgems/mruby-string-utf8/src/string.c +++ b/mrbgems/mruby-string-utf8/src/string.c @@ -255,7 +255,7 @@ mrb_str_aref(mrb_state *mrb, mrb_value str, mrb_value indx) { mrb_int idx; - regexp_check(mrb, indx); + mrb_regexp_check(mrb, indx); switch (mrb_type(indx)) { case MRB_TT_FIXNUM: idx = mrb_fixnum(indx); @@ -300,7 +300,7 @@ mrb_str_aref_m(mrb_state *mrb, mrb_value str) argc = mrb_get_args(mrb, "o|o", &a1, &a2); if (argc == 2) { - regexp_check(mrb, a1); + mrb_regexp_check(mrb, a1); return str_substr(mrb, str, mrb_fixnum(a1), mrb_fixnum(a2)); } if (argc != 1) { @@ -331,7 +331,7 @@ mrb_str_index_m(mrb_state *mrb, mrb_value str) sub = mrb_nil_value(); } - regexp_check(mrb, sub); + mrb_regexp_check(mrb, sub); if (pos < 0) { pos += RSTRING_LEN(str); if (pos < 0) { @@ -410,7 +410,7 @@ mrb_str_rindex_m(mrb_state *mrb, mrb_value str) if (pos < 0) { pos += len; if (pos < 0) { - regexp_check(mrb, sub); + mrb_regexp_check(mrb, sub); return mrb_nil_value(); } } @@ -423,7 +423,7 @@ mrb_str_rindex_m(mrb_state *mrb, mrb_value str) else sub = mrb_nil_value(); } - regexp_check(mrb, sub); + mrb_regexp_check(mrb, sub); if (mrb_type(sub) == MRB_TT_FIXNUM) { sub = mrb_fixnum_chr(mrb, sub); @@ -533,7 +533,7 @@ mrb_str_split_m(mrb_state *mrb, mrb_value str) } } else { - noregexp(mrb, str); + mrb_noregexp(mrb, str); } } @@ -603,7 +603,7 @@ mrb_str_split_m(mrb_state *mrb, mrb_value str) beg = ptr - temp; } else { - noregexp(mrb, str); + mrb_noregexp(mrb, str); } if (RSTRING_LEN(str) > 0 && (lim_p || RSTRING_LEN(str) > beg || lim < 0)) { if (RSTRING_LEN(str) == beg) { |