X-Git-Url: http://git.hcoop.net/bpt/guile.git/blobdiff_plain/0f2d19dd46f83f41177f61d585732b32a866d613..ab256d39098ffb1ac986290bde36c9713d0f262e:/libguile/procprop.c

diff --git a/libguile/procprop.c b/libguile/procprop.c
index a984008db..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,13 +37,15 @@
  *
  * 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 <stdio.h>
 #include "_scm.h"
+#include "alist.h"
+#include "eval.h"
 
+#include "procprop.h"
 
 
 static SCM
@@ -64,69 +67,55 @@ scm_stand_in_scm_proc(proc)
 }
 
 SCM_PROC(s_procedure_properties, "procedure-properties", 1, 0, 0, scm_procedure_properties);
-#ifdef __STDC__
-SCM
-scm_procedure_properties (SCM proc)
-#else
+
 SCM
 scm_procedure_properties (proc)
      SCM proc;
-#endif
 {
-  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);
 }
 
 SCM_PROC(s_set_procedure_properties_x, "set-procedure-properties!", 2, 0, 0, scm_set_procedure_properties_x);
-#ifdef __STDC__
-SCM
-scm_set_procedure_properties_x (SCM proc, SCM new_val)
-#else
+
 SCM
 scm_set_procedure_properties_x (proc, new_val)
      SCM proc;
      SCM new_val;
-#endif
 {
   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;
 }
 
 SCM_PROC(s_procedure_property, "procedure-property", 2, 0, 0, scm_procedure_property);
-#ifdef __STDC__
-SCM
-scm_procedure_property (SCM p, SCM k)
-#else
+
 SCM
 scm_procedure_property (p, k)
      SCM p;
      SCM k;
-#endif
 {
   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);
 }
 
 SCM_PROC(s_set_procedure_property_x, "set-procedure-property!", 3, 0, 0, scm_set_procedure_property_x);
-#ifdef __STDC__
-SCM
-scm_set_procedure_property_x (SCM p, SCM k, SCM v)
-#else
+
 SCM
 scm_set_procedure_property_x (p, k, v)
      SCM p;
      SCM k;
      SCM v;
-#endif
 {
   SCM assoc;
   if (!(SCM_NIMP (p) && SCM_CLOSUREP (p)))
@@ -136,19 +125,15 @@ 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;
 }
 
 
 
-#ifdef __STDC__
-void
-scm_init_procprop (void)
-#else
+
 void
 scm_init_procprop ()
-#endif
 {
 #include "procprop.x"
 }