From 3ba521ae9e238c91198404845e4f213ce541b13d Mon Sep 17 00:00:00 2001 From: Yukihiro Matz Matsumoto Date: Sun, 4 Nov 2012 04:49:43 +0900 Subject: replace FIXNUM_P() by mrb_fixnum_p() --- src/sprintf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sprintf.c') diff --git a/src/sprintf.c b/src/sprintf.c index 2bd72ffc6..91fa3edca 100644 --- a/src/sprintf.c +++ b/src/sprintf.c @@ -800,7 +800,7 @@ retry: goto bin_retry; } val = mrb_flt2big(mrb, mrb_float(val)); - if (FIXNUM_P(val)) goto bin_retry; + if (mrb_fixnum_p(val)) goto bin_retry; break; case MRB_TT_STRING: val = mrb_str_to_inum(mrb, val, 0, TRUE); -- cgit v1.2.3 From 15304c194d86544cc7cc7138cec1bf4bdcbcaeb5 Mon Sep 17 00:00:00 2001 From: Yukihiro Matz Matsumoto Date: Sun, 4 Nov 2012 05:05:53 +0900 Subject: replace RTEST() by mrb_test_p() --- include/mruby/value.h | 1 - src/kernel.c | 4 ++-- src/object.c | 2 +- src/regparse.c | 4 ++-- src/sprintf.c | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) (limited to 'src/sprintf.c') diff --git a/include/mruby/value.h b/include/mruby/value.h index 99b40914b..75302792b 100644 --- a/include/mruby/value.h +++ b/include/mruby/value.h @@ -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) 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); -- cgit v1.2.3 From ca7c662be5debb85b38063807c6f3034d1156d5f Mon Sep 17 00:00:00 2001 From: Yukihiro Matz Matsumoto Date: Sun, 4 Nov 2012 05:07:44 +0900 Subject: remove reference to ruby_verbose and ruby_debug --- include/mruby.h | 2 -- src/sprintf.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/sprintf.c') diff --git a/include/mruby.h b/include/mruby.h index 94fa393ea..a35d92804 100644 --- a/include/mruby.h +++ b/include/mruby.h @@ -46,8 +46,6 @@ typedef void* (*mrb_allocf) (struct mrb_state *mrb, void*, size_t, void *ud); #ifndef MRB_ARENA_SIZE #define MRB_ARENA_SIZE 1024 #endif -#define ruby_debug (mrb_nil_value()) -#define ruby_verbose (mrb_nil_value()) typedef struct { mrb_sym mid; diff --git a/src/sprintf.c b/src/sprintf.c index cbe2681a9..630875a88 100644 --- a/src/sprintf.c +++ b/src/sprintf.c @@ -1048,6 +1048,7 @@ retry: } sprint_exit: +#if 0 /* XXX - We cannot validate the number of arguments if (digit)$ style used. */ if (posarg >= 0 && nextarg < argc) { @@ -1055,6 +1056,7 @@ retry: if (mrb_test(ruby_debug)) mrb_raise(mrb, E_ARGUMENT_ERROR, mesg); if (mrb_test(ruby_verbose)) mrb_warn("%s", mesg); } +#endif mrb_str_resize(mrb, result, blen); return result; -- cgit v1.2.3