diff options
author | Marius Vollmer <mvo@zagadka.de> | 2001-07-26 21:40:18 +0000 |
---|---|---|
committer | Marius Vollmer <mvo@zagadka.de> | 2001-07-26 21:40:18 +0000 |
commit | 904a077df1a670d386ca114ddb7a8e371684f655 (patch) | |
tree | 62ba0cc7b9226c16c662cf884cb2b6c440529df4 /libguile/eval.h | |
parent | 5b54c4daa124b0d9f9b984f0bf1733ac5ebba4d3 (diff) | |
download | guile-904a077df1a670d386ca114ddb7a8e371684f655.tar.gz |
* tags.h: Update tag system docs.
(scm_tc3_cons_gloc): Renamed to scm_tc3_struct. Changed all uses.
(scm_tcs_cons_gloc): Renamed to scm_tcs_struct. Changed all uses.
(SCM_ECONSP, SCM_NECONSP): Removed. Changed all uses to SCM_CONSP
or SCM_NCONSP, respectively.
* struct.c, struct.h, srcprop.c, procs.c, procprop.c, print.c,
objects.c. modules.c, goops.c, eval.c, debug.c: Changed all uses
of scm_tc3_cond_gloc and scm_tcs_cons_gloc. See above.
* print.c (scm_iprin1): Remove printing of glocs. Do not try to
tell glocs from structs.
* gc.c (scm_gc_mark, scm_gc_sweep): Remove handling of glocs.
* eval.c (scm_m_atbind): Make a list of variables, not glocs.
(scm_ceval, scm_deval): For SCM_IM_BIND, fiddle with variables
instead of with glocs.
(EVALCAR): Do not test for glocs.
(scm_lookupcar, scm_lookupcar1): Do not handle glocs in race
condition.
(scm_unmemocar): Do not handle glocs.
(scm_m_atfop): Memoize as a variable, not as a gloc.
(scm_eval_args, scm_deval_args): Do not handle glocs.
(scm_ceval, scm_deval): Likewise.
* eval.h (SCM_XEVALCAR): Do not test for glocs.
(SCM_GLOC_VAR, SCM_GLOC_VAL, SCM_GLOC_SET_VAL, SCM_GLOC_VAL_LOC):
Removed.
* debug.h, debug.c (scm_make_gloc, scm_gloc_p): Removed.
* dynwind.c (scm_swap_bindings): Likewise.
(scm_dowinds): Updated to recognize lists of variables instead of
lists of glocs.
* __scm.h (SCM_CAUTIOS, SCM_RECKLESS): Update comments.
Diffstat (limited to 'libguile/eval.h')
-rw-r--r-- | libguile/eval.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/libguile/eval.h b/libguile/eval.h index 418844c0a..18e245483 100644 --- a/libguile/eval.h +++ b/libguile/eval.h @@ -115,9 +115,7 @@ extern SCM scm_eval_options_interface (SCM setting); ? SCM_EVALIM2(x) \ : (*scm_ceval_ptr) ((x), (env))) #define SCM_XEVALCAR(x, env) (SCM_NCELLP (SCM_CAR (x)) \ - ? (SCM_IMP (SCM_CAR (x)) \ - ? SCM_EVALIM (SCM_CAR (x), env) \ - : SCM_GLOC_VAL (SCM_CAR (x))) \ + ? SCM_EVALIM (SCM_CAR (x), env) \ : (SCM_SYMBOLP (SCM_CAR (x)) \ ? *scm_lookupcar (x, env, 1) \ : (*scm_ceval_ptr) (SCM_CAR (x), env))) @@ -182,16 +180,6 @@ extern SCM scm_sym_args; extern SCM scm_f_apply; -/* A resolved global variable reference in the CAR position - * of a list is stored (in code only) as a pointer to a variable with a - * tag of 1. This is called a "gloc". - */ - -#define SCM_GLOC_VAR(x) (SCM_PACK(SCM_UNPACK(x)-scm_tc3_cons_gloc)) -#define SCM_GLOC_VAL(x) (SCM_VARIABLE_REF (SCM_GLOC_VAR (x))) -#define SCM_GLOC_SET_VAL(x, y) (SCM_VARIABLE_SET (SCM_GLOC_VAR (x), y)) -#define SCM_GLOC_VAL_LOC(x) (SCM_VARIABLE_LOC (SCM_GLOC_VAR (x))) - extern SCM * scm_ilookup (SCM iloc, SCM env); |