diff options
| author | Yukihiro Matz Matsumoto <[email protected]> | 2012-11-04 05:05:53 +0900 |
|---|---|---|
| committer | Yukihiro Matz Matsumoto <[email protected]> | 2012-11-04 05:05:53 +0900 |
| commit | 15304c194d86544cc7cc7138cec1bf4bdcbcaeb5 (patch) | |
| tree | 5e707bc94923967786db3b872645303c9ccbfb53 /src | |
| parent | d2d2e9f5f9267c2583aa542b4066d109a07b742e (diff) | |
| download | mruby-15304c194d86544cc7cc7138cec1bf4bdcbcaeb5.tar.gz mruby-15304c194d86544cc7cc7138cec1bf4bdcbcaeb5.zip | |
replace RTEST() by mrb_test_p()
Diffstat (limited to 'src')
| -rw-r--r-- | src/kernel.c | 4 | ||||
| -rw-r--r-- | src/object.c | 2 | ||||
| -rw-r--r-- | src/regparse.c | 4 | ||||
| -rw-r--r-- | src/sprintf.c | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/kernel.c b/src/kernel.c index 927916b8a..043551ccc 100644 --- a/src/kernel.c +++ b/src/kernel.c @@ -764,7 +764,7 @@ mrb_obj_singleton_methods(mrb_state *mrb, int argc, mrb_value *argv, mrb_value o method_entry_loop(mrb, klass, ary); klass = klass->super; } - if (RTEST(recur)) { + if (mrb_test(recur)) { while (klass && ((klass->tt == MRB_TT_SCLASS) || (klass->tt == MRB_TT_ICLASS))) { method_entry_loop(mrb, klass, ary); klass = klass->super; @@ -1008,7 +1008,7 @@ obj_respond_to(mrb_state *mrb, mrb_value self) if (argc > 1) priv = argv[1]; else priv = mrb_nil_value(); id = mrb_to_id(mrb, mid); - if (basic_obj_respond_to(mrb, self, id, !RTEST(priv))) + if (basic_obj_respond_to(mrb, self, id, !mrb_test(priv))) return mrb_true_value(); return mrb_false_value(); } diff --git a/src/object.c b/src/object.c index ae3af692d..51b5c12d9 100644 --- a/src/object.c +++ b/src/object.c @@ -603,5 +603,5 @@ int mrb_eql(mrb_state *mrb, mrb_value obj1, mrb_value obj2) { if (mrb_obj_eq(mrb, obj1, obj2)) return TRUE; - return RTEST(mrb_funcall(mrb, obj1, "eql?", 1, obj2)); + return mrb_test(mrb_funcall(mrb, obj1, "eql?", 1, obj2)); } diff --git a/src/regparse.c b/src/regparse.c index f7bb23306..0ecb01018 100644 --- a/src/regparse.c +++ b/src/regparse.c @@ -2831,7 +2831,7 @@ CLOSE_BRACKET_WITHOUT_ESC_WARN(ScanEnv* env, UChar* c) static void CC_DUP_WARN(ScanEnv *env) { - if (onig_warn == onig_null_warn /*|| !RTEST(ruby_verbose)*/) return ; + if (onig_warn == onig_null_warn /*|| !mrb_test(ruby_verbose)*/) return ; if (IS_SYNTAX_BV((env)->syntax, ONIG_SYN_WARN_CC_DUP) && !((env)->warnings_flag & ONIG_SYN_WARN_CC_DUP)) { @@ -2843,7 +2843,7 @@ CC_DUP_WARN(ScanEnv *env) static void UNKNOWN_ESC_WARN(ScanEnv *env, int c) { - if (onig_warn == onig_null_warn /*|| !RTEST(ruby_verbose)*/) return ; + if (onig_warn == onig_null_warn /*|| !mrb_test(ruby_verbose)*/) return ; onig_syntax_warn(env, "Unknown escape \\%c is ignored", c); } diff --git a/src/sprintf.c b/src/sprintf.c index 91fa3edca..cbe2681a9 100644 --- a/src/sprintf.c +++ b/src/sprintf.c @@ -1052,8 +1052,8 @@ retry: */ if (posarg >= 0 && nextarg < argc) { const char *mesg = "too many arguments for format string"; - if (RTEST(ruby_debug)) mrb_raise(mrb, E_ARGUMENT_ERROR, mesg); - if (RTEST(ruby_verbose)) mrb_warn("%s", mesg); + if (mrb_test(ruby_debug)) mrb_raise(mrb, E_ARGUMENT_ERROR, mesg); + if (mrb_test(ruby_verbose)) mrb_warn("%s", mesg); } mrb_str_resize(mrb, result, blen); |