mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-20 11:40:18 +02:00
Code Activity

fix a couple expander naming bugs

Browse source 
* libguile/expand.h:
* libguile/memoize.c: Fix a couple bugs: it's application-args, not
  application-exps, and public?, not public.
This commit is contained in:
Andy Wingo 2010-05-19 23:25:50 +02:00
parent ccbc25f33f
commit e1ca91007a
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
libguile/expand.h
View file

@ -148,7 +148,7 @@ enum
#define SCM_EXPANDED_MODULE_REF_TYPE_NAME "module-ref"
#define SCM_EXPANDED_MODULE_REF_FIELD_NAMES \
{ "src", "mod", "name", "public", }
{ "src", "mod", "name", "public?", }
enum
{
SCM_EXPANDED_MODULE_REF_SRC,
@ -162,7 +162,7 @@ enum
#define SCM_EXPANDED_MODULE_SET_TYPE_NAME "module-set"
#define SCM_EXPANDED_MODULE_SET_FIELD_NAMES \
{ "src", "mod", "name", "public", "exp", }
{ "src", "mod", "name", "public?", "exp", }
enum
{
SCM_EXPANDED_MODULE_SET_SRC,
@ -229,16 +229,16 @@ enum
#define SCM_EXPANDED_APPLICATION_TYPE_NAME "application"
#define SCM_EXPANDED_APPLICATION_FIELD_NAMES \
{ "src", "proc", "exps", }
{ "src", "proc", "args", }
enum
{
SCM_EXPANDED_APPLICATION_SRC,
SCM_EXPANDED_APPLICATION_PROC,
SCM_EXPANDED_APPLICATION_EXPS,
SCM_EXPANDED_APPLICATION_ARGS,
SCM_NUM_EXPANDED_APPLICATION_FIELDS,
};
#define SCM_MAKE_EXPANDED_APPLICATION(src, proc, exps) \
scm_c_make_struct (exp_vtables[SCM_EXPANDED_APPLICATION], 0, SCM_NUM_EXPANDED_APPLICATION_FIELDS, SCM_UNPACK (src), SCM_UNPACK (proc), SCM_UNPACK (exps))
#define SCM_MAKE_EXPANDED_APPLICATION(src, proc, args) \
scm_c_make_struct (exp_vtables[SCM_EXPANDED_APPLICATION], 0, SCM_NUM_EXPANDED_APPLICATION_FIELDS, SCM_UNPACK (src), SCM_UNPACK (proc), SCM_UNPACK (args))
#define SCM_EXPANDED_SEQUENCE_TYPE_NAME "sequence"
#define SCM_EXPANDED_SEQUENCE_FIELD_NAMES \

2
libguile/memoize.c
View file

@ -245,7 +245,7 @@ memoize (SCM exp, SCM env)
SCM proc, args;
proc = REF (exp, APPLICATION, PROC);
args = memoize_exps (REF (exp, APPLICATION, EXPS), env);
args = memoize_exps (REF (exp, APPLICATION, ARGS), env);
if (SCM_EXPANDED_TYPE (proc) == SCM_EXPANDED_TOPLEVEL_REF)
{