X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/1cc91f1b2937a230a2dc80dd25cc6003b7b8f2b5..ab256d39098ffb1ac986290bde36c9713d0f262e:/libguile/procprop.c diff --git a/libguile/procprop.c b/libguile/procprop.c index 8b9ef9b3d..d436f7f31 100644 --- a/libguile/procprop.c +++ b/libguile/procprop.c @@ -12,7 +12,8 @@ * * You should have received a copy of the GNU General Public License * along with this software; see the file COPYING. If not, write to - * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA * * As a special exception, the Free Software Foundation gives permission * for additional uses of the text contained in its release of GUILE. @@ -36,8 +37,7 @@ * * If you write modifications of your own for GUILE, it is your choice * whether to permit this exception to apply to your modifications. - * If you do not wish that, delete this exception notice. - */ + * If you do not wish that, delete this exception notice. */ #include @@ -72,7 +72,8 @@ SCM scm_procedure_properties (proc) SCM proc; { - SCM_ASSERT (scm_procedure_p (proc), proc, SCM_ARG1, s_procedure_properties); + SCM_ASSERT (SCM_NFALSEP (scm_procedure_p (proc)), + proc, SCM_ARG1, s_procedure_properties); if (!(SCM_NIMP (proc) && SCM_CLOSUREP (proc))) proc = scm_stand_in_scm_proc(proc); return SCM_PROCPROPS (proc); @@ -88,7 +89,7 @@ scm_set_procedure_properties_x (proc, new_val) if (!(SCM_NIMP (proc) && SCM_CLOSUREP (proc))) proc = scm_stand_in_scm_proc(proc); SCM_ASSERT (SCM_NIMP (proc) && SCM_CLOSUREP (proc), proc, SCM_ARG1, s_set_procedure_properties_x); - SCM_PROCPROPS (proc) = new_val; + SCM_SETPROCPROPS (proc, new_val); return SCM_UNSPECIFIED; } @@ -102,7 +103,8 @@ scm_procedure_property (p, k) SCM assoc; if (!(SCM_NIMP (p) && SCM_CLOSUREP (p))) p = scm_stand_in_scm_proc(p); - SCM_ASSERT (scm_procedure_p (p), p, SCM_ARG1, s_procedure_property); + SCM_ASSERT (SCM_NFALSEP (scm_procedure_p (p)), + p, SCM_ARG1, s_procedure_property); assoc = scm_sloppy_assq (k, SCM_PROCPROPS (p)); return (SCM_NIMP (assoc) ? SCM_CDR (assoc) : SCM_BOOL_F); } @@ -123,7 +125,7 @@ scm_set_procedure_property_x (p, k, v) if (SCM_NIMP (assoc)) SCM_SETCDR (assoc, v); else - SCM_PROCPROPS (p) = scm_acons (k, v, SCM_PROCPROPS (p)); + SCM_SETPROCPROPS (p, scm_acons (k, v, SCM_PROCPROPS (p))); return SCM_UNSPECIFIED; }