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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-01-31 14:51:49 -0800 (Tue, 31 Jan 2006)
New Revision: 3049

Modified:
   branches/r5rs/sigscheme/src/config.h
   branches/r5rs/sigscheme/src/port.c
   branches/r5rs/sigscheme/src/sigscheme.h
   branches/r5rs/sigscheme/src/write.c
Log:
* sigscheme/src/config.h
  - (SCM_VOLATILE_OUTPUT): Removed
* sigscheme/src/sigscheme.h
  - (scm_display): Removed
* sigscheme/src/port.c
  - (scm_port_vprintf): Remove SCM_VOLATILE_OUTPUT handling
* sigscheme/src/write.c
  - (scm_display): Removed
  - (scm_write_to_port, scm_display_to_port): Remove
    SCM_VOLATILE_OUTPUT handling
  - (write_obj): Add scm_port_flush() at last


Modified: branches/r5rs/sigscheme/src/config.h
===================================================================
--- branches/r5rs/sigscheme/src/config.h	2006-01-31 19:32:05 UTC (rev 3048)
+++ branches/r5rs/sigscheme/src/config.h	2006-01-31 22:51:49 UTC (rev 3049)
@@ -110,7 +110,6 @@
 #define SCM_CONST_VECTOR_LITERAL 1 /* make vector literal immutable */
 #define SCM_ACCESSOR_ASSERT     0  /* enable strict type check with accessor */
 #define SCM_USE_VALUECONS       1  /* use experimental values passing */
-#define SCM_VOLATILE_OUTPUT     0  /* always flush files on write */
 #define SCM_USE_NULL_CAPABLE_STRING 1  /* enable experimental null character in a middle of a string */
 #define SCM_OBJ_COMPACT         0  /* object representation compaction (experimental) */
 
@@ -214,11 +213,6 @@
 #define SCM_USE_SRFI75_NAMED_CHARS 1
 #endif
 
-#if SCM_DEBUG
-#undef SCM_VOLATILE_OUTPUT
-#define SCM_VOLATILE_OUTPUT     1
-#endif /* SCM_DEBUG */
-
 #if SCM_OBJ_COMPACT
 #undef SCM_USE_VALUECONS
 #define SCM_USE_VALUECONS       0

Modified: branches/r5rs/sigscheme/src/port.c
===================================================================
--- branches/r5rs/sigscheme/src/port.c	2006-01-31 19:32:05 UTC (rev 3048)
+++ branches/r5rs/sigscheme/src/port.c	2006-01-31 22:51:49 UTC (rev 3049)
@@ -182,9 +182,6 @@
 
     SCM_ENSURE_LIVE_PORT(port);
     ret = SCM_CHARPORT_VPRINTF(SCM_PORT_IMPL(port), fmt, args);
-#if SCM_VOLATILE_OUTPUT
-    scm_port_flush(port);
-#endif
 
     return ret;
 }

Modified: branches/r5rs/sigscheme/src/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/src/sigscheme.h	2006-01-31 19:32:05 UTC (rev 3048)
+++ branches/r5rs/sigscheme/src/sigscheme.h	2006-01-31 22:51:49 UTC (rev 3049)
@@ -1374,7 +1374,6 @@
 ScmObj scm_p_read(ScmObj args);
 
 /* write.c */
-void scm_display(ScmObj obj);
 void scm_write_to_port(ScmObj port, ScmObj obj);
 void scm_display_to_port(ScmObj port, ScmObj obj);
 #if SCM_USE_SRFI38

Modified: branches/r5rs/sigscheme/src/write.c
===================================================================
--- branches/r5rs/sigscheme/src/write.c	2006-01-31 19:32:05 UTC (rev 3048)
+++ branches/r5rs/sigscheme/src/write.c	2006-01-31 22:51:49 UTC (rev 3049)
@@ -125,12 +125,6 @@
    Function Implementations
 =======================================*/
 void
-scm_display(ScmObj obj)
-{
-    scm_display_to_port(scm_out, obj);
-}
-
-void
 scm_write_to_port(ScmObj port, ScmObj obj)
 {
     DECLARE_INTERNAL_FUNCTION("scm_write_to_port");
@@ -141,10 +135,6 @@
         ERR("output port is required");
 
     write_obj(port, obj, AS_WRITE);
-
-#if SCM_VOLATILE_OUTPUT
-    scm_port_flush(port);
-#endif /* SCM_VOLATILE_OUTPUT */
 }
 
 void
@@ -158,10 +148,6 @@
         ERR("output port is required");
 
     write_obj(port, obj, AS_DISPLAY);
-
-#if SCM_VOLATILE_OUTPUT
-    scm_port_flush(port);
-#endif /* SCM_VOLATILE_OUTPUT */
 }
 
 static void
@@ -251,6 +237,7 @@
     default:
         SCM_ASSERT(scm_false);
     }
+    scm_port_flush(port);
 }
 
 static void