diff options
author | Andy Wingo <wingo@pobox.com> | 2010-01-05 15:20:47 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2010-01-05 15:33:46 +0100 |
commit | e809758a7e0f3f63162a0a9064b95bd1c1d10628 (patch) | |
tree | 4090a48ef3c228e2609b2bee7a6946172d4a91a1 /libguile/memoize.c | |
parent | bab980466108c6c22d2c820213d07b3d1b18c48e (diff) | |
download | guile-e809758a7e0f3f63162a0a9064b95bd1c1d10628.tar.gz |
clean up macros.[ch]
There are some incompatible changes here, but only to interfaces that
were introduced earlier in 1.9, or interfaces which have been broken
since early in 1.9.
* libguile/_scm.h (SCM_OBJCODE_MINOR_VERSION): Bump, as the macro
changes affect the interface that is called by psyntax-generated macro
definitions.
* libguile/inline.h (scm_words): New function, allocates a variable
number of contiguous scm_t_bits locations, with a given value in the
0th word, and 0 in the rest of the words.
* libguile/macros.h: Rework interface to correspond more closely, and
minimally, to the needs of memoize.c and psyntax.
(SCM_ASSYNT, SCM_MACRO_TYPE_BITS, SCM_MACRO_TYPE_MASK)
(SCM_F_MACRO_EXTENDED, SCM_MACROP, SCM_MACRO_TYPE)
(SCM_MACRO_IS_EXTENDED, SCM_BUILTIN_MACRO_P, SCM_SYNCASE_MACRO_P)
(SCM_MACRO_CODE, scm_tc16_macro): Remove CPP macros related to the
representation of Scheme macros.
(scm_i_make_primitive_macro): Renamed from scm_i_makbimacro.
(scm_i_macro_primitive): New accessor so that memoize.c can get to the
primitive syntax transformer.
(scm_make_syncase_macro, scm_make_extended_syncase_macro)
(scm_syncase_macro_type, scm_syncase_macro_binding): Removed these
functions, replaced by make-syntax-transformer and its accessors.
(scm_macro_binding): New accessor, the same as what
scm_syncase_macro_binding was.
* libguile/macros.c: All representation details of syntax transformers
are private to this file now.
(macro_print): Print macros as #<syntax-transformer ...>, or
#<primitive-syntax-transformer ...> if psyntax has not attached a
transformer of its own.
(scm_i_make_primitive_macro): Represent macros as 5-word smobs.
(scm_make_syntax_transformer): New constructor for syntax transformers
(macros), exported to scheme. Takes a name, and looks it up in the
current module to determine the previous primitive transformer, if
any.
(scm_macro_type): Instead of returning 'builtin-macro!, etc, return
the type as set by psyntax, or #f if it's a primitive.
(scm_macro_name): Return the stored macro name.
(scm_macro_transformer): Return the psyntax-set syntax transformer.
Hacky, but should help introspection somewhat.
* libguile/memoize.c (memoize_env_ref_transformer): Use the new
scm_i_macro_primitive, and adapt to other macro API changes.
* module/ice-9/psyntax.scm (put-global-definition-hook)
(get-global-definition-hook, chi-install-global): Call (and generate
calls to) the new macro constructors and accessors.
* module/ice-9/psyntax-pp.scm: Doubly regenerated.
* module/ice-9/debugging/traps.scm (trap-here): Comment out this
definition and export, while it's not working.
Diffstat (limited to 'libguile/memoize.c')
-rw-r--r-- | libguile/memoize.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/libguile/memoize.c b/libguile/memoize.c index feb145aaf..73609419f 100644 --- a/libguile/memoize.c +++ b/libguile/memoize.c @@ -275,9 +275,7 @@ static SCM scm_m_set_x (SCM xorig, SCM env); -typedef SCM (*t_syntax_transformer) (SCM, SCM); - -static t_syntax_transformer +static scm_t_macro_primitive memoize_env_ref_transformer (SCM env, SCM x) { SCM var; @@ -287,15 +285,8 @@ memoize_env_ref_transformer (SCM env, SCM x) var = scm_module_variable (env, x); if (scm_is_true (var) && scm_is_true (scm_variable_bound_p (var)) - && SCM_MACROP (scm_variable_ref (var))) - { - SCM mac = scm_variable_ref (var); - if (SCM_IMP (SCM_MACRO_CODE (mac)) - || (SCM_TYP7 (SCM_MACRO_CODE (mac)) != scm_tc7_gsubr)) - syntax_error ("bad macro", x, SCM_UNDEFINED); - else - return (t_syntax_transformer)SCM_SUBRF (SCM_MACRO_CODE (mac)); /* global macro */ - } + && scm_is_true (scm_macro_p (scm_variable_ref (var)))) + return scm_i_macro_primitive (scm_variable_ref (var)); else return NULL; /* anything else */ } @@ -331,7 +322,7 @@ memoize (SCM exp, SCM env) if (scm_is_pair (exp)) { SCM CAR; - t_syntax_transformer trans; + scm_t_macro_primitive trans; CAR = CAR (exp); if (scm_is_symbol (CAR)) @@ -392,11 +383,8 @@ memoize_sequence (const SCM forms, const SCM env) #define SCM_SYNTAX(RANAME, STR, CFN) \ SCM_SNARF_HERE(static const char RANAME[]=STR)\ -SCM_SNARF_INIT(scm_c_define (RANAME, scm_i_makbimacro (RANAME, CFN))) +SCM_SNARF_INIT(scm_c_define (RANAME, scm_i_make_primitive_macro (RANAME, CFN))) -/* bimacros (built-in macros) have isym codes. - mmacros don't exist at runtime, they just expand out to more primitive - forms. */ SCM_SYNTAX (s_at, "@", scm_m_at); SCM_SYNTAX (s_atat, "@@", scm_m_atat); SCM_SYNTAX (s_and, "and", scm_m_and); |