yugui	2009-08-09 00:35:59 +0900 (Sun, 09 Aug 2009)

  New Revision: 24476

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=24476

  Log:
    merges r24403 and r24439 from trunk into ruby_1_9_1.
    --
    * eval.c (rb_exc_raise, rb_exc_fatal): require exception object.
      [ruby-core:24767]
    --
    * eval.c (rb_exc_raise, rb_exc_fatal): nil is used to reraise.

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/eval.c
    branches/ruby_1_9_1/version.h

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 24475)
+++ ruby_1_9_1/ChangeLog	(revision 24476)
@@ -1,3 +1,12 @@
+Fri Aug  7 03:22:50 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* eval.c (rb_exc_raise, rb_exc_fatal): nil is used to reraise.
+
+Wed Aug  5 12:54:00 2009  Nobuyoshi Nakada  <nobu@r...>
+
+	* eval.c (rb_exc_raise, rb_exc_fatal): require exception object.
+	  [ruby-core:24767]
+
 Fri Aug  7 01:49:41 2009  Akinori MUSHA  <knu@i...>
 
 	* ext/digest/sha2/sha2.c: The ULL suffix is not supported by
Index: ruby_1_9_1/eval.c
===================================================================
--- ruby_1_9_1/eval.c	(revision 24475)
+++ ruby_1_9_1/eval.c	(revision 24476)
@@ -413,12 +413,18 @@
 void
 rb_exc_raise(VALUE mesg)
 {
+    if (!NIL_P(mesg)) {
+	mesg = rb_make_exception(1, &mesg);
+    }
     rb_longjmp(TAG_RAISE, mesg);
 }
 
 void
 rb_exc_fatal(VALUE mesg)
 {
+    if (!NIL_P(mesg)) {
+	mesg = rb_make_exception(1, &mesg);
+    }
     rb_longjmp(TAG_FATAL, mesg);
 }
 
Index: ruby_1_9_1/version.h
===================================================================
--- ruby_1_9_1/version.h	(revision 24475)
+++ ruby_1_9_1/version.h	(revision 24476)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.1"
-#define RUBY_PATCHLEVEL 280
+#define RUBY_PATCHLEVEL 281
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/