mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-06-24 12:20:20 +02:00
* *.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.
This commit is contained in:
parent
6e7069385d
commit
1bbd0b849f
78 changed files with 5264 additions and 6035 deletions
|
@ -38,6 +38,10 @@
|
|||
* 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 the headers for just about everything.
|
||||
We call all their initialization functions. */
|
||||
|
@ -136,12 +140,21 @@
|
|||
|
||||
/* Setting up the stack. */
|
||||
|
||||
static void start_stack SCM_P ((void *base));
|
||||
static void restart_stack SCM_P ((void * base));
|
||||
static void
|
||||
restart_stack (void *base)
|
||||
{
|
||||
scm_dynwinds = SCM_EOL;
|
||||
SCM_DYNENV (scm_rootcont) = SCM_EOL;
|
||||
SCM_THROW_VALUE (scm_rootcont) = SCM_EOL;
|
||||
#ifdef DEBUG_EXTENSIONS
|
||||
SCM_DFRAME (scm_rootcont) = scm_last_debug_frame = 0;
|
||||
#endif
|
||||
SCM_BASE (scm_rootcont) = base;
|
||||
scm_continuation_stack_ptr = SCM_MAKINUM (0);
|
||||
}
|
||||
|
||||
static void
|
||||
start_stack (base)
|
||||
void * base;
|
||||
start_stack (void *base)
|
||||
{
|
||||
SCM root;
|
||||
|
||||
|
@ -178,31 +191,12 @@ start_stack (base)
|
|||
}
|
||||
|
||||
|
||||
static void
|
||||
restart_stack (base)
|
||||
void * base;
|
||||
{
|
||||
scm_dynwinds = SCM_EOL;
|
||||
SCM_DYNENV (scm_rootcont) = SCM_EOL;
|
||||
SCM_THROW_VALUE (scm_rootcont) = SCM_EOL;
|
||||
#ifdef DEBUG_EXTENSIONS
|
||||
SCM_DFRAME (scm_rootcont) = scm_last_debug_frame = 0;
|
||||
#endif
|
||||
SCM_BASE (scm_rootcont) = base;
|
||||
scm_continuation_stack_ptr = SCM_MAKINUM (0);
|
||||
}
|
||||
|
||||
#if 0
|
||||
static char remsg[] = "remove\n#define ", addmsg[] = "add\n#define ";
|
||||
|
||||
|
||||
static void fixconfig SCM_P ((char *s1, char *s2, int s));
|
||||
|
||||
static void
|
||||
fixconfig (s1, s2, s)
|
||||
char *s1;
|
||||
char *s2;
|
||||
int s;
|
||||
fixconfig (char *s1,char *s2,int s)
|
||||
{
|
||||
fputs (s1, stderr);
|
||||
fputs (s2, stderr);
|
||||
|
@ -213,10 +207,8 @@ fixconfig (s1, s2, s)
|
|||
}
|
||||
|
||||
|
||||
static void check_config SCM_P ((void));
|
||||
|
||||
static void
|
||||
check_config ()
|
||||
check_config (void)
|
||||
{
|
||||
scm_sizet j;
|
||||
|
||||
|
@ -344,16 +336,15 @@ typedef long setjmp_type;
|
|||
struct main_func_closure
|
||||
{
|
||||
/* the function to call */
|
||||
void (*main_func) SCM_P ((void *closure, int argc, char **argv));
|
||||
void (*main_func)(void *closure, int argc, char **argv);
|
||||
void *closure; /* dummy data to pass it */
|
||||
int argc;
|
||||
char **argv; /* the argument list it should receive */
|
||||
};
|
||||
|
||||
|
||||
static void scm_boot_guile_1 SCM_P ((SCM_STACKITEM *base,
|
||||
struct main_func_closure *closure));
|
||||
static SCM invoke_main_func SCM_P ((void *body_data));
|
||||
static void scm_boot_guile_1(SCM_STACKITEM *base, struct main_func_closure *closure);
|
||||
static SCM invoke_main_func(void *body_data);
|
||||
|
||||
|
||||
/* Fire up the Guile Scheme interpreter.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue