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.c | |
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.c')
-rw-r--r-- | libguile/expand.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/libguile/expand.c b/libguile/expand.c index af6eb7d12..78dd4cac4 100644 --- a/libguile/expand.c +++ b/libguile/expand.c @@ -73,8 +73,8 @@ static const char** exp_field_names[SCM_NUM_EXPANDED_TYPES]; SCM_MAKE_EXPANDED_CONDITIONAL(src, test, consequent, alternate) #define CALL(src, proc, exps) \ SCM_MAKE_EXPANDED_CALL(src, proc, exps) -#define SEQUENCE(src, exps) \ - SCM_MAKE_EXPANDED_SEQUENCE(src, exps) +#define SEQ(src, head, tail) \ + SCM_MAKE_EXPANDED_SEQ(src, head, tail) #define LAMBDA(src, meta, body) \ SCM_MAKE_EXPANDED_LAMBDA(src, meta, body) #define LAMBDA_CASE(src, req, opt, rest, kw, inits, gensyms, body, alternate) \ @@ -396,7 +396,9 @@ expand_sequence (const SCM forms, const SCM env) if (scm_is_null (CDR (forms))) return expand (CAR (forms), env); else - return SEQUENCE (SCM_BOOL_F, expand_exprs (forms, env)); + return SEQ (scm_source_properties (forms), + expand (CAR (forms), env), + expand_sequence (CDR (forms), env)); } @@ -1245,7 +1247,7 @@ scm_init_expand () DEFINE_NAMES (CONDITIONAL); DEFINE_NAMES (CALL); DEFINE_NAMES (PRIMCALL); - DEFINE_NAMES (SEQUENCE); + DEFINE_NAMES (SEQ); DEFINE_NAMES (LAMBDA); DEFINE_NAMES (LAMBDA_CASE); DEFINE_NAMES (LET); |