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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-12-18 18:26:31 -0800 (Sun, 18 Dec 2005)
New Revision: 2646

Modified:
   branches/r5rs/sigscheme/error.c
   branches/r5rs/sigscheme/io.c
   branches/r5rs/sigscheme/read.c
   branches/r5rs/sigscheme/sigscheme.h
Log:
* sigscheme/sigscheme.h
  - (scm_error_printf, scm_error_vprintf, scm_error_newline): Removed
* sigscheme/io.c
  - (scm_error_printf, scm_error_vprintf, scm_error_newline): Removed
* sigscheme/read.c
  - (scm_read, scm_categorized_debug, scm_debug, scm_p_inspect_error,
    scm_error_obj, show_arg, scm_show_backtrace): Follow the removal


Modified: branches/r5rs/sigscheme/error.c
===================================================================
--- branches/r5rs/sigscheme/error.c	2005-12-19 02:16:28 UTC (rev 2645)
+++ branches/r5rs/sigscheme/error.c	2005-12-19 02:26:31 UTC (rev 2646)
@@ -131,8 +131,8 @@
 
     va_start(va, msg);
     if (debug_mask & category) {
-        scm_error_vprintf(msg, va);
-        scm_error_newline();
+        scm_port_vprintf(scm_err, msg, va);
+        scm_port_newline(scm_err);
     }
     va_end(va);
 }
@@ -144,8 +144,8 @@
 
     va_start(va, msg);
     if (debug_mask & SCM_DBG_DEVEL) {
-        scm_error_vprintf(msg, va);
-        scm_error_newline();
+        scm_port_vprintf(scm_err, msg, va);
+        scm_port_newline(scm_err);
     }
     va_end(va);
 }
@@ -268,7 +268,7 @@
             scm_port_puts(scm_err, ": ");
             scm_write_to_port(scm_err, err_obj);
         }
-        scm_error_newline();
+        scm_port_newline(scm_err);
     }
 
     if (scm_debug_categories() & SCM_DBG_BACKTRACE) {
@@ -341,7 +341,7 @@
 void
 scm_show_error_header(void)
 {
-    scm_error_printf(SCM_ERR_HEADER);
+    scm_port_printf(scm_err, SCM_ERR_HEADER);
 }
 
 #if (SCM_DEBUG && SCM_DEBUG_BACKTRACE_VAL)
@@ -353,9 +353,9 @@
      && !SCM_SYMBOL_BOUNDP(var))
 
     if (SYMBOLP(arg) && !UNBOUNDP(arg, env)) {
-        scm_error_printf("  - [%s]: ", SCM_SYMBOL_NAME(arg));
+        scm_port_printf(scm_err, "  - [%s]: ", SCM_SYMBOL_NAME(arg));
         SCM_WRITESS_TO_PORT(scm_err, scm_symbol_value(arg, env));
-        scm_error_newline();
+        scm_port_newline(scm_err);
     }
 
 #undef UNBOUNDP
@@ -368,12 +368,12 @@
 #if SCM_DEBUG
     ScmObj top, frame, env, obj;
 
-    scm_error_printf(SCM_BACKTRACE_HEADER);
+    scm_port_printf(scm_err, SCM_BACKTRACE_HEADER);
 
     /* show each frame's obj */
     for (top = trace_stack; !NULLP(top); top = CDR(top)) {
 #if SCM_DEBUG_BACKTRACE_SEP
-        scm_error_printf(SCM_BACKTRACE_SEP);
+        scm_port_printf(scm_err, SCM_BACKTRACE_SEP);
 #endif
 
         frame = CAR(top);
@@ -381,7 +381,7 @@
         obj = TRACE_FRAME_OBJ(frame);
 
         SCM_WRITESS_TO_PORT(scm_err, obj);
-        scm_error_newline();
+        scm_port_newline(scm_err);
 
 #if SCM_DEBUG_BACKTRACE_VAL
         switch (SCM_TYPE(obj)) {
@@ -403,7 +403,7 @@
 #endif /* SCM_DEBUG_BACKTRACE_VAL */
     }
 #if SCM_DEBUG_BACKTRACE_SEP
-    scm_error_printf(SCM_BACKTRACE_SEP);
+    scm_port_printf(scm_err, SCM_BACKTRACE_SEP);
 #endif /* SCM_DEBUG_BACKTRACE_SEP */
 #endif /* SCM_DEBUG */
 }

Modified: branches/r5rs/sigscheme/io.c
===================================================================
--- branches/r5rs/sigscheme/io.c	2005-12-19 02:16:28 UTC (rev 2645)
+++ branches/r5rs/sigscheme/io.c	2005-12-19 02:26:31 UTC (rev 2646)
@@ -167,28 +167,6 @@
     return err;
 }
 
-void
-scm_error_printf(const char *fmt, ...)
-{
-    va_list args;
-
-    va_start(args, fmt);
-    scm_error_vprintf(fmt, args);
-    va_end(args);
-}
-
-void
-scm_error_vprintf(const char *fmt, va_list args)
-{
-    scm_port_vprintf(scm_err, fmt, args);
-}
-
-void
-scm_error_newline(void)
-{
-    scm_port_newline(scm_err);
-}
-
 int
 scm_port_close(ScmObj port)
 {

Modified: branches/r5rs/sigscheme/read.c
===================================================================
--- branches/r5rs/sigscheme/read.c	2005-12-19 02:16:28 UTC (rev 2645)
+++ branches/r5rs/sigscheme/read.c	2005-12-19 02:26:31 UTC (rev 2646)
@@ -148,7 +148,7 @@
 #if SCM_DEBUG
     if ((scm_debug_categories() & SCM_DBG_READ) && !EOFP(sexp)) {
         scm_write_to_port(scm_err, sexp);
-        scm_error_newline();
+        scm_port_newline(scm_err);
     }
 #endif
 

Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h	2005-12-19 02:16:28 UTC (rev 2645)
+++ branches/r5rs/sigscheme/sigscheme.h	2005-12-19 02:26:31 UTC (rev 2646)
@@ -907,10 +907,6 @@
 int scm_port_vprintf(ScmObj port, const char *fmt, va_list args);
 int scm_port_newline(ScmObj port);
 int scm_port_flush(ScmObj port);
-/* FIXME: obsolete these functions */
-void scm_error_printf(const char *fmt, ...);
-void scm_error_vprintf(const char *fmt, va_list args);
-void scm_error_newline(void);
 
 ScmObj scm_p_call_with_input_file(ScmObj filepath, ScmObj proc);
 ScmObj scm_p_call_with_output_file(ScmObj filepath, ScmObj proc);