From 64c919353410c81a8f7ababf3a9be269f7bb293c Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 19 Apr 2009 13:35:19 +0000 Subject: merges r23097 from trunk into ruby_1_9_1. -- * vm_eval.c (eval_string_with_cref): replaces the message if frozen. [ruby-dev:38208] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23230 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ vm_eval.c | 14 +++++++++++--- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 92a54ff2c..9d3ee0a0e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Mar 30 12:12:46 2009 Nobuyoshi Nakada + + * vm_eval.c (eval_string_with_cref): replaces the message if + frozen. [ruby-dev:38208] + Sun Mar 29 08:59:26 2009 Nobuyoshi Nakada * lib/pathname.rb (Pathname#relative_path_from): compares path diff --git a/vm_eval.c b/vm_eval.c index b74d28efe..aaef1c71a 100644 --- a/vm_eval.c +++ b/vm_eval.c @@ -772,14 +772,22 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char if (strcmp(file, "(eval)") == 0) { VALUE mesg, errat, bt2; extern VALUE rb_get_backtrace(VALUE info); + ID id_mesg; + CONST_ID(id_mesg, "mesg"); errat = rb_get_backtrace(errinfo); - mesg = rb_attr_get(errinfo, rb_intern("mesg")); + mesg = rb_attr_get(errinfo, id_mesg); if (!NIL_P(errat) && TYPE(errat) == T_ARRAY && (bt2 = vm_backtrace(th, -2), RARRAY_LEN(bt2) > 0)) { if (!NIL_P(mesg) && TYPE(mesg) == T_STRING && !RSTRING_LEN(mesg)) { - rb_str_update(mesg, 0, 0, rb_str_new2(": ")); - rb_str_update(mesg, 0, 0, RARRAY_PTR(errat)[0]); + if (OBJ_FROZEN(mesg)) { + VALUE m = rb_str_cat(rb_str_dup(RARRAY_PTR(errat)[0]), ": ", 2); + rb_ivar_set(errinfo, id_mesg, rb_str_append(m, mesg)); + } + else { + rb_str_update(mesg, 0, 0, rb_str_new2(": ")); + rb_str_update(mesg, 0, 0, RARRAY_PTR(errat)[0]); + } } RARRAY_PTR(errat)[0] = RARRAY_PTR(bt2)[0]; } -- cgit