mame	2010-03-04 22:54:13 +0900 (Thu, 04 Mar 2010)

  New Revision: 26817

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

  Log:
    * eval.c (setup_exception): avoid line number 0 when setting
      $DEBUG=true.  [ruby-dev:39116]

  Modified files:
    trunk/ChangeLog
    trunk/eval.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 26816)
+++ ChangeLog	(revision 26817)
@@ -1,3 +1,8 @@
+Thu Mar  4 22:49:42 2010  Yusuke Endoh  <mame@t...>
+
+	* eval.c (setup_exception): avoid line number 0 when setting
+	  $DEBUG=true.  [ruby-dev:39116]
+
 Thu Mar  4 22:45:02 2010  Yusuke Endoh  <mame@t...>
 
 	* io.c (io_s_write, io_s_binwrite): add File#write and #binwrite.
Index: eval.c
===================================================================
--- eval.c	(revision 26816)
+++ eval.c	(revision 26817)
@@ -394,11 +394,16 @@
 	PUSH_TAG();
 	if ((status = EXEC_TAG()) == 0) {
 	    RB_GC_GUARD(e) = rb_obj_as_string(e);
-	    if (file) {
+	    if (file && line) {
 		warn_printf("Exception `%s' at %s:%d - %s\n",
 			    rb_obj_classname(th->errinfo),
 			    file, line, RSTRING_PTR(e));
 	    }
+	    else if (file) {
+		warn_printf("Exception `%s' at %s - %s\n",
+			    rb_obj_classname(th->errinfo),
+			    file, RSTRING_PTR(e));
+	    }
 	    else {
 		warn_printf("Exception `%s' - %s\n",
 			    rb_obj_classname(th->errinfo),

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