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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-01-29 17:29:55 -0800 (Sun, 29 Jan 2006)
New Revision: 3030

Modified:
   branches/r5rs/sigscheme/src/config.h
   branches/r5rs/sigscheme/src/port.c
   branches/r5rs/sigscheme/src/read.c
   branches/r5rs/sigscheme/src/sigschemeinternal.h
Log:
* sigscheme/src/config.h
  - Add dependency resolution for reader and writer
* sigscheme/src/sigschemeinternal.h
  - Move prototype section
* sigscheme/src/read.c
  - (scm_special_char_table): Move to port.c
* sigscheme/src/port.c
  - (scm_special_char_table): Moved from read.c


Modified: branches/r5rs/sigscheme/src/config.h
===================================================================
--- branches/r5rs/sigscheme/src/config.h	2006-01-30 01:18:35 UTC (rev 3029)
+++ branches/r5rs/sigscheme/src/config.h	2006-01-30 01:29:55 UTC (rev 3030)
@@ -190,6 +190,11 @@
 #define SCM_STRICT_DEFINE_PLACEMENT 1
 #endif /* SCM_STRICT_R5RS */
 
+#if (SCM_USE_READER || SCM_USE_WRITER)
+#undef SCM_USE_PORT
+#define SCM_USE_PORT            1
+#endif /* (SCM_USE_READER || SCM_USE_WRITER) */
+
 #if SCM_COMPAT_SIOD
 #undef SCM_USE_NONSTD_FEATURES
 #define SCM_USE_NONSTD_FEATURES 1

Modified: branches/r5rs/sigscheme/src/port.c
===================================================================
--- branches/r5rs/sigscheme/src/port.c	2006-01-30 01:18:35 UTC (rev 3029)
+++ branches/r5rs/sigscheme/src/port.c	2006-01-30 01:29:55 UTC (rev 3030)
@@ -64,6 +64,34 @@
 ScmObj scm_out;  /* current-output-port */
 ScmObj scm_err;  /* current error port */
 
+#if (SCM_USE_READER || SCM_USE_WRITER)
+const ScmSpecialCharInfo scm_special_char_table[] = {
+    /* printable characters */
+    {'\"',   "\\\"",  "\""},         /* 34, R5RS */
+    {'\\',   "\\\\",  "\\"},         /* 92, R5RS */
+    {' ',    " ",     "space"},      /* 32, R5RS */
+#if SCM_USE_SRFI75
+    {'|',    "\\|",   "|"},
+#endif
+
+    /* control characters */
+    {'\n',   "\\n",   "newline"},    /*  10, R5RS */
+#if SCM_USE_SRFI75_NAMED_CHARS
+    {'\0',   "\\x00", "nul"},        /*   0 */
+    {'\a',   "\\a",   "alarm"},      /*   7 */
+    {'\b',   "\\b",   "backspace"},  /*   8 */
+    {'\t',   "\\t",   "tab"},        /*   9 */
+    {'\n',   "\\n",   "linefeed"},   /*  10 */
+    {'\v',   "\\v",   "vtab"},       /*  11 */
+    {'\f',   "\\f",   "page"},       /*  12 */
+    {'\r',   "\\r",   "return"},     /*  13 */
+    {0x1b,   "\\x1b", "esc"},        /*  27 */
+    {0x7f,   "\\x7f", "delete"},     /* 127 */
+#endif /* SCM_USE_SRFI75_NAMED_CHARS */
+    {0, NULL, NULL}
+};
+#endif /* (SCM_USE_READER || SCM_USE_WRITER) */
+
 /*=======================================
   File Local Function Declarations
 =======================================*/

Modified: branches/r5rs/sigscheme/src/read.c
===================================================================
--- branches/r5rs/sigscheme/src/read.c	2006-01-30 01:18:35 UTC (rev 3029)
+++ branches/r5rs/sigscheme/src/read.c	2006-01-30 01:29:55 UTC (rev 3030)
@@ -77,32 +77,7 @@
 /*=======================================
   Variable Declarations
 =======================================*/
-const ScmSpecialCharInfo scm_special_char_table[] = {
-    /* printable characters */
-    {'\"',   "\\\"",  "\""},         /* 34, R5RS */
-    {'\\',   "\\\\",  "\\"},         /* 92, R5RS */
-    {' ',    " ",     "space"},      /* 32, R5RS */
-#if SCM_USE_SRFI75
-    {'|',    "\\|",   "|"},
-#endif
 
-    /* control characters */
-    {'\n',   "\\n",   "newline"},    /*  10, R5RS */
-#if SCM_USE_SRFI75_NAMED_CHARS
-    {'\0',   "\\x00", "nul"},        /*   0 */
-    {'\a',   "\\a",   "alarm"},      /*   7 */
-    {'\b',   "\\b",   "backspace"},  /*   8 */
-    {'\t',   "\\t",   "tab"},        /*   9 */
-    {'\n',   "\\n",   "linefeed"},   /*  10 */
-    {'\v',   "\\v",   "vtab"},       /*  11 */
-    {'\f',   "\\f",   "page"},       /*  12 */
-    {'\r',   "\\r",   "return"},     /*  13 */
-    {0x1b,   "\\x1b", "esc"},        /*  27 */
-    {0x7f,   "\\x7f", "delete"},     /* 127 */
-#endif /* SCM_USE_SRFI75_NAMED_CHARS */
-    {0, NULL, NULL}
-};
-
 /*=======================================
   File Local Function Declarations
 =======================================*/

Modified: branches/r5rs/sigscheme/src/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/src/sigschemeinternal.h	2006-01-30 01:18:35 UTC (rev 3029)
+++ branches/r5rs/sigscheme/src/sigschemeinternal.h	2006-01-30 01:29:55 UTC (rev 3030)
@@ -68,13 +68,11 @@
 extern ScmObj scm_in;
 extern ScmObj scm_out;
 extern ScmObj scm_err;
+extern const ScmSpecialCharInfo scm_special_char_table[];
 
 /* write.c */
 extern void (*scm_writess_func)(ScmObj port, ScmObj obj);
 
-/* read.c */
-extern const ScmSpecialCharInfo scm_special_char_table[];
-
 /* storage.c */
 #if SCM_USE_VALUECONS
 extern ScmObj scm_null_values;