diff options
author | Greg J. Badros <gjb@cs.washington.edu> | 2000-03-09 18:58:58 +0000 |
---|---|---|
committer | Greg J. Badros <gjb@cs.washington.edu> | 2000-03-09 18:58:58 +0000 |
commit | c209c88e54d08a557a297836200e16e20355df02 (patch) | |
tree | dce0d672bc0a63be5f658c65269c9a4144da1c67 /libguile/options.c | |
parent | df8bb2dc3988d24c0f64bd2cc5fa01a31825d11a (diff) | |
download | guile-c209c88e54d08a557a297836200e16e20355df02.tar.gz |
*.[ch]: make a distinction between SCM as a generic
name for a Scheme object (now a void*), and SCM as 32 bit word for
storing tags and immediates (now a long int). Introduced
SCM_ASWORD and SCM_ASSCM for conversion. Fixed various dubious
code in the process: arbiter.c (use macros), unif.c (scm_array_p),
Diffstat (limited to 'libguile/options.c')
-rw-r--r-- | libguile/options.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libguile/options.c b/libguile/options.c index 750bd9526..ed6ab3c9c 100644 --- a/libguile/options.c +++ b/libguile/options.c @@ -186,7 +186,7 @@ scm_options (SCM arg, scm_option options[], int n, const char *s) goto cont; case SCM_OPTION_SCM: new_mode = SCM_CDR (new_mode); - flags[i] = SCM_CAR (new_mode); + flags[i] = SCM_CARW (new_mode); goto cont; } #ifndef SCM_RECKLESS @@ -198,6 +198,7 @@ scm_options (SCM arg, scm_option options[], int n, const char *s) } for (i = 0; i < n; ++i) { + // scm_option doesn't know if its a long or an SCM if (options[i].type == SCM_OPTION_SCM) SCM_SETCDR (protected_objects, scm_cons (flags[i], |