ruby-changes:3565
From: ko1@a...
Date: Tue, 15 Jan 2008 03:42:09 +0900 (JST)
Subject: [ruby-changes:3565] nobu - Ruby:r15054 (ruby_1_8, trunk): * eval.c (eval): check if backtrace is empty.
nobu 2008-01-15 03:41:44 +0900 (Tue, 15 Jan 2008)
New Revision: 15054
Modified files:
branches/ruby_1_8/ChangeLog
branches/ruby_1_8/eval.c
trunk/ChangeLog
trunk/eval.c
Log:
* eval.c (eval): check if backtrace is empty. [ruby-core:15040]
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15054&r2=15053&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15054&r2=15053&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/eval.c?r1=15054&r2=15053&diff_format=u
http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/eval.c?r1=15054&r2=15053&diff_format=u
Index: ChangeLog
===================================================================
--- ChangeLog (revision 15053)
+++ ChangeLog (revision 15054)
@@ -1,3 +1,7 @@
+Tue Jan 15 03:41:42 2008 Nobuyoshi Nakada <nobu@r...>
+
+ * eval.c (eval): check if backtrace is empty. [ruby-core:15040]
+
Tue Jan 15 01:28:47 2008 Nobuyoshi Nakada <nobu@r...>
* common.mk: simplified dummy objects dependencies.
Index: eval.c
===================================================================
--- eval.c (revision 15053)
+++ eval.c (revision 15054)
@@ -1757,16 +1757,17 @@
if (state == TAG_RAISE) {
VALUE errinfo = th->errinfo;
if (strcmp(file, "(eval)") == 0) {
- VALUE mesg, errat;
+ VALUE mesg, errat, bt2;
errat = get_backtrace(errinfo);
mesg = rb_attr_get(errinfo, rb_intern("mesg"));
- if (!NIL_P(errat) && TYPE(errat) == T_ARRAY) {
- if (!NIL_P(mesg) && TYPE(mesg) == T_STRING) {
+ if (!NIL_P(errat) && TYPE(errat) == T_ARRAY &&
+ (bt2 = backtrace(-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]);
}
- RARRAY_PTR(errat)[0] = RARRAY_PTR(backtrace(-2))[0];
+ RARRAY_PTR(errat)[0] = RARRAY_PTR(bt2)[0];
}
}
rb_exc_raise(errinfo);
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog (revision 15053)
+++ ruby_1_8/ChangeLog (revision 15054)
@@ -1,3 +1,7 @@
+Tue Jan 15 03:41:42 2008 Nobuyoshi Nakada <nobu@r...>
+
+ * eval.c (eval): check if backtrace is empty. [ruby-core:15040]
+
Tue Jan 15 01:28:47 2008 Nobuyoshi Nakada <nobu@r...>
* common.mk: simplified dummy objects dependencies.
Index: ruby_1_8/eval.c
===================================================================
--- ruby_1_8/eval.c (revision 15053)
+++ ruby_1_8/eval.c (revision 15054)
@@ -6535,16 +6535,17 @@
if (state) {
if (state == TAG_RAISE) {
if (strcmp(file, "(eval)") == 0) {
- VALUE mesg, errat;
+ VALUE mesg, errat, bt2;
errat = get_backtrace(ruby_errinfo);
- mesg = rb_attr_get(ruby_errinfo, rb_intern("mesg"));
- if (!NIL_P(errat) && TYPE(errat) == T_ARRAY) {
+ mesg = rb_attr_get(ruby_errinfo, rb_intern("mesg"));
+ if (!NIL_P(errat) && TYPE(errat) == T_ARRAY &&
+ (bt2 = backtrace(-2), RARRAY_LEN(bt2) > 0)) {
if (!NIL_P(mesg) && TYPE(mesg) == T_STRING) {
rb_str_update(mesg, 0, 0, rb_str_new2(": "));
- rb_str_update(mesg, 0, 0, RARRAY(errat)->ptr[0]);
+ rb_str_update(mesg, 0, 0, RARRAY_PTR(errat)[0]);
}
- RARRAY(errat)->ptr[0] = RARRAY(backtrace(-2))->ptr[0];
+ RARRAY_PTR(errat)[0] = RARRAY_PTR(bt2)[0];
}
}
rb_exc_raise(ruby_errinfo);
--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/