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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-02-02 11:56:11 -0800 (Thu, 02 Feb 2006)
New Revision: 3087

Modified:
   branches/r5rs/sigscheme/src/basecport.c
   branches/r5rs/sigscheme/src/error.c
   branches/r5rs/sigscheme/src/fileport.c
   branches/r5rs/sigscheme/src/mbcport.c
   branches/r5rs/sigscheme/src/nullport.c
   branches/r5rs/sigscheme/src/sbcport.c
   branches/r5rs/sigscheme/src/strport.c
Log:
* sigscheme/src/error.c
  - (NO_ERR_OBJ): New macro
  - (scm_error_internal, scm_plain_error,
    scm_error_with_implicit_func, scm_error): Suppress errobj printing
    if not required
* sigscheme/src/mbcport.c
* sigscheme/src/sbcport.c
* sigscheme/src/nullport.c
* sigscheme/src/basecport.c
* sigscheme/src/strport.c
  - Include sigschemeinternal.h to cooperate with SigScheme on error
    handling
* sigscheme/src/fileport.c
  - Ditto
  - (fileport_byte_readyp): Modify error message


Modified: branches/r5rs/sigscheme/src/basecport.c
===================================================================
--- branches/r5rs/sigscheme/src/basecport.c	2006-02-02 18:48:40 UTC (rev 3086)
+++ branches/r5rs/sigscheme/src/basecport.c	2006-02-02 19:56:11 UTC (rev 3087)
@@ -54,6 +54,7 @@
 /* To override SCM_{CHAR,BYTE}PORT_ERROR() and SCM_PORT_*ALLOC(). Don't depend
  * on SigScheme-specific things */
 #include "sigscheme.h"
+#include "sigschemeinternal.h"
 
 #include "baseport.h"
 

Modified: branches/r5rs/sigscheme/src/error.c
===================================================================
--- branches/r5rs/sigscheme/src/error.c	2006-02-02 18:48:40 UTC (rev 3086)
+++ branches/r5rs/sigscheme/src/error.c	2006-02-02 19:56:11 UTC (rev 3087)
@@ -70,6 +70,7 @@
 static void (*cb_fatal_error)(void);
 
 static ScmObj err_obj_tag, str_srfi34;
+#define NO_ERR_OBJ err_obj_tag
 
 /*=======================================
   File Local Function Declarations
@@ -336,7 +337,7 @@
         free(fmt);
 
     err_obj = scm_make_error_obj(MAKE_IMMUTABLE_STRING(reason, STRLEN_UNKNOWN),
-                                 LIST_1(obj));
+                                 (EQ(obj, NO_ERR_OBJ)) ? SCM_NULL : LIST_1(obj));
     scm_raise_error(err_obj);
     /* NOTREACHED */
 }
@@ -347,7 +348,7 @@
     va_list va;
 
     va_start(va, msg);
-    scm_error_internal(NULL, SCM_NULL, msg, va);
+    scm_error_internal(NULL, NO_ERR_OBJ, msg, va);
     /* va_end(va); */
     /* NOTREACHED */
 }
@@ -359,7 +360,7 @@
     va_list va;
 
     va_start(va, msg);
-    scm_error_internal(scm_err_funcname, SCM_NULL, msg, va);
+    scm_error_internal(scm_err_funcname, NO_ERR_OBJ, msg, va);
     /* va_end(va); */
     /* NOTREACHED */
 }
@@ -371,7 +372,7 @@
     va_list va;
 
     va_start(va, msg);
-    scm_error_internal(func_name, SCM_NULL, msg, va);
+    scm_error_internal(func_name, NO_ERR_OBJ, msg, va);
     /* va_end(va); */
     /* NOTREACHED */
 }

Modified: branches/r5rs/sigscheme/src/fileport.c
===================================================================
--- branches/r5rs/sigscheme/src/fileport.c	2006-02-02 18:48:40 UTC (rev 3086)
+++ branches/r5rs/sigscheme/src/fileport.c	2006-02-02 19:56:11 UTC (rev 3087)
@@ -55,6 +55,7 @@
 /* To override SCM_{CHAR,BYTE}PORT_ERROR() and SCM_PORT_*ALLOC(). Don't depend
  * on SigScheme-specific things */
 #include "sigscheme.h"
+#include "sigschemeinternal.h"
 
 #include "baseport.h"
 #include "fileport.h"
@@ -227,7 +228,7 @@
      * fdopen(3) */
 #if HAVE_FILENO
     if (fileno(port->file) >= 0)
-        SCM_BYTEPORT_ERROR(port, "Bug: ready? operation is not supported on this port");
+        SCM_BYTEPORT_ERROR(port, "known bug: ready? operation is not supported on this port");
 #endif
     return scm_true;
 }

Modified: branches/r5rs/sigscheme/src/mbcport.c
===================================================================
--- branches/r5rs/sigscheme/src/mbcport.c	2006-02-02 18:48:40 UTC (rev 3086)
+++ branches/r5rs/sigscheme/src/mbcport.c	2006-02-02 19:56:11 UTC (rev 3087)
@@ -54,6 +54,7 @@
 /* To override SCM_{CHAR,BYTE}PORT_ERROR() and SCM_PORT_*ALLOC(). Don't depend
  * on SigScheme-specific things */
 #include "sigscheme.h"
+#include "sigschemeinternal.h"
 
 #include "encoding.h"
 #include "baseport.h"

Modified: branches/r5rs/sigscheme/src/nullport.c
===================================================================
--- branches/r5rs/sigscheme/src/nullport.c	2006-02-02 18:48:40 UTC (rev 3086)
+++ branches/r5rs/sigscheme/src/nullport.c	2006-02-02 19:56:11 UTC (rev 3087)
@@ -54,6 +54,7 @@
 /* To override SCM_{CHAR,BYTE}PORT_ERROR() and SCM_PORT_*ALLOC(). Don't depend
  * on SigScheme-specific things */
 #include "sigscheme.h"
+#include "sigschemeinternal.h"
 
 #include "baseport.h"
 #include "nullport.h"

Modified: branches/r5rs/sigscheme/src/sbcport.c
===================================================================
--- branches/r5rs/sigscheme/src/sbcport.c	2006-02-02 18:48:40 UTC (rev 3086)
+++ branches/r5rs/sigscheme/src/sbcport.c	2006-02-02 19:56:11 UTC (rev 3087)
@@ -52,6 +52,7 @@
 /* To override SCM_{CHAR,BYTE}PORT_ERROR() and SCM_PORT_*ALLOC(). Don't depend
  * on SigScheme-specific things */
 #include "sigscheme.h"
+#include "sigschemeinternal.h"
 
 #include "baseport.h"
 #include "sbcport.h"

Modified: branches/r5rs/sigscheme/src/strport.c
===================================================================
--- branches/r5rs/sigscheme/src/strport.c	2006-02-02 18:48:40 UTC (rev 3086)
+++ branches/r5rs/sigscheme/src/strport.c	2006-02-02 19:56:11 UTC (rev 3087)
@@ -55,6 +55,7 @@
 /* To override SCM_{CHAR,BYTE}PORT_ERROR() and SCM_PORT_*ALLOC(). Don't depend
  * on SigScheme-specific things */
 #include "sigscheme.h"
+#include "sigschemeinternal.h"
 
 #include "baseport.h"
 #include "strport.h"