From f77fb11f4e47164c7c6063a20ed0791bf151308f Mon Sep 17 00:00:00 2001 From: take_cheeze Date: Mon, 28 Jul 2014 20:30:02 +0900 Subject: Use RString in `mesg` instead. --- src/error.c | 15 +++++++++++---- src/gc.c | 6 +++--- 2 files changed, 14 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/error.c b/src/error.c index 9fc6fe468..2f893a382 100644 --- a/src/error.c +++ b/src/error.c @@ -21,15 +21,22 @@ static void exc_mesg_set(mrb_state *mrb, struct RException *exc, mrb_value mesg) { - exc->flags |= MRB_EXC_MESG_INIT_FLAG; - exc->mesg = mesg; - mrb_field_write_barrier_value(mrb, (struct RBasic*)exc, mesg); + if (mrb_string_p(mesg)) { + exc->flags |= MRB_EXC_MESG_STRING_FLAG; + exc->mesg = RSTRING(mesg); + mrb_field_write_barrier_value(mrb, (struct RBasic*)exc, mesg); + } + else if (!mrb_nil_p(mesg)) { + exc->flags &= ~MRB_EXC_MESG_STRING_FLAG; + mrb_obj_iv_set(mrb, (struct RObject*)exc, mrb_intern_lit(mrb, "mesg"), mesg); + } } static mrb_value exc_mesg_get(mrb_state *mrb, struct RException *exc) { - return (exc->flags & MRB_EXC_MESG_INIT_FLAG) != 0 ? exc->mesg : mrb_nil_value(); + return (exc->flags & MRB_EXC_MESG_STRING_FLAG) != 0 + ? mrb_obj_value(exc->mesg) : mrb_obj_iv_get(mrb, (struct RObject*)exc, mrb_intern_lit(mrb, "mesg")); } mrb_value diff --git a/src/gc.c b/src/gc.c index 6fcac6c2f..d3fc6d5a2 100644 --- a/src/gc.c +++ b/src/gc.c @@ -582,8 +582,8 @@ gc_mark_children(mrb_state *mrb, struct RBasic *obj) case MRB_TT_EXCEPTION: mrb_gc_mark_iv(mrb, (struct RObject*)obj); - if ((obj->flags & MRB_EXC_MESG_INIT_FLAG) != 0) { - mrb_gc_mark_value(mrb, ((struct RException*)obj)->mesg); + if ((obj->flags & MRB_EXC_MESG_STRING_FLAG) != 0) { + mrb_gc_mark(mrb, (struct RBasic*)((struct RException*)obj)->mesg); } break; @@ -808,7 +808,7 @@ gc_gray_mark(mrb_state *mrb, struct RBasic *obj) case MRB_TT_EXCEPTION: children += mrb_gc_mark_iv_size(mrb, (struct RObject*)obj); - if ((obj->flags & MRB_EXC_MESG_INIT_FLAG) != 0) { + if ((obj->flags & MRB_EXC_MESG_STRING_FLAG) != 0) { children++; } break; -- cgit v1.2.3