From 34cf09ccdf33fed42af9bda1f59252db9af9f7af Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Tue, 19 Nov 2013 19:45:56 +0100
Subject: [PATCH] Rename internals of (system vm program) program-minimum-arity

* module/system/vm/debug.scm (find-program-minimum-arity): Rename from
  program-minimum-arity.

* module/system/vm/program.scm (program-minimum-arity): Rename from
  rtl-program-minimum-arity.

* libguile/programs.c (scm_i_program_arity): Adapt.
---
 libguile/programs.c          | 11 +++++------
 module/system/vm/debug.scm   |  6 +++---
 module/system/vm/program.scm |  6 ++----
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/libguile/programs.c b/libguile/programs.c
index 7a0127670..abc50a05c 100644
--- a/libguile/programs.c
+++ b/libguile/programs.c
@@ -225,7 +225,7 @@ SCM_DEFINE (scm_program_free_variable_set_x, "program-free-variable-set!", 3, 0,
 int
 scm_i_program_arity (SCM program, int *req, int *opt, int *rest)
 {
-  static SCM rtl_program_minimum_arity = SCM_BOOL_F;
+  static SCM program_minimum_arity = SCM_BOOL_F;
   SCM l;
 
   if (SCM_PRIMITIVE_P (program))
@@ -242,12 +242,11 @@ scm_i_program_arity (SCM program, int *req, int *opt, int *rest)
       return 1;
     }
 
-  if (scm_is_false (rtl_program_minimum_arity) && scm_module_system_booted_p)
-    rtl_program_minimum_arity =
-        scm_c_private_variable ("system vm program",
-                                "rtl-program-minimum-arity");
+  if (scm_is_false (program_minimum_arity) && scm_module_system_booted_p)
+    program_minimum_arity =
+        scm_c_private_variable ("system vm program", "program-minimum-arity");
 
-  l = scm_call_1 (scm_variable_ref (rtl_program_minimum_arity), program);
+  l = scm_call_1 (scm_variable_ref (program_minimum_arity), program);
   if (scm_is_false (l))
     return 0;
 
diff --git a/module/system/vm/debug.scm b/module/system/vm/debug.scm
index 252c69ca1..d201e50ba 100644
--- a/module/system/vm/debug.scm
+++ b/module/system/vm/debug.scm
@@ -64,7 +64,7 @@
             find-program-debug-info
             arity-arguments-alist
             find-program-arities
-            program-minimum-arity
+            find-program-minimum-arity
 
             find-program-docstring
 
@@ -405,8 +405,8 @@ section of the ELF image.  Returns an ELF symbol, or @code{#f}."
          (read-sub-arities context base (arity-header-offset first)))
         (else (list first)))))))
 
-(define* (program-minimum-arity addr #:optional
-                                (context (find-debug-context addr)))
+(define* (find-program-minimum-arity addr #:optional
+                                     (context (find-debug-context addr)))
   (and=>
    (and context
         (elf-section-by-name (debug-context-elf context) ".guile.arities"))
diff --git a/module/system/vm/program.scm b/module/system/vm/program.scm
index d8f201c0b..857c1f88e 100644
--- a/module/system/vm/program.scm
+++ b/module/system/vm/program.scm
@@ -55,10 +55,8 @@
          program-debug-info-name))
 (define (program-documentation program)
   (find-program-docstring (program-code program)))
-(define (rtl-program-minimum-arity program)
-  (unless (program? program)
-    (error "shouldn't get here"))
-  (program-minimum-arity (program-code program)))
+(define (program-minimum-arity program)
+  (find-program-minimum-arity (program-code program)))
 (define (rtl-program-properties program)
   (unless (program? program)
     (error "shouldn't get here"))