admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace RTEST() by mrb_test_p()

Browse Source
This commit is contained in:
Yukihiro Matz Matsumoto
2012-11-04 05:05:53 +09:00
parent d2d2e9f5f9
commit 15304c194d
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/mruby/value.h
-1
View File
@@ -163,7 +163,6 @@ mrb_float_value(mrb_float f)
#define IMMEDIATE_P(x) (mrb_type(x) <= MRB_TT_MAIN)
#define SPECIAL_CONST_P(x) IMMEDIATE_P(x)
#define RTEST(o) mrb_test(o)
#define FL_ABLE(x) (!SPECIAL_CONST_P(x))
#define FL_TEST(x,f) (FL_ABLE(x)?(RBASIC(x)->flags&(f)):0)
src/kernel.c
+2 -2
View File
@@ -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();
}
src/object.c
+1 -1
View File
@@ -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));
}
src/regparse.c
+2 -2
View File
@@ -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);
}
src/sprintf.c
+2 -2
View File
@@ -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);