summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorYukihiro Matz Matsumoto <[email protected]>2012-11-04 04:53:25 +0900
committerYukihiro Matz Matsumoto <[email protected]>2012-11-04 04:53:25 +0900
commit051777dc5de7e16ab28d39530fc0bb8101323e2c (patch)
tree3976c3e256c064f109a3fdeafa046097e5cc8300
parentda88627a37cb1d5ca8d31bb14f3b3d8bb4d7e33e (diff)
downloadmruby-051777dc5de7e16ab28d39530fc0bb8101323e2c.tar.gz
mruby-051777dc5de7e16ab28d39530fc0bb8101323e2c.zip
replace SYMBOL_P() by mrb_symbol_p()
-rw-r--r--include/mruby/value.h2
-rw-r--r--src/class.c2
-rw-r--r--src/struct.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/include/mruby/value.h b/include/mruby/value.h
index 1e0316a90..a6d0aab12 100644
--- a/include/mruby/value.h
+++ b/include/mruby/value.h
@@ -159,7 +159,7 @@ 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 SYMBOL_P(o) (mrb_type(o) == MRB_TT_SYMBOL)
+#define mrb_symbol_p(o) (mrb_type(o) == MRB_TT_SYMBOL)
#define RTEST(o) mrb_test(o)
#define FL_ABLE(x) (!SPECIAL_CONST_P(x))
diff --git a/src/class.c b/src/class.c
index dc7096ec5..c9a5e02bd 100644
--- a/src/class.c
+++ b/src/class.c
@@ -1007,7 +1007,7 @@ mrb_bob_missing(mrb_state *mrb, mrb_value mod)
int alen;
mrb_get_args(mrb, "o*", &name, &a, &alen);
- if (!SYMBOL_P(name)) {
+ if (!mrb_symbol_p(name)) {
mrb_raise(mrb, E_TYPE_ERROR, "name should be a symbol");
}
mrb_raisef(mrb, E_NOMETHOD_ERROR, "undefined method '%s' for %s",
diff --git a/src/struct.c b/src/struct.c
index 2a391d0b1..be57468e1 100644
--- a/src/struct.c
+++ b/src/struct.c
@@ -382,7 +382,7 @@ mrb_struct_s_def(mrb_state *mrb, mrb_value klass)
if (argc > 0) name = argv[0];
if (argc > 1) rest = argv[1];
if (mrb_type(rest) == MRB_TT_ARRAY) {
- if (!mrb_nil_p(name) && SYMBOL_P(name)) {
+ if (!mrb_nil_p(name) && mrb_symbol_p(name)) {
/* 1stArgument:symbol -> name=nil rest=argv[0]-[n] */
mrb_ary_unshift(mrb, rest, name);
name = mrb_nil_value();
@@ -391,7 +391,7 @@ mrb_struct_s_def(mrb_state *mrb, mrb_value klass)
else {
pargv = &argv[1];
argcnt = argc-1;
- if (!mrb_nil_p(name) && SYMBOL_P(name)) {
+ if (!mrb_nil_p(name) && mrb_symbol_p(name)) {
/* 1stArgument:symbol -> name=nil rest=argv[0]-[n] */
name = mrb_nil_value();
pargv = &argv[0];