Replace $letrec with $rec

[bpt/guile.git] / libguile / programs.c

diff --git a/libguile/programs.c b/libguile/programs.c
index 7a01276..64c861a 100644 (file)
--- a/libguile/programs.c
+++ b/libguile/programs.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
  * 
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public License
@@ -74,7 +74,7 @@ scm_i_program_documentation (SCM program)
 SCM
 scm_i_program_properties (SCM program)
 {
-  static SCM rtl_program_properties = SCM_BOOL_F;
+  static SCM program_properties = SCM_BOOL_F;
 
   if (SCM_PRIMITIVE_P (program))
     {
@@ -84,11 +84,11 @@ scm_i_program_properties (SCM program)
       return scm_acons (scm_sym_name, name, SCM_EOL);
     }
 
-  if (scm_is_false (rtl_program_properties) && scm_module_system_booted_p)
-    rtl_program_properties =
-      scm_c_private_variable ("system vm program", "rtl-program-properties");
+  if (scm_is_false (program_properties) && scm_module_system_booted_p)
+    program_properties =
+      scm_c_private_variable ("system vm program", "program-properties");
 
-  return scm_call_1 (scm_variable_ref (rtl_program_properties), program);
+  return scm_call_1 (scm_variable_ref (program_properties), program);
 }
 
 void
@@ -116,7 +116,7 @@ scm_i_program_print (SCM program, SCM port, scm_print_state *pstate)
     }
   else if (scm_is_false (write_program) || print_error)
     {
-      scm_puts_unlocked ("#<rtl-program ", port);
+      scm_puts_unlocked ("#<program ", port);
       scm_uintprint (SCM_UNPACK (program), 16, port);
       scm_putc_unlocked (' ', port);
       scm_uintprint ((scm_t_uintptr) SCM_PROGRAM_CODE (program), 16, port);
@@ -180,6 +180,18 @@ scm_find_source_for_addr (SCM ip)
   return scm_call_1 (scm_variable_ref (source_for_addr), ip);
 }
 
+SCM
+scm_program_address_range (SCM program)
+{
+  static SCM program_address_range = SCM_BOOL_F;
+
+  if (scm_is_false (program_address_range) && scm_module_system_booted_p)
+    program_address_range =
+      scm_c_private_variable ("system vm program", "program-address-range");
+
+  return scm_call_1 (scm_variable_ref (program_address_range), program);
+}
+
 SCM_DEFINE (scm_program_num_free_variables, "program-num-free-variables", 1, 0, 0,
            (SCM program),
            "")
@@ -225,7 +237,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 +254,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;