diff options
author | Andy Wingo <wingo@pobox.com> | 2009-04-29 00:38:12 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-04-29 00:38:12 +0200 |
commit | 5a0132b3375b35c69c6afb735acbaa8619237fb5 (patch) | |
tree | 9f8d97b79b22d5bcdec328b94ec6615e33df8ac7 /libguile/macros.h | |
parent | 5f1a2fb10f5eb97e302c50f5b62d6df28f73d97a (diff) | |
download | guile-5a0132b3375b35c69c6afb735acbaa8619237fb5.tar.gz |
a different tack for syncase macro representation
* libguile/macros.c (macro_print): Show syntax-case bindings, if present.
(macro_mark): Mark the extra two words if they're there.
(scm_make_syncase_macro, scm_make_extended_syncase_macro): OK! A new
take at the "how do we represent syncase macros in Guile" problem.
Whereas we need a disjoint type, but would like it to be compatible
with old predicates (e.g. `macro?'), and need to be able to extend
existing syntax definitions (e.g. `cond'), let's add a bit to macros to
indicate whether they have syncase macro bindings or not, and a fourth
macro type for native syncase macros.
(scm_macro_type): Return 'syntax-case for native syntax-case macros.
Note that other macro types may have syntax-case bindings.
(scm_macro_name): Return #f if the transformer is not a procedure.
(scm_syncase_macro_type, scm_syncase_macro_binding): New accessors for
the syncase macro bindings.
* libguile/macros.h: Add API for syncase macros.
* module/ice-9/boot-9.scm (module-define-keyword!): Adapt to use syncase
macros, though they are not yet used. Reorder other syncase API.
* module/ice-9/psyntax.scm (chi-expr): Fix syntax-violation invocation.
Diffstat (limited to 'libguile/macros.h')
-rw-r--r-- | libguile/macros.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/libguile/macros.h b/libguile/macros.h index e1de77ff9..5e3d64a55 100644 --- a/libguile/macros.h +++ b/libguile/macros.h @@ -29,9 +29,15 @@ #define SCM_ASSYNT(_cond, _msg, _subr) \ if (!(_cond)) scm_misc_error (_subr, _msg, SCM_EOL); +#define SCM_MACRO_TYPE_BITS (3) +#define SCM_MACRO_TYPE_MASK ((1<<SCM_MACRO_TYPE_BITS)-1) +#define SCM_F_MACRO_EXTENDED (1<<SCM_MACRO_TYPE_BITS) + #define SCM_MACROP(x) SCM_SMOB_PREDICATE (scm_tc16_macro, (x)) -#define SCM_MACRO_TYPE(m) SCM_SMOB_FLAGS (m) +#define SCM_MACRO_TYPE(m) (SCM_SMOB_FLAGS (m) & SCM_MACRO_TYPE_MASK) +#define SCM_MACRO_IS_EXTENDED(m) (SCM_SMOB_FLAGS (m) & SCM_F_MACRO_EXTENDED) #define SCM_BUILTIN_MACRO_P(x) (SCM_MACROP (x) && SCM_MACRO_TYPE (x) == 3) +#define SCM_SYNCASE_MACRO_P(x) (SCM_MACROP (x) && SCM_MACRO_TYPE (x) == 4) #define SCM_MACRO_CODE(m) SCM_SMOB_OBJECT (m) SCM_API scm_t_bits scm_tc16_macro; @@ -39,10 +45,15 @@ SCM_API scm_t_bits scm_tc16_macro; SCM_INTERNAL SCM scm_i_makbimacro (SCM code); SCM_API SCM scm_makmmacro (SCM code); SCM_API SCM scm_makacro (SCM code); +SCM_API SCM scm_make_syncase_macro (SCM type, SCM binding); +SCM_API SCM scm_make_extended_syncase_macro (SCM builtin, SCM type, + SCM binding); SCM_API SCM scm_macro_p (SCM obj); SCM_API SCM scm_macro_type (SCM m); SCM_API SCM scm_macro_name (SCM m); SCM_API SCM scm_macro_transformer (SCM m); +SCM_API SCM scm_syncase_macro_type (SCM m); +SCM_API SCM scm_syncase_macro_binding (SCM m); SCM_API SCM scm_make_synt (const char *name, SCM (*macroizer) (SCM), SCM (*fcn) ()); |