naruse	2013-03-22 00:04:57 +0900 (Fri, 22 Mar 2013)

  New Revision: 39866

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

  Log:
    * addr2line.c (rb_dump_backtrace_with_lines): output line at once.

  Modified files:
    trunk/ChangeLog
    trunk/addr2line.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 39865)
+++ ChangeLog	(revision 39866)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Fri Mar 22 00:04:15 2013  NARUSE, Yui  <naruse@r...>
+
+	* addr2line.c (rb_dump_backtrace_with_lines): output line at once.
+
 Thu Mar 21 23:17:08 2013  Nobuyoshi Nakada  <nobu@r...>
 
 	* thread.c (ruby_kill): get rid of deadlock on signal 0.
Index: addr2line.c
===================================================================
--- addr2line.c	(revision 39865)
+++ addr2line.c	(revision 39866)
@@ -619,16 +619,16 @@ rb_dump_backtrace_with_lines(int num_tra https://github.com/ruby/ruby/blob/trunk/addr2line.c#L619
 	line_info_t *line = &lines[i];
 
 	if (line->line > 0) {
-	    fprintf(stderr, "%s ", syms[i]);
 	    if (line->filename) {
 		if (line->dirname && line->dirname[0]) {
-		    fprintf(stderr, "%s/", line->dirname);
+		    fprintf(stderr, "%s %s/%s:%d\n", syms[i], line->dirname, line->filename, line->line);
+		}
+		else {
+		    fprintf(stderr, "%s %s:%d\n", syms[i], line->filename, line->line);
 		}
-		fprintf(stderr, "%s", line->filename);
 	    } else {
-		fprintf(stderr, "???");
+		fprintf(stderr, "%s ???:%d\n", syms[i], line->line);
 	    }
-	    fprintf(stderr, ":%d\n", line->line);
 	} else {
 	    fprintf(stderr, "%s\n", syms[i]);
 	}

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