* *.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.

1 files changed, 28 insertions, 21 deletions

diff --git a/libguile/simpos.c b/libguile/simpos.c
index acb8a7b2e..66981d708 100644
--- a/libguile/simpos.c
+++ b/libguile/simpos.c
@@ -38,12 +38,18 @@
  * 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.  */
+
+/* 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>
 #include "_scm.h"
 
 #include "scmsigs.h"
+
+#include "scm_validate.h"
 #include "simpos.h"
 
 #ifdef HAVE_STRING_H
@@ -57,11 +63,10 @@
 extern int system();
 
 
-SCM_PROC(s_system, "system", 0, 1, 0, scm_system);
-
-SCM
-scm_system(cmd)
-     SCM cmd;
+GUILE_PROC(scm_system, "system", 0, 1, 0, 
+           (SCM cmd),
+"")
+#define FUNC_NAME s_scm_system
 {
   int rv;
 
@@ -72,9 +77,9 @@ scm_system(cmd)
 #else
       rv = 0;
 #endif
-      return rv ? SCM_BOOL_T : SCM_BOOL_F;
+      return SCM_BOOL(rv);
     }
-  SCM_ASSERT(SCM_NIMP(cmd) && SCM_ROSTRINGP(cmd), cmd, SCM_ARG1, s_system);
+  SCM_VALIDATE_ROSTRING(1,cmd);
 #ifdef HAVE_SYSTEM
   SCM_DEFER_INTS;
   errno = 0;
@@ -82,42 +87,44 @@ scm_system(cmd)
     cmd = scm_makfromstr (SCM_ROCHARS (cmd), SCM_ROLENGTH (cmd), 0);
   rv = system(SCM_ROCHARS(cmd));
   if (rv == -1 || (rv == 127 && errno != 0))
-    scm_syserror (s_system);
+    SCM_SYSERROR;
   SCM_ALLOW_INTS;
   return SCM_MAKINUM (rv);
 #else
-  scm_sysmissing (s_system);
+  SCM_SYSMISSING;
 #endif
 }
+#undef FUNC_NAME
 
 extern char *getenv();
-SCM_PROC (s_getenv, "getenv", 1, 0, 0, scm_getenv);
-
-SCM
-scm_getenv(nam)
-     SCM nam;
+GUILE_PROC (scm_getenv, "getenv", 1, 0, 0, 
+            (SCM nam),
+"")
+#define FUNC_NAME s_scm_getenv
 {
   char *val;
-  SCM_ASSERT(SCM_NIMP(nam) && SCM_ROSTRINGP(nam), nam, SCM_ARG1, s_getenv);
-  if (SCM_ROSTRINGP (nam))
-    nam = scm_makfromstr (SCM_ROCHARS (nam), SCM_ROLENGTH (nam), 0);
+  SCM_VALIDATE_ROSTRING(1,nam);
+  nam = scm_makfromstr (SCM_ROCHARS (nam), SCM_ROLENGTH (nam), 0);
   val = getenv(SCM_CHARS(nam));
   return (val) ? scm_makfromstr(val, (scm_sizet)strlen(val), 0) : SCM_BOOL_F;
 }
+#undef FUNC_NAME
 
 /* simple exit, without unwinding the scheme stack or flushing ports.  */
-SCM_PROC (s_primitive_exit, "primitive-exit", 0, 1, 0, scm_primitive_exit);
-SCM
-scm_primitive_exit (SCM status)
+GUILE_PROC (scm_primitive_exit, "primitive-exit", 0, 1, 0, 
+            (SCM status),
+            "")
+#define FUNC_NAME s_scm_primitive_exit
 {
   int cstatus = 0;
   if (!SCM_UNBNDP (status))
     {
-      SCM_ASSERT (SCM_INUMP (status), status, SCM_ARG1, s_primitive_exit);
+      SCM_VALIDATE_INT(1,status);
       cstatus = SCM_INUM (status);
     }
   exit (cstatus);
 }
+#undef FUNC_NAME
 
 
 void