1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* vm_eval.c (eval_string_with_cref): replaces the message if

Browse Source 
frozen.  [ruby-dev:38208]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-03-30 03:12:48 +00:00
parent c3faa28bb7
commit c11f63669a
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon Mar 30 12:12:46 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* vm_eval.c (eval_string_with_cref): replaces the message if
frozen. [ruby-dev:38208]
Mon Mar 30 01:00:20 2009 James Edward Gray II <jeg2@ruby-lang.org> Mon Mar 30 01:00:20 2009 James Edward Gray II <jeg2@ruby-lang.org>
* test/csv/test_interface.rb: Trying a fix for some failing tests * test/csv/test_interface.rb: Trying a fix for some failing tests

14
vm_eval.c
View File

@ -773,14 +773,22 @@ eval_string_with_cref(VALUE self, VALUE src, VALUE scope, NODE *cref, const char
if (strcmp(file, "(eval)") == 0) { if (strcmp(file, "(eval)") == 0) {
VALUE mesg, errat, bt2; VALUE mesg, errat, bt2;
extern VALUE rb_get_backtrace(VALUE info); extern VALUE rb_get_backtrace(VALUE info);
ID id_mesg;
CONST_ID(id_mesg, "mesg");
errat = rb_get_backtrace(errinfo); 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 && if (!NIL_P(errat) && TYPE(errat) == T_ARRAY &&
(bt2 = vm_backtrace(th, -2), RARRAY_LEN(bt2) > 0)) { (bt2 = vm_backtrace(th, -2), RARRAY_LEN(bt2) > 0)) {
if (!NIL_P(mesg) && TYPE(mesg) == T_STRING && !RSTRING_LEN(mesg)) { if (!NIL_P(mesg) && TYPE(mesg) == T_STRING && !RSTRING_LEN(mesg)) {
rb_str_update(mesg, 0, 0, rb_str_new2(": ")); if (OBJ_FROZEN(mesg)) {
rb_str_update(mesg, 0, 0, RARRAY_PTR(errat)[0]); 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]; RARRAY_PTR(errat)[0] = RARRAY_PTR(bt2)[0];
} }