diff options
author | Greg J. Badros <gjb@cs.washington.edu> | 1999-12-12 02:36:16 +0000 |
---|---|---|
committer | Greg J. Badros <gjb@cs.washington.edu> | 1999-12-12 02:36:16 +0000 |
commit | 1bbd0b849f6b90f1ffe57e586e4ee5a884f84a11 (patch) | |
tree | 79120a96365e0fa3324174bfd08d731ca8311d64 /libguile/root.c | |
parent | 6e7069385db8cf96dfbe51cf65ace161942a32c9 (diff) | |
download | guile-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/root.c')
-rw-r--r-- | libguile/root.c | 49 |
1 files changed, 19 insertions, 30 deletions
diff --git a/libguile/root.c b/libguile/root.c index b0b0c7cd7..5d2dd8d43 100644 --- a/libguile/root.c +++ b/libguile/root.c @@ -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 <stdio.h> @@ -70,11 +74,8 @@ struct scm_root_state *scm_root; -static SCM mark_root SCM_P ((SCM)); - static SCM -mark_root (root) - SCM root; +mark_root (SCM root) { scm_root_state *s = SCM_ROOT_STATE (root); @@ -98,13 +99,8 @@ mark_root (root) } -static int print_root SCM_P ((SCM exp, SCM port, scm_print_state *pstate)); - static int -print_root (exp, port, pstate) - SCM exp; - SCM port; - scm_print_state *pstate; +print_root (SCM exp,SCM port,scm_print_state *pstate) { scm_puts ("#<root ", port); scm_intprint(SCM_SEQ (SCM_ROOT_STATE (exp) -> rootcont), 16, port); @@ -116,8 +112,7 @@ print_root (exp, port, pstate) SCM -scm_make_root (parent) - SCM parent; +scm_make_root (SCM parent) { SCM root; scm_root_state *root_state; @@ -340,30 +335,27 @@ cwdr (SCM proc, SCM a1, SCM args, SCM handler, SCM_STACKITEM *stack_start) stack_start); } -SCM_PROC(s_call_with_dynamic_root, "call-with-dynamic-root", 2, 0, 0, scm_call_with_dynamic_root); -SCM -scm_call_with_dynamic_root (thunk, handler) - SCM thunk; - SCM handler; +GUILE_PROC(scm_call_with_dynamic_root, "call-with-dynamic-root", 2, 0, 0, + (SCM thunk, SCM handler), +"") +#define FUNC_NAME s_scm_call_with_dynamic_root { SCM_STACKITEM stack_place; - return cwdr (thunk, SCM_EOL, SCM_EOL, handler, &stack_place); } +#undef FUNC_NAME -SCM_PROC(s_dynamic_root, "dynamic-root", 0, 0, 0, scm_dynamic_root); -SCM -scm_dynamic_root () +GUILE_PROC(scm_dynamic_root, "dynamic-root", 0, 0, 0, + (), +"") +#define FUNC_NAME s_scm_dynamic_root { return scm_ulong2num (SCM_SEQ (scm_root->rootcont)); } +#undef FUNC_NAME SCM -scm_apply_with_dynamic_root (proc, a1, args, handler) - SCM proc; - SCM a1; - SCM args; - SCM handler; +scm_apply_with_dynamic_root (SCM proc, SCM a1, SCM args, SCM handler) { SCM_STACKITEM stack_place; return cwdr (proc, a1, args, handler, &stack_place); @@ -386,10 +378,7 @@ typedef long setjmp_type; SCM -scm_call_catching_errors (thunk, err_filter, closure) - SCM (*thunk)(); - SCM (*err_filter)(); - void *closure; +scm_call_catching_errors (SCM (*thunk)(), SCM (*err_filter)(), void *closure) { SCM answer; setjmp_type i; |