summaryrefslogtreecommitdiff
path: root/libguile/mallocs.c
diff options
context:
space:
mode:
authorGreg J. Badros <gjb@cs.washington.edu>1999-12-12 02:36:16 +0000
committerGreg J. Badros <gjb@cs.washington.edu>1999-12-12 02:36:16 +0000
commit1bbd0b849f6b90f1ffe57e586e4ee5a884f84a11 (patch)
tree79120a96365e0fa3324174bfd08d731ca8311d64 /libguile/mallocs.c
parent6e7069385db8cf96dfbe51cf65ace161942a32c9 (diff)
downloadguile-1bbd0b849f6b90f1ffe57e586e4ee5a884f84a11.tar.gz
* *.c: Pervasive software-engineering-motivated rewrite of
function headers and argument checking. Switched SCM_PROC, SCM_PROC1 macros to be GUILE_PROC, GUILE_PROC1 (may change names later, but was useful to keep old versions around while migrate) that has docstrings and argument lists embedded in the GUILE_PROC macro invocations that expand into a function header. Use lots of new SCM_VALIDATE_* macros to simplify error checking and reduce tons of redundancy. This is very similar to what I did for Scwm. Note that none of the extraction of the docstrings, nor software engineering checks of Scwm is yet added to Guile. I'll work on that tomorrow, I expect. * Makefile.am: Added scm_validate.h to modinclude_HEADERS. * chars.c: Added docstrings for the primitives defined in here. * snarf.h: Added GUILE_PROC, GUILE_PROC1. Added SCM_REGISTER_PROC to be like old SCM_PROC, though old SCM_PROC still remains for now. Changed naming convention for the s_foo string name of the primitive to be s_scm_foo for ease of use with the macro. * scm_validate.h: Lots of new SCM_VALIDATE macros to simplify argument checking through guile. Maybe some of these should be folded into the header file for the types they check, but for now it was easiest to just stick them all in one place.
Diffstat (limited to 'libguile/mallocs.c')
-rw-r--r--libguile/mallocs.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/libguile/mallocs.c b/libguile/mallocs.c
index a832bdb1c..ebc294d36 100644
--- a/libguile/mallocs.c
+++ b/libguile/mallocs.c
@@ -1,6 +1,5 @@
-/* classes: src_files */
-
-/* Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
+/* classes: src_files
+ * Copyright (C) 1995, 1997, 1998 Free Software Foundation, Inc.
*
* 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
@@ -17,6 +16,10 @@
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
* Boston, MA 02111-1307 USA */
+/* Software engineering face-lift by Greg J. Badros, 11-Dec-1999,
+ gjb@cs.washington.edu, http://www.cs.washington.edu/homes/gjb */
+
+
#include <stdio.h>
@@ -38,11 +41,8 @@
-static scm_sizet fmalloc SCM_P ((SCM ptr));
-
static scm_sizet
-fmalloc(ptr)
- SCM ptr;
+fmalloc(SCM ptr)
{
if (SCM_MALLOCDATA (ptr))
free (SCM_MALLOCDATA (ptr));
@@ -50,13 +50,8 @@ fmalloc(ptr)
}
-static int prinmalloc SCM_P ((SCM exp, SCM port, scm_print_state *pstate));
-
static int
-prinmalloc (exp, port, pstate)
- SCM exp;
- SCM port;
- scm_print_state *pstate;
+prinmalloc (SCM exp,SCM port,scm_print_state *pstate)
{
scm_puts("#<malloc ", port);
scm_intprint(SCM_CDR(exp), 16, port);