[uim-commit] r2318 - branches/r5rs/sigscheme

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-12-03 02:16:22 -0800 (Sat, 03 Dec 2005)
New Revision: 2318

Modified:
   branches/r5rs/sigscheme/sigscheme.h
   branches/r5rs/sigscheme/sigschemeinternal.h
Log:
* sigscheme/sigscheme.h
  - (SCM_LISTP): Fix internal name reference
* sigscheme/sigschemeinternal.h
  - Cosmetic change


Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h	2005-12-03 10:11:59 UTC (rev 2317)
+++ branches/r5rs/sigscheme/sigscheme.h	2005-12-03 10:16:22 UTC (rev 2318)
@@ -85,7 +85,6 @@
     ((cond) || SigScm_Die("assertion failed.", __FILE__, __LINE__))
 
 #define SCM_ERROBJP(obj)       (NFALSEP(ScmOp_error_objectp(obj)))
-#define SCM_LISTP(obj)         (CONSP(obj) || NULLP(obj))
 
 #define SCM_SYMBOL_BOUNDP(sym) (!SCM_EQ(SCM_SYMBOL_VCELL(sym), SCM_UNBOUND))
 
@@ -102,6 +101,7 @@
 #define SCM_LIST_5(elm0, elm1, elm2, elm3, elm4) \
     (SCM_CONS((elm0), SCM_LIST_4((elm1), (elm2), (elm3), (elm4))))
 
+#define SCM_LISTP(obj)    (SCM_CONSP(obj) || SCM_NULLP(obj))
 #define SCM_LIST_1_P(lst) (SCM_CONSP(lst) && SCM_NULLP(SCM_CDR(lst)))
 #define SCM_LIST_2_P(lst) (SCM_CONSP(lst) && SCM_LIST_1_P(SCM_CDR(lst)))
 #define SCM_LIST_3_P(lst) (SCM_CONSP(lst) && SCM_LIST_2_P(SCM_CDR(lst)))

Modified: branches/r5rs/sigscheme/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/sigschemeinternal.h	2005-12-03 10:11:59 UTC (rev 2317)
+++ branches/r5rs/sigscheme/sigschemeinternal.h	2005-12-03 10:16:22 UTC (rev 2318)
@@ -141,11 +141,6 @@
 #define LIST_3         SCM_LIST_3
 #define LIST_4         SCM_LIST_4
 #define LIST_5         SCM_LIST_5
-#define LIST_1_P       SCM_LIST_1_P
-#define LIST_2_P       SCM_LIST_2_P
-#define LIST_3_P       SCM_LIST_3_P
-#define LIST_4_P       SCM_LIST_4_P
-#define LIST_5_P       SCM_LIST_5_P
 
 #define DEREF          SCM_DEREF
 #define SET            SCM_SET
@@ -176,7 +171,13 @@
 #define C_FUNCPOINTERP SCM_C_FUNCPOINTERP
 #define ENVP           SCM_ENVP
 #define ERROBJP        SCM_ERROBJP
+
 #define LISTP          SCM_LISTP
+#define LIST_1_P       SCM_LIST_1_P
+#define LIST_2_P       SCM_LIST_2_P
+#define LIST_3_P       SCM_LIST_3_P
+#define LIST_4_P       SCM_LIST_4_P
+#define LIST_5_P       SCM_LIST_5_P
 
 #define CDBG           SCM_CDBG
 #define DBG            SCM_DBG