Merge remote-tracking branch 'origin/stable-2.0'

[bpt/guile.git] / libguile / expand.h

diff --git a/libguile/expand.h b/libguile/expand.h
index 32b978b..f5e7af5 100644 (file)
--- a/libguile/expand.h
+++ b/libguile/expand.h
@@ -3,7 +3,7 @@
 #ifndef SCM_EXPAND_H
 #define SCM_EXPAND_H
 
-/* Copyright (C) 2010
+/* Copyright (C) 2010, 2011
  * Free Software Foundation, Inc.
  *
  * This library is free software; you can redistribute it and/or
@@ -47,8 +47,9 @@ typedef enum
     SCM_EXPANDED_TOPLEVEL_SET,
     SCM_EXPANDED_TOPLEVEL_DEFINE,
     SCM_EXPANDED_CONDITIONAL,
-    SCM_EXPANDED_APPLICATION,
-    SCM_EXPANDED_SEQUENCE,
+    SCM_EXPANDED_CALL,
+    SCM_EXPANDED_PRIMCALL,
+    SCM_EXPANDED_SEQ,
     SCM_EXPANDED_LAMBDA,
     SCM_EXPANDED_LAMBDA_CASE,
     SCM_EXPANDED_LET,
@@ -73,8 +74,9 @@ enum
     SCM_EXPANDED_TYPE_FIELDS,
   };
 
-#define SCM_EXPANDED_P(x) \
-  (SCM_STRUCTP (x) && (SCM_STRUCT_VTABLE (SCM_STRUCT_VTABLE (x)) == scm_exp_vtable_vtable))
+#define SCM_EXPANDED_P(x)                                               \
+  (SCM_STRUCTP (x)                                                      \
+   && (scm_is_eq (SCM_STRUCT_VTABLE (SCM_STRUCT_VTABLE (x)), scm_exp_vtable_vtable)))
 #define SCM_EXPANDED_REF(x,type,field) \
   (scm_struct_ref (x, SCM_I_MAKINUM (SCM_EXPANDED_##type##_##field)))
 #define SCM_EXPANDED_TYPE(x) \
@@ -227,30 +229,44 @@ enum
 #define SCM_MAKE_EXPANDED_CONDITIONAL(src, test, consequent, alternate) \
   scm_c_make_struct (exp_vtables[SCM_EXPANDED_CONDITIONAL], 0, SCM_NUM_EXPANDED_CONDITIONAL_FIELDS, SCM_UNPACK (src), SCM_UNPACK (test), SCM_UNPACK (consequent), SCM_UNPACK (alternate))
 
-#define SCM_EXPANDED_APPLICATION_TYPE_NAME "application"
-#define SCM_EXPANDED_APPLICATION_FIELD_NAMES    \
+#define SCM_EXPANDED_CALL_TYPE_NAME "call"
+#define SCM_EXPANDED_CALL_FIELD_NAMES    \
   { "src", "proc", "args", }
 enum
   {
-    SCM_EXPANDED_APPLICATION_SRC,
-    SCM_EXPANDED_APPLICATION_PROC,
-    SCM_EXPANDED_APPLICATION_ARGS,
-    SCM_NUM_EXPANDED_APPLICATION_FIELDS,
+    SCM_EXPANDED_CALL_SRC,
+    SCM_EXPANDED_CALL_PROC,
+    SCM_EXPANDED_CALL_ARGS,
+    SCM_NUM_EXPANDED_CALL_FIELDS,
   };
-#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_MAKE_EXPANDED_CALL(src, proc, args) \
+  scm_c_make_struct (exp_vtables[SCM_EXPANDED_CALL], 0, SCM_NUM_EXPANDED_CALL_FIELDS, SCM_UNPACK (src), SCM_UNPACK (proc), SCM_UNPACK (args))
 
-#define SCM_EXPANDED_SEQUENCE_TYPE_NAME "sequence"
-#define SCM_EXPANDED_SEQUENCE_FIELD_NAMES       \
-  {  "src", "exps", }
+#define SCM_EXPANDED_PRIMCALL_TYPE_NAME "primcall"
+#define SCM_EXPANDED_PRIMCALL_FIELD_NAMES    \
+  { "src", "name", "args", }
 enum
   {
-    SCM_EXPANDED_SEQUENCE_SRC,
-    SCM_EXPANDED_SEQUENCE_EXPS,
-    SCM_NUM_EXPANDED_SEQUENCE_FIELDS,
+    SCM_EXPANDED_PRIMCALL_SRC,
+    SCM_EXPANDED_PRIMCALL_NAME,
+    SCM_EXPANDED_PRIMCALL_ARGS,
+    SCM_NUM_EXPANDED_PRIMCALL_FIELDS,
   };
-#define SCM_MAKE_EXPANDED_SEQUENCE(src, exps) \
-  scm_c_make_struct (exp_vtables[SCM_EXPANDED_SEQUENCE], 0, SCM_NUM_EXPANDED_SEQUENCE_FIELDS, SCM_UNPACK (src), SCM_UNPACK (exps))
+#define SCM_MAKE_EXPANDED_PRIMCALL(src, name, args) \
+  scm_c_make_struct (exp_vtables[SCM_EXPANDED_PRIMCALL], 0, SCM_NUM_EXPANDED_PRIMCALL_FIELDS, SCM_UNPACK (src), SCM_UNPACK (name), SCM_UNPACK (args))
+
+#define SCM_EXPANDED_SEQ_TYPE_NAME "seq"
+#define SCM_EXPANDED_SEQ_FIELD_NAMES       \
+  {  "src", "head", "tail", }
+enum
+  {
+    SCM_EXPANDED_SEQ_SRC,
+    SCM_EXPANDED_SEQ_HEAD,
+    SCM_EXPANDED_SEQ_TAIL,
+    SCM_NUM_EXPANDED_SEQ_FIELDS,
+  };
+#define SCM_MAKE_EXPANDED_SEQ(src, head, tail)                          \
+  scm_c_make_struct (exp_vtables[SCM_EXPANDED_SEQ], 0, SCM_NUM_EXPANDED_SEQ_FIELDS, SCM_UNPACK (src), SCM_UNPACK (head), SCM_UNPACK (tail))
 
 #define SCM_EXPANDED_LAMBDA_TYPE_NAME "lambda"
 #define SCM_EXPANDED_LAMBDA_FIELD_NAMES         \
@@ -301,18 +317,19 @@ enum
 
 #define SCM_EXPANDED_LETREC_TYPE_NAME "letrec"
 #define SCM_EXPANDED_LETREC_FIELD_NAMES         \
-  { "src", "names", "gensyms", "vals", "body", }
+  { "src", "in-order?", "names", "gensyms", "vals", "body", }
 enum
   {
     SCM_EXPANDED_LETREC_SRC,
+    SCM_EXPANDED_LETREC_IN_ORDER_P,
     SCM_EXPANDED_LETREC_NAMES,
     SCM_EXPANDED_LETREC_GENSYMS,
     SCM_EXPANDED_LETREC_VALS,
     SCM_EXPANDED_LETREC_BODY,
     SCM_NUM_EXPANDED_LETREC_FIELDS,
   };
-#define SCM_MAKE_EXPANDED_LETREC(src, names, gensyms, vals, body) \
-  scm_c_make_struct (exp_vtables[SCM_EXPANDED_LETREC], 0, SCM_NUM_EXPANDED_LETREC_FIELDS, SCM_UNPACK (src), SCM_UNPACK (names), SCM_UNPACK (gensyms), SCM_UNPACK (vals), SCM_UNPACK (body))
+#define SCM_MAKE_EXPANDED_LETREC(src, in_order_p, names, gensyms, vals, body) \
+  scm_c_make_struct (exp_vtables[SCM_EXPANDED_LETREC], 0, SCM_NUM_EXPANDED_LETREC_FIELDS, SCM_UNPACK (src), SCM_UNPACK (in_order_p), SCM_UNPACK (names), SCM_UNPACK (gensyms), SCM_UNPACK (vals), SCM_UNPACK (body))
 
 #define SCM_EXPANDED_DYNLET_TYPE_NAME "dynlet"
 #define SCM_EXPANDED_DYNLET_FIELD_NAMES         \
@@ -333,6 +350,7 @@ enum
 \f
 
 SCM_INTERNAL SCM scm_macroexpand (SCM exp);
+SCM_INTERNAL SCM scm_macroexpanded_p (SCM exp);
 
 SCM_INTERNAL void scm_init_expand (void);