Simplify the interpreter for trivial inits and no letrec

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

diff --git a/libguile/procprop.c b/libguile/procprop.c
index 488edcc..d455360 100644 (file)
--- a/libguile/procprop.c
+++ b/libguile/procprop.c
@@ -61,7 +61,7 @@ scm_i_procedure_arity (SCM proc, int *req, int *opt, int *rest)
       return 1;
     }
 
-  while (!SCM_RTL_PROGRAM_P (proc))
+  while (!SCM_PROGRAM_P (proc))
     {
       if (SCM_STRUCTP (proc))
         {
@@ -146,8 +146,8 @@ SCM_DEFINE (scm_procedure_properties, "procedure-properties", 1, 0, 0,
   if (scm_is_pair (user_props) && scm_is_true (scm_car (user_props)))
     return scm_cdr (user_props);
 
-  if (SCM_RTL_PROGRAM_P (proc))
-    ret = scm_i_rtl_program_properties (proc);
+  if (SCM_PROGRAM_P (proc))
+    ret = scm_i_program_properties (proc);
   else
     ret = SCM_EOL;
 
@@ -258,8 +258,8 @@ SCM_DEFINE (scm_procedure_name, "procedure-name", 1, 0, 0,
         return SCM_BOOL_F;
     }
 
-  if (SCM_RTL_PROGRAM_P (proc))
-    return scm_i_rtl_program_name (proc);
+  if (SCM_PROGRAM_P (proc))
+    return scm_i_program_name (proc);
   else if (SCM_STRUCTP (proc) && SCM_STRUCT_APPLICABLE_P (proc))
     return scm_procedure_name (SCM_STRUCT_PROCEDURE (proc));
   else
@@ -295,8 +295,8 @@ SCM_DEFINE (scm_procedure_documentation, "procedure-documentation", 1, 0, 0,
         return SCM_BOOL_F;
     }
 
-  if (SCM_RTL_PROGRAM_P (proc))
-    return scm_i_rtl_program_documentation (proc);
+  if (SCM_PROGRAM_P (proc))
+    return scm_i_program_documentation (proc);
   else
     return SCM_BOOL_F;
 }