matz	2007-09-25 21:40:17 +0900 (Tue, 25 Sep 2007)

  New Revision: 13510

  Modified files:
    trunk/ChangeLog
    trunk/eval.c
    trunk/version.h

  Log:
    * eval.c (rb_longjmp): source file information may be NULL.
      [ruby-dev:31849]
    
    * eval.c (ruby_finalize_0): clear trace_func before finalization.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=13510&r2=13509
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=13510&r2=13509
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/eval.c?r1=13510&r2=13509

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 13509)
+++ ChangeLog	(revision 13510)
@@ -1,3 +1,10 @@
+Tue Sep 25 09:51:31 2007  Yukihiro Matsumoto  <matz@r...>
+
+	* eval.c (rb_longjmp): source file information may be NULL.
+	  [ruby-dev:31849]
+
+	* eval.c (ruby_finalize_0): clear trace_func before finalization.
+
 Mon Sep 24 22:36:13 2007  Yukihiro Matsumoto  <matz@r...>
 
 	* array.c (rb_ary_equal): should handle recursive array.
Index: eval.c
===================================================================
--- eval.c	(revision 13509)
+++ eval.c	(revision 13510)
@@ -130,6 +130,7 @@
 static void
 ruby_finalize_0(void)
 {
+    rb_clear_trace_func();
     PUSH_TAG();
     if (EXEC_TAG() == 0) {
 	rb_trap_exit();
@@ -143,7 +144,6 @@
 {
     signal(SIGINT, SIG_DFL);
     GET_THREAD()->errinfo = Qnil;
-    rb_clear_trace_func();
     rb_gc_call_finalizer_at_exit();
 }
 
@@ -686,9 +686,16 @@
 	PUSH_TAG();
 	if ((status = EXEC_TAG()) == 0) {
 	    RB_GC_GUARD(e) = rb_obj_as_string(e);
-	    warn_printf("Exception `%s' at %s:%d - %s\n",
-			rb_obj_classname(th->errinfo),
-			file, line, RSTRING_PTR(e));
+	    if (file) {
+		warn_printf("Exception `%s' at %s:%d - %s\n",
+			    rb_obj_classname(th->errinfo),
+			    file, line, RSTRING_PTR(e));
+	    }
+	    else {
+		warn_printf("Exception `%s' - %s\n",
+			    rb_obj_classname(th->errinfo),
+			    RSTRING_PTR(e));
+	    }
 	}
 	POP_TAG();
 	if (status == TAG_FATAL && th->errinfo == exception_error) {
Index: version.h
===================================================================
--- version.h	(revision 13509)
+++ version.h	(revision 13510)
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2007-09-24"
+#define RUBY_RELEASE_DATE "2007-09-25"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20070924
+#define RUBY_RELEASE_CODE 20070925
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2007
 #define RUBY_RELEASE_MONTH 9
-#define RUBY_RELEASE_DAY 24
+#define RUBY_RELEASE_DAY 25
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];

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