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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-10-03 03:46:36 -0700 (Mon, 03 Oct 2005)
New Revision: 1765

Modified:
   branches/r5rs/sigscheme/sigscheme.h
   branches/r5rs/sigscheme/sigschemeinternal.h
   branches/r5rs/sigscheme/sigschemetype.h
Log:
* sigscheme/sigschemeinternal.h
  - (ENVP, ASSERT_ENVP): New macro
* sigscheme/sigschemetype.h
  - (SCM_INTERACTION_ENV): Moved from sigscheme.h
  - (SCM_R5RS_ENV, SCM_NULL_ENV, SCM_ENVP): New macro
* sigscheme/sigscheme.h
  - (SCM_INTERACTION_ENV): Move to sigschemetype.h


Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h	2005-10-03 10:33:16 UTC (rev 1764)
+++ branches/r5rs/sigscheme/sigscheme.h	2005-10-03 10:46:36 UTC (rev 1765)
@@ -54,8 +54,6 @@
 /*=======================================
    Macro Declarations
 =======================================*/
-#define SCM_INTERACTION_ENV SCM_NULL
-
 #ifdef __GNUC__
 #define SCM_NOINLINE __attribute__((noinline))
 #else

Modified: branches/r5rs/sigscheme/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/sigschemeinternal.h	2005-10-03 10:33:16 UTC (rev 1764)
+++ branches/r5rs/sigscheme/sigschemeinternal.h	2005-10-03 10:46:36 UTC (rev 1765)
@@ -151,6 +151,7 @@
 #define FREECELLP      SCM_FREECELLP
 #define C_POINTERP     SCM_C_POINTERP
 #define C_FUNCPOINTERP SCM_C_FUNCPOINTERP
+#define ENVP           SCM_ENVP
 
 #define CDBG           SCM_CDBG
 #define DBG            SCM_DBG
@@ -337,6 +338,7 @@
 #define ASSERT_PORTP(obj)    ASSERT_TYPE(PORTP, "port", (obj))
 #define ASSERT_CONTINUATIONP(obj) ASSERT_TYPE(CONTINUATIONP, "continuation", (obj))
 #define ASSERT_PROCEDUREP(obj) ASSERT_TYPE(PROCEDUREP, "procedure", (obj))
+#define ASSERT_ENVP(obj)     ASSERT_TYPE(ENVP, "environment specifier", (obj))
 
 
 /*=======================================

Modified: branches/r5rs/sigscheme/sigschemetype.h
===================================================================
--- branches/r5rs/sigscheme/sigschemetype.h	2005-10-03 10:33:16 UTC (rev 1764)
+++ branches/r5rs/sigscheme/sigschemetype.h	2005-10-03 10:46:36 UTC (rev 1765)
@@ -408,6 +408,19 @@
 #define SCM_C_FUNCPOINTER_SET_VALUE(a, funcptr) (SCM_C_FUNCPOINTER_VALUE(a) = funcptr)
 
 /*============================================================================
+  Environment Specifiers
+============================================================================*/
+#define SCM_INTERACTION_ENV SCM_NULL
+/*
+ * Current implementation cannot handle scheme-report-environment and
+ * null-environment properly. Be careful to use these environemnts.
+ */
+#define SCM_R5RS_ENV        SCM_INTERACTION_ENV
+#define SCM_NULL_ENV        SCM_INTERACTION_ENV
+
+#define SCM_ENVP(env) (NULLP(env) || CONSP(env))
+
+/*============================================================================
   Abstract ScmObj Reference For Storage-Representation Independent Efficient
   List Operations
 ============================================================================*/