diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-09 09:11:31 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-09 09:11:31 +0000 |
commit | 366611a9acd4211a93fe837245a7d1705707db06 (patch) | |
tree | ed9289b25191a1c6249b216ead886d96a8923f30 | |
parent | e55618f1bd27f0e5c4b959d325021176751f0acf (diff) |
merge revision(s) 15054:
* eval.c (eval): check if backtrace is empty. [ruby-core:15040]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@17049 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | eval.c | 9 | ||||
-rw-r--r-- | version.h | 8 |
3 files changed, 13 insertions, 8 deletions
@@ -1,3 +1,7 @@ +Mon Jun 9 18:09:20 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * eval.c (eval): check if backtrace is empty. [ruby-core:15040] + Sun Jun 8 06:08:26 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * eval.c (rb_define_alloc_func, rb_undef_alloc_func): should @@ -6534,16 +6534,17 @@ eval(self, src, scope, file, line) 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(bt2)->len > 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]); } - RARRAY(errat)->ptr[0] = RARRAY(backtrace(-2))->ptr[0]; + RARRAY(errat)->ptr[0] = RARRAY(bt2)->ptr[0]; } } rb_exc_raise(ruby_errinfo); @@ -1,15 +1,15 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2008-06-08" +#define RUBY_RELEASE_DATE "2008-06-09" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20080608 -#define RUBY_PATCHLEVEL 166 +#define RUBY_RELEASE_CODE 20080609 +#define RUBY_PATCHLEVEL 167 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 8 +#define RUBY_RELEASE_DAY 9 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |