1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-17 01:00:20 +02:00

* debug.c (scm_procedure_source): Handle all objects for which

procedure? is #t.  (Thanks to Bill Schottstaedt.)
This commit is contained in:
Mikael Djurfeldt 2003-02-05 19:04:40 +00:00
parent f9ac1c2df8
commit b3d7f6dfea
2 changed files with 27 additions and 3 deletions

View file

@ -1,3 +1,8 @@
2003-02-05 Mikael Djurfeldt <djurfeldt@nada.kth.se>
* debug.c (scm_procedure_source): Handle all objects for which
procedure? is #t. (Thanks to Bill Schottstaedt.)
2003-01-23 Mikael Djurfeldt <djurfeldt@nada.kth.se> 2003-01-23 Mikael Djurfeldt <djurfeldt@nada.kth.se>
* futures.c (mark_futures): Don't need to mark data of recycled * futures.c (mark_futures): Don't need to mark data of recycled

View file

@ -1,5 +1,5 @@
/* Debugging extensions for Guile /* Debugging extensions for Guile
* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002 Free Software Foundation * Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003 Free Software Foundation
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -64,6 +64,7 @@
#include "libguile/ports.h" #include "libguile/ports.h"
#include "libguile/root.h" #include "libguile/root.h"
#include "libguile/fluids.h" #include "libguile/fluids.h"
#include "libguile/objects.h"
#include "libguile/validate.h" #include "libguile/validate.h"
#include "libguile/debug.h" #include "libguile/debug.h"
@ -374,6 +375,7 @@ SCM_DEFINE (scm_procedure_source, "procedure-source", 1, 0, 0,
#define FUNC_NAME s_scm_procedure_source #define FUNC_NAME s_scm_procedure_source
{ {
SCM_VALIDATE_NIM (1, proc); SCM_VALIDATE_NIM (1, proc);
again:
switch (SCM_TYP7 (proc)) { switch (SCM_TYP7 (proc)) {
case scm_tcs_closures: case scm_tcs_closures:
{ {
@ -387,17 +389,34 @@ SCM_DEFINE (scm_procedure_source, "procedure-source", 1, 0, 0,
SCM_EOL, SCM_EOL,
SCM_ENV (proc)))); SCM_ENV (proc))));
} }
case scm_tcs_struct:
if (!SCM_I_OPERATORP (proc))
break;
goto procprop;
case scm_tc7_smob:
if (!SCM_SMOB_DESCRIPTOR (proc).apply)
break;
case scm_tcs_subrs: case scm_tcs_subrs:
#ifdef CCLO #ifdef CCLO
case scm_tc7_cclo: case scm_tc7_cclo:
#endif #endif
procprop:
/* It would indeed be a nice thing if we supplied source even for /* It would indeed be a nice thing if we supplied source even for
built in procedures! */ built in procedures! */
return scm_procedure_property (proc, scm_sym_source); return scm_procedure_property (proc, scm_sym_source);
case scm_tc7_pws:
{
SCM src = scm_procedure_property (proc, scm_sym_source);
if (!SCM_FALSEP (src))
return src;
proc = SCM_PROCEDURE (proc);
goto again;
}
default: default:
SCM_WRONG_TYPE_ARG (1, proc); ;
/* not reached */
} }
SCM_WRONG_TYPE_ARG (1, proc);
return SCM_BOOL_F; /* not reached */
} }
#undef FUNC_NAME #undef FUNC_NAME