diff options
author | Andy Wingo <wingo@pobox.com> | 2011-06-02 19:13:32 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2011-06-02 19:13:32 +0200 |
commit | 6fc3eae4772bc2c5dc3e2b377ca481eef9aa52f5 (patch) | |
tree | 898c7e79ed0e5045692e619eda2a6e6a840462b0 /libguile/expand.h | |
parent | a881a4ae3bc1f2cc00ac7274e286271b6f55287c (diff) | |
download | guile-6fc3eae4772bc2c5dc3e2b377ca481eef9aa52f5.tar.gz |
sequence of expressions -> seq of head and tail
* libguile/expand.h:
* module/language/tree-il.scm: Rename "sequence" to "seq", and instead
of taking a list of expressions, take a head and a tail.
* module/language/tree-il/analyze.scm:
* module/language/tree-il/compile-glil.scm:
* module/language/tree-il/fix-letrec.scm:
* module/language/tree-il/spec.scm:
* module/language/elisp/compile-tree-il.scm:
* module/ice-9/psyntax.scm:
* module/ice-9/psyntax-pp.scm:
* module/ice-9/eval.scm:
* libguile/memoize.h:
* libguile/memoize.c:
* libguile/expand.c:
* libguile/eval.c: Adapt to the new seq format.
Diffstat (limited to 'libguile/expand.h')
-rw-r--r-- | libguile/expand.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libguile/expand.h b/libguile/expand.h index b4e6a2132..f5e7af5d4 100644 --- a/libguile/expand.h +++ b/libguile/expand.h @@ -49,7 +49,7 @@ typedef enum SCM_EXPANDED_CONDITIONAL, SCM_EXPANDED_CALL, SCM_EXPANDED_PRIMCALL, - SCM_EXPANDED_SEQUENCE, + SCM_EXPANDED_SEQ, SCM_EXPANDED_LAMBDA, SCM_EXPANDED_LAMBDA_CASE, SCM_EXPANDED_LET, @@ -255,17 +255,18 @@ enum #define SCM_MAKE_EXPANDED_PRIMCALL(src, name, args) \ scm_c_make_struct (exp_vtables[SCM_EXPANDED_PRIMCALL], 0, SCM_NUM_EXPANDED_PRIMCALL_FIELDS, SCM_UNPACK (src), SCM_UNPACK (name), SCM_UNPACK (args)) -#define SCM_EXPANDED_SEQUENCE_TYPE_NAME "sequence" -#define SCM_EXPANDED_SEQUENCE_FIELD_NAMES \ - { "src", "exps", } +#define SCM_EXPANDED_SEQ_TYPE_NAME "seq" +#define SCM_EXPANDED_SEQ_FIELD_NAMES \ + { "src", "head", "tail", } enum { - SCM_EXPANDED_SEQUENCE_SRC, - SCM_EXPANDED_SEQUENCE_EXPS, - SCM_NUM_EXPANDED_SEQUENCE_FIELDS, + SCM_EXPANDED_SEQ_SRC, + SCM_EXPANDED_SEQ_HEAD, + SCM_EXPANDED_SEQ_TAIL, + SCM_NUM_EXPANDED_SEQ_FIELDS, }; -#define SCM_MAKE_EXPANDED_SEQUENCE(src, exps) \ - scm_c_make_struct (exp_vtables[SCM_EXPANDED_SEQUENCE], 0, SCM_NUM_EXPANDED_SEQUENCE_FIELDS, SCM_UNPACK (src), SCM_UNPACK (exps)) +#define SCM_MAKE_EXPANDED_SEQ(src, head, tail) \ + scm_c_make_struct (exp_vtables[SCM_EXPANDED_SEQ], 0, SCM_NUM_EXPANDED_SEQ_FIELDS, SCM_UNPACK (src), SCM_UNPACK (head), SCM_UNPACK (tail)) #define SCM_EXPANDED_LAMBDA_TYPE_NAME "lambda" #define SCM_EXPANDED_LAMBDA_FIELD_NAMES \ |