From e1ca91007a26c64f4c9673158e5f88864818defb Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Wed, 19 May 2010 23:25:50 +0200
Subject: [PATCH] fix a couple expander naming bugs

* libguile/expand.h:
* libguile/memoize.c: Fix a couple bugs: it's application-args, not
  application-exps, and public?, not public.
---
 libguile/expand.h  | 12 ++++++------
 libguile/memoize.c |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libguile/expand.h b/libguile/expand.h
index d57e2030f..32b978bf8 100644
--- a/libguile/expand.h
+++ b/libguile/expand.h
@@ -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       \
diff --git a/libguile/memoize.c b/libguile/memoize.c
index d23a390af..bacd09726 100644
--- a/libguile/memoize.c
+++ b/libguile/memoize.c
@@ -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)
           {