[uim-commit] r3034 - in branches/r5rs: sigscheme/src test

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-01-29 20:33:50 -0800 (Sun, 29 Jan 2006)
New Revision: 3034

Modified:
   branches/r5rs/sigscheme/src/config.h
   branches/r5rs/sigscheme/src/error.c
   branches/r5rs/sigscheme/src/sigscheme.h
   branches/r5rs/sigscheme/src/sigschemeinternal.h
   branches/r5rs/test/uim-test-utils.scm
Log:
* sigscheme/src/sigschemeinternal.h
  - (SCM_ERR_HEADER): Replace "Error: " with "ERROR: " to make ordinary
    as other Scheme implementations
* sigscheme/src/config.h
  - (SCM_DEBUG_BACKTRACE_SEP): Disable by default
* test/uim-test-utils.scm
  - (uim-sh-read): Follow the change of SCM_ERR_HEADER


Modified: branches/r5rs/sigscheme/src/config.h
===================================================================
--- branches/r5rs/sigscheme/src/config.h	2006-01-30 04:17:48 UTC (rev 3033)
+++ branches/r5rs/sigscheme/src/config.h	2006-01-30 04:33:50 UTC (rev 3034)
@@ -151,7 +151,7 @@
 #define SCM_DEBUG_PORT          0  /* enable port debugging */
 #define SCM_DEBUG_PARSER        0  /* enable parser debugging */
 #define SCM_DEBUG_ENCODING      0  /* debug encoding-related functions */
-#define SCM_DEBUG_BACKTRACE_SEP 1  /* enable frame-separator on backtrace */
+#define SCM_DEBUG_BACKTRACE_SEP 0  /* enable frame-separator on backtrace */
 #define SCM_DEBUG_BACKTRACE_VAL 1  /* enable values printing on backtrace */
 
 /*===========================================================================

Modified: branches/r5rs/sigscheme/src/error.c
===================================================================
--- branches/r5rs/sigscheme/src/error.c	2006-01-30 04:17:48 UTC (rev 3033)
+++ branches/r5rs/sigscheme/src/error.c	2006-01-30 04:33:50 UTC (rev 3034)
@@ -387,8 +387,8 @@
 static void
 show_arg(ScmObj arg, ScmObj env)
 {
-#define UNBOUNDP(var, env)                                              \
-    (scm_lookup_environment(var, env) == SCM_INVALID_REF                 \
+#define UNBOUNDP(var, env)                                                   \
+    (scm_lookup_environment(var, env) == SCM_INVALID_REF                     \
      && !SCM_SYMBOL_BOUNDP(var))
 
     if (SYMBOLP(arg) && !UNBOUNDP(arg, env)) {

Modified: branches/r5rs/sigscheme/src/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/src/sigscheme.h	2006-01-30 04:17:48 UTC (rev 3033)
+++ branches/r5rs/sigscheme/src/sigscheme.h	2006-01-30 04:33:50 UTC (rev 3034)
@@ -502,7 +502,7 @@
 =======================================*/
 enum ScmDebugCategory {
     SCM_DBG_NONE         = 0,
-    SCM_DBG_ERRMSG       = 1 << 0,   /* the "Error: foo bar" style msgs */
+    SCM_DBG_ERRMSG       = 1 << 0,   /* the "ERROR: foo bar" style msgs */
     SCM_DBG_BACKTRACE    = 1 << 1,
     SCM_DBG_GC           = 1 << 2,
     SCM_DBG_FILE         = 1 << 3,   /* file loading */

Modified: branches/r5rs/sigscheme/src/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/src/sigschemeinternal.h	2006-01-30 04:17:48 UTC (rev 3033)
+++ branches/r5rs/sigscheme/src/sigschemeinternal.h	2006-01-30 04:33:50 UTC (rev 3034)
@@ -390,7 +390,7 @@
 #define INVALID_CONTINUATION_OPAQUE  NULL
 
 /* error handlings */
-#define SCM_ERR_HEADER "Error: "
+#define SCM_ERR_HEADER "ERROR: "
 
 #define EQVP(a, b)   (NFALSEP(scm_p_eqvp((a), (b))))
 #define EQUALP(a, b) (NFALSEP(scm_p_equalp((a), (b))))

Modified: branches/r5rs/test/uim-test-utils.scm
===================================================================
--- branches/r5rs/test/uim-test-utils.scm	2006-01-30 04:17:48 UTC (rev 3033)
+++ branches/r5rs/test/uim-test-utils.scm	2006-01-30 04:33:50 UTC (rev 3034)
@@ -76,7 +76,7 @@
                            #f)
                          (lambda ()
                            (read in)))))
-    (if (eq? 'Error: uim-sh-output)
+    (if (eq? 'ERROR: uim-sh-output)
 	(error (uim-sh-read-error in))
 	uim-sh-output)))