[uim-commit] r3054 - branches/r5rs/sigscheme/src

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-01-31 16:58:20 -0800 (Tue, 31 Jan 2006)
New Revision: 3054

Modified:
   branches/r5rs/sigscheme/src/config.h
   branches/r5rs/sigscheme/src/procedure.c
   branches/r5rs/sigscheme/src/sigscheme.c
   branches/r5rs/sigscheme/src/sigscheme.h
Log:
* sigscheme/src/config.h
  - (SCM_USE_EVAL_C_STRING): New macro
  - Modify SRFI-6 dependency for SCM_USE_EVAL_C_STRING
* sigscheme/src/sigscheme.h
  - (scm_eval_c_string): Enable only when SCM_USE_EVAL_C_STRING
* sigscheme/src/sigscheme.c
  - (scm_eval_c_string): Ditto
  - (scm_eval_c_string_internal):
    * Ditto
    * Add lacking static specifier
* sigscheme/src/procedure.c
  - Include config-asprintf.h only when SCM_USE_EVAL_C_STRING


Modified: branches/r5rs/sigscheme/src/config.h
===================================================================
--- branches/r5rs/sigscheme/src/config.h	2006-02-01 00:40:14 UTC (rev 3053)
+++ branches/r5rs/sigscheme/src/config.h	2006-02-01 00:58:20 UTC (rev 3054)
@@ -63,6 +63,7 @@
 #define SCM_USE_NONSTD_FEATURES 1  /* use Non-R5RS standard features such as "require" */
 #define SCM_USE_LEGACY_MACRO    0  /* (not supported yet) use define-macro */
 #define SCM_USE_DUMP            0  /* (not supported yet) use storage dump */
+#define SCM_USE_EVAL_C_STRING   1  /* use scm_eval_c_string() */
 
 #define SCM_USE_SRFI1           0  /* use SRFI-1  list library (broken) */
 #define SCM_USE_SRFI2           1  /* use SRFI-2  'and-let*' */
@@ -232,8 +233,9 @@
 #error "disabled character encoding is chosen as default"
 #endif
 
-/* for scm_eval_c_string_internal() */
+#if SCM_USE_EVAL_C_STRING
 #undef SCM_USE_SRFI6
 #define SCM_USE_SRFI6           1
+#endif
 
 #endif /* __SIGSCHEME_CONFIG_H */

Modified: branches/r5rs/sigscheme/src/procedure.c
===================================================================
--- branches/r5rs/sigscheme/src/procedure.c	2006-02-01 00:40:14 UTC (rev 3053)
+++ branches/r5rs/sigscheme/src/procedure.c	2006-02-01 00:58:20 UTC (rev 3054)
@@ -33,9 +33,11 @@
 ===========================================================================*/
 
 #include "config.h"
+#if SCM_USE_SRFI6
 /* FIXME: remove this for direct inclusion of module-srfi6.c and
  * strport.c */
 #include "config-asprintf.h"
+#endif
 
 /*=======================================
   System Include

Modified: branches/r5rs/sigscheme/src/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/src/sigscheme.c	2006-02-01 00:40:14 UTC (rev 3053)
+++ branches/r5rs/sigscheme/src/sigscheme.c	2006-02-01 00:58:20 UTC (rev 3054)
@@ -68,7 +68,9 @@
   File Local Function Declarations
 =======================================*/
 static void scm_initialize_internal(const ScmStorageConf *storage_conf);
+#if SCM_USE_EVAL_C_STRING
 static ScmObj scm_eval_c_string_internal(const char *exp);
+#endif
 
 /*=======================================
   Function Implementations
@@ -170,6 +172,7 @@
     scm_initialized = scm_false;
 }
 
+#if SCM_USE_EVAL_C_STRING
 ScmObj
 scm_eval_c_string(const char *exp)
 {
@@ -193,7 +196,7 @@
     return ret;
 }
 
-ScmObj
+static ScmObj
 scm_eval_c_string_internal(const char *exp)
 {
     ScmObj str_port, ret;
@@ -213,6 +216,7 @@
 
     return ret;
 }
+#endif /* SCM_USE_EVAL_C_STRING */
 
 #if SCM_COMPAT_SIOD
 ScmObj

Modified: branches/r5rs/sigscheme/src/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/src/sigscheme.h	2006-02-01 00:40:14 UTC (rev 3053)
+++ branches/r5rs/sigscheme/src/sigscheme.h	2006-02-01 00:58:20 UTC (rev 3054)
@@ -957,7 +957,9 @@
 /* sigscheme.c */
 void scm_initialize(const ScmStorageConf *storage_conf);
 void scm_finalize(void);
+#if SCM_USE_EVAL_C_STRING
 ScmObj scm_eval_c_string(const char *exp);
+#endif
 #if SCM_COMPAT_SIOD
 ScmObj scm_return_value(void);
 #endif