summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/mruby/class.h2
-rw-r--r--include/mruby/string.h2
-rw-r--r--include/mruby/value.h27
-rw-r--r--mrbgems/mruby-objectspace/src/mruby_objectspace.c2
-rw-r--r--mrbgems/mruby-proc-ext/src/proc.c2
-rw-r--r--src/backtrace.c2
-rw-r--r--src/class.c2
-rw-r--r--src/etc.c4
-rw-r--r--src/kernel.c2
-rw-r--r--src/object.c2
-rw-r--r--src/vm.c2
11 files changed, 27 insertions, 22 deletions
diff --git a/include/mruby/class.h b/include/mruby/class.h
index 355b55f80..28ba6b1b7 100644
--- a/include/mruby/class.h
+++ b/include/mruby/class.h
@@ -39,7 +39,7 @@ mrb_class(mrb_state *mrb, mrb_value v)
return mrb->fixnum_class;
case MRB_TT_FLOAT:
return mrb->float_class;
- case MRB_TT_VOIDP:
+ case MRB_TT_CPTR:
return mrb->object_class;
default:
return mrb_obj_ptr(v)->c;
diff --git a/include/mruby/string.h b/include/mruby/string.h
index 6dd667cc4..727d95677 100644
--- a/include/mruby/string.h
+++ b/include/mruby/string.h
@@ -37,7 +37,7 @@ void mrb_str_modify(mrb_state*, struct RString*);
mrb_value mrb_str_literal(mrb_state*, mrb_value);
void mrb_str_concat(mrb_state*, mrb_value, mrb_value);
mrb_value mrb_str_plus(mrb_state*, mrb_value, mrb_value);
-mrb_value mrb_ptr_to_str(mrb_state *, void *);
+mrb_value mrb_ptr_to_str(mrb_state *, void*);
mrb_value mrb_obj_as_string(mrb_state *mrb, mrb_value obj);
mrb_value mrb_str_resize(mrb_state *mrb, mrb_value str, mrb_int len);
mrb_value mrb_str_substr(mrb_state *mrb, mrb_value str, mrb_int beg, mrb_int len);
diff --git a/include/mruby/value.h b/include/mruby/value.h
index 8c1ffa42c..c48c9169e 100644
--- a/include/mruby/value.h
+++ b/include/mruby/value.h
@@ -99,7 +99,7 @@ enum mrb_vtype {
MRB_TT_SYMBOL, /* 5 */
MRB_TT_UNDEF, /* 6 */
MRB_TT_FLOAT, /* 7 */
- MRB_TT_VOIDP, /* 8 */
+ MRB_TT_CPTR, /* 8 */
MRB_TT_OBJECT, /* 9 */
MRB_TT_CLASS, /* 10 */
MRB_TT_MODULE, /* 11 */
@@ -194,7 +194,7 @@ enum mrb_vtype {
MRB_TT_SYMBOL, /* 4 */
MRB_TT_UNDEF, /* 5 */
MRB_TT_FLOAT, /* 6 */
- MRB_TT_VOIDP, /* 7 */
+ MRB_TT_CPTR, /* 7 */
MRB_TT_OBJECT, /* 8 */
MRB_TT_CLASS, /* 9 */
MRB_TT_MODULE, /* 10 */
@@ -242,7 +242,7 @@ typedef union mrb_value {
};
struct RBasic *bp;
struct RFloat *fp;
- struct RVoidp *vp;
+ struct RCptr *vp;
} value;
unsigned long w;
} mrb_value;
@@ -305,14 +305,14 @@ mrb_float_value(struct mrb_state *mrb, mrb_float f)
#ifdef MRB_WORD_BOXING
-#define mrb_voidp(o) (o).value.vp->p
+#define mrb_cptr(o) (o).value.vp->p
#define mrb_fixnum_p(o) ((o).value.i_flag == MRB_FIXNUM_FLAG)
#define mrb_undef_p(o) ((o).w == MRB_Qundef)
#define mrb_nil_p(o) ((o).w == MRB_Qnil)
#define mrb_bool(o) ((o).w != MRB_Qnil && (o).w != MRB_Qfalse)
#else
-#define mrb_voidp(o) mrb_ptr(o)
+#define mrb_cptr(o) mrb_ptr(o)
#define mrb_fixnum_p(o) (mrb_type(o) == MRB_TT_FIXNUM)
#define mrb_undef_p(o) (mrb_type(o) == MRB_TT_UNDEF)
#define mrb_nil_p(o) (mrb_type(o) == MRB_TT_FALSE && !(o).value.i)
@@ -327,7 +327,7 @@ mrb_float_value(struct mrb_state *mrb, mrb_float f)
#define mrb_array_p(o) (mrb_type(o) == MRB_TT_ARRAY)
#define mrb_string_p(o) (mrb_type(o) == MRB_TT_STRING)
#define mrb_hash_p(o) (mrb_type(o) == MRB_TT_HASH)
-#define mrb_voidp_p(o) (mrb_type(o) == MRB_TT_VOIDP)
+#define mrb_cptr_p(o) (mrb_type(o) == MRB_TT_CPTR)
#define mrb_test(o) mrb_bool(o)
#define MRB_OBJECT_HEADER \
@@ -370,7 +370,7 @@ struct RObject {
#define mrb_obj_ptr(v) ((struct RObject*)(mrb_ptr(v)))
/* obsolete macro mrb_object; will be removed soon */
#define mrb_object(o) mrb_obj_ptr(o)
-#define mrb_immediate_p(x) (mrb_type(x) <= MRB_TT_VOIDP)
+#define mrb_immediate_p(x) (mrb_type(x) <= MRB_TT_CPTR)
#define mrb_special_const_p(x) mrb_immediate_p(x)
struct RFiber {
@@ -384,7 +384,7 @@ struct RFloat {
mrb_float f;
};
-struct RVoidp {
+struct RCptr {
MRB_OBJECT_HEADER;
void *p;
};
@@ -441,18 +441,23 @@ mrb_obj_value(void *p)
#ifdef MRB_WORD_BOXING
mrb_value
-mrb_voidp_value(struct mrb_state *mrb, void *p);
+mrb_cptr_value(struct mrb_state *mrb, void *p);
#else
static inline mrb_value
-mrb_voidp_value(struct mrb_state *mrb, void *p)
+mrb_cptr_value(struct mrb_state *mrb, void *p)
{
mrb_value v;
(void) mrb;
- MRB_SET_VALUE(v, MRB_TT_VOIDP, value.p, p);
+ MRB_SET_VALUE(v, MRB_TT_CPTR, value.p, p);
return v;
}
#endif
+/* obsolete macros; will be removed */
+#define MRB_TT_VOIDP MRB_TT_CPTR
+#define mrb_voidp_value(m,p) mrb_cptr_value((m),(p))
+#define mrb_voidp(o) mrb_cptr(o)
+#define mrb_voidp_p(o) mrb_cptr_p(o)
static inline mrb_value
mrb_false_value(void)
diff --git a/mrbgems/mruby-objectspace/src/mruby_objectspace.c b/mrbgems/mruby-objectspace/src/mruby_objectspace.c
index ccca6bcbc..ac6189ded 100644
--- a/mrbgems/mruby-objectspace/src/mruby_objectspace.c
+++ b/mrbgems/mruby-objectspace/src/mruby_objectspace.c
@@ -80,7 +80,7 @@ os_count_objects(mrb_state *mrb, mrb_value self)
COUNT_TYPE(MRB_TT_SYMBOL);
COUNT_TYPE(MRB_TT_UNDEF);
COUNT_TYPE(MRB_TT_FLOAT);
- COUNT_TYPE(MRB_TT_VOIDP);
+ COUNT_TYPE(MRB_TT_CPTR);
COUNT_TYPE(MRB_TT_OBJECT);
COUNT_TYPE(MRB_TT_CLASS);
COUNT_TYPE(MRB_TT_MODULE);
diff --git a/mrbgems/mruby-proc-ext/src/proc.c b/mrbgems/mruby-proc-ext/src/proc.c
index 22e695e99..87d96a865 100644
--- a/mrbgems/mruby-proc-ext/src/proc.c
+++ b/mrbgems/mruby-proc-ext/src/proc.c
@@ -35,7 +35,7 @@ mrb_proc_inspect(mrb_state *mrb, mrb_value self)
{
struct RProc *p = mrb_proc_ptr(self);
mrb_value str = mrb_str_new_cstr(mrb, "#<Proc:");
- mrb_str_concat(mrb, str, mrb_ptr_to_str(mrb, mrb_voidp(self)));
+ mrb_str_concat(mrb, str, mrb_ptr_to_str(mrb, mrb_cptr(self)));
if (!MRB_PROC_CFUNC_P(p)) {
mrb_irep *irep = p->body.irep;
diff --git a/src/backtrace.c b/src/backtrace.c
index a8ba9cf24..4ad792a5e 100644
--- a/src/backtrace.c
+++ b/src/backtrace.c
@@ -85,7 +85,7 @@ mrb_output_backtrace(mrb_state *mrb, struct RObject *exc, output_stream_func fun
pc = mrb->c->cibase[i+1].pc;
}
else {
- pc = (mrb_code*)mrb_voidp(mrb_obj_iv_get(mrb, exc, mrb_intern2(mrb, "lastpc", 6)));
+ pc = (mrb_code*)mrb_cptr(mrb_obj_iv_get(mrb, exc, mrb_intern2(mrb, "lastpc", 6)));
}
filename = mrb_debug_get_filename(irep, pc - irep->iseq - 1);
line = mrb_debug_get_line(irep, pc - irep->iseq - 1);
diff --git a/src/class.c b/src/class.c
index e04aa5ce8..2fc14b2b8 100644
--- a/src/class.c
+++ b/src/class.c
@@ -933,7 +933,7 @@ mrb_singleton_class(mrb_state *mrb, mrb_value v)
return mrb_obj_value(mrb->false_class);
case MRB_TT_TRUE:
return mrb_obj_value(mrb->true_class);
- case MRB_TT_VOIDP:
+ case MRB_TT_CPTR:
return mrb_obj_value(mrb->object_class);
case MRB_TT_SYMBOL:
case MRB_TT_FIXNUM:
diff --git a/src/etc.c b/src/etc.c
index b8c6cfbb0..70b22cfc4 100644
--- a/src/etc.c
+++ b/src/etc.c
@@ -199,11 +199,11 @@ mrb_float_value(mrb_state *mrb, mrb_float f)
}
mrb_value
-mrb_voidp_value(mrb_state *mrb, void *p)
+mrb_cptr_value(mrb_state *mrb, void *p)
{
mrb_value v;
- v.value.p = mrb_obj_alloc(mrb, MRB_TT_VOIDP, mrb->object_class);
+ v.value.p = mrb_obj_alloc(mrb, MRB_TT_CPTR, mrb->object_class);
v.value.vp->p = p;
return v;
}
diff --git a/src/kernel.c b/src/kernel.c
index ce3aa89f0..bd58078fe 100644
--- a/src/kernel.c
+++ b/src/kernel.c
@@ -922,7 +922,7 @@ mrb_f_raise(mrb_state *mrb, mrb_value self)
/* fall through */
default:
exc = mrb_make_exception(mrb, argc, a);
- mrb_obj_iv_set(mrb, mrb_obj_ptr(exc), mrb_intern2(mrb, "lastpc", 6), mrb_voidp_value(mrb, mrb->c->ci->pc));
+ mrb_obj_iv_set(mrb, mrb_obj_ptr(exc), mrb_intern2(mrb, "lastpc", 6), mrb_cptr_value(mrb, mrb->c->ci->pc));
mrb_exc_raise(mrb, exc);
break;
}
diff --git a/src/object.c b/src/object.c
index 363f474f7..1040a08ed 100644
--- a/src/object.c
+++ b/src/object.c
@@ -436,7 +436,7 @@ mrb_any_to_s(mrb_state *mrb, mrb_value obj)
mrb_str_buf_cat(mrb, str, "#<", 2);
mrb_str_cat2(mrb, str, cname);
mrb_str_cat(mrb, str, ":", 1);
- mrb_str_concat(mrb, str, mrb_ptr_to_str(mrb, mrb_voidp(obj)));
+ mrb_str_concat(mrb, str, mrb_ptr_to_str(mrb, mrb_cptr(obj)));
mrb_str_buf_cat(mrb, str, ">", 1);
return str;
diff --git a/src/vm.c b/src/vm.c
index 78f32ac96..0a574c1b7 100644
--- a/src/vm.c
+++ b/src/vm.c
@@ -1250,7 +1250,7 @@ mrb_run(mrb_state *mrb, struct RProc *proc, mrb_value self)
L_RAISE:
ci = mrb->c->ci;
- mrb_obj_iv_ifnone(mrb, mrb->exc, mrb_intern2(mrb, "lastpc", 6), mrb_voidp_value(mrb, pc));
+ mrb_obj_iv_ifnone(mrb, mrb->exc, mrb_intern2(mrb, "lastpc", 6), mrb_cptr_value(mrb, pc));
mrb_obj_iv_ifnone(mrb, mrb->exc, mrb_intern2(mrb, "ciidx", 5), mrb_fixnum_value(ci - mrb->c->cibase));
eidx = ci->eidx;
if (ci == mrb->c->cibase) {
generated by cgit v1.2.3 (git 2.39.1) at 2026-04-15 00:10:25 +0000