ko1	2012-11-29 05:30:01 +0900 (Thu, 29 Nov 2012)

  New Revision: 37952

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

  Log:
    * vm_backtrace.c (backtrace_to_str_ary2): rename to backtrace_to_str_ary.
    * vm_backtrace.c (rb_backtrace_to_str_ary): use `backtrace_to_str_ary()'.
    * vm_backtrace.c (backtrace_to_frame_ary): rename to
      backtrace_to_location_ary.

  Modified files:
    trunk/ChangeLog
    trunk/vm_backtrace.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 37951)
+++ ChangeLog	(revision 37952)
@@ -1,3 +1,12 @@
+Thu Nov 29 05:26:32 2012  Koichi Sasada  <ko1@a...>
+
+	* vm_backtrace.c (backtrace_to_str_ary2): rename to backtrace_to_str_ary.
+
+	* vm_backtrace.c (rb_backtrace_to_str_ary): use `backtrace_to_str_ary()'.
+
+	* vm_backtrace.c (backtrace_to_frame_ary): rename to
+	  backtrace_to_location_ary.
+
 Thu Nov 29 05:19:25 2012  Aaron Patterson <aaron@t...>
 
 	* probes.d: Change function-entry probe to method-entry.
Index: vm_backtrace.c
===================================================================
--- vm_backtrace.c	(revision 37951)
+++ vm_backtrace.c	(revision 37952)
@@ -490,23 +490,8 @@
     return location_to_str(loc);
 }
 
-VALUE
-rb_backtrace_to_str_ary(VALUE self)
-{
-    rb_backtrace_t *bt;
-    GetCoreDataFromValue(self, rb_backtrace_t, bt);
-
-    if (bt->strary) {
-	return bt->strary;
-    }
-    else {
-	bt->strary = backtrace_collect(bt, 0, bt->backtrace_size, location_to_str_dmyarg, 0);
-	return bt->strary;
-    }
-}
-
 static VALUE
-backtrace_to_str_ary2(VALUE self, int lev, int n)
+backtrace_to_str_ary(VALUE self, int lev, int n)
 {
     rb_backtrace_t *bt;
     int size;
@@ -523,6 +508,18 @@
     return backtrace_collect(bt, lev, n, location_to_str_dmyarg, 0);
 }
 
+VALUE
+rb_backtrace_to_str_ary(VALUE self)
+{
+    rb_backtrace_t *bt;
+    GetCoreDataFromValue(self, rb_backtrace_t, bt);
+
+    if (!bt->strary) {
+	bt->strary = backtrace_to_str_ary(self, 0, bt->backtrace_size);
+    }
+    return bt->strary;
+}
+
 static VALUE
 location_create(rb_backtrace_location_t *srcloc, void *btobj)
 {
@@ -537,7 +534,7 @@
 }
 
 static VALUE
-backtrace_to_frame_ary(VALUE self, int lev, int n)
+backtrace_to_location_ary(VALUE self, int lev, int n)
 {
     rb_backtrace_t *bt;
     int size;
@@ -573,13 +570,13 @@
 VALUE
 vm_backtrace_str_ary(rb_thread_t *th, int lev, int n)
 {
-    return backtrace_to_str_ary2(backtrace_object(th), lev, n);
+    return backtrace_to_str_ary(backtrace_object(th), lev, n);
 }
 
 VALUE
-vm_backtrace_frame_ary(rb_thread_t *th, int lev, int n)
+vm_backtrace_location_ary(rb_thread_t *th, int lev, int n)
 {
-    return backtrace_to_frame_ary(backtrace_object(th), lev, n);
+    return backtrace_to_location_ary(backtrace_object(th), lev, n);
 }
 
 /* make old style backtrace directly */
@@ -728,7 +725,7 @@
 	return vm_backtrace_str_ary(th, lev+lev_plus, n);
     }
     else {
-	return vm_backtrace_frame_ary(th, lev+lev_plus, n);
+	return vm_backtrace_location_ary(th, lev+lev_plus, n);
     }
 }
 

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