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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-09-30 04:35:44 -0700 (Fri, 30 Sep 2005)
New Revision: 1686

Modified:
   branches/r5rs/sigscheme/config.h
   branches/r5rs/sigscheme/error.c
Log:
* sigscheme/config.h
  - (SCM_DEBUG_BACKTRACE_SEP): New macro
* sigscheme/error.c
  - (SigScm_ShowBacktrace):
    * Replace "foo" style object header with [foo] to avoid confusion
      with string
    * Support SCM_DEBUG_BACKTRACE_SEP


Modified: branches/r5rs/sigscheme/config.h
===================================================================
--- branches/r5rs/sigscheme/config.h	2005-09-30 11:29:02 UTC (rev 1685)
+++ branches/r5rs/sigscheme/config.h	2005-09-30 11:35:44 UTC (rev 1686)
@@ -76,6 +76,7 @@
 #define SCM_DEBUG               1  /* enable debugging features */
 #define SCM_DEBUG_GC            0  /* enable GC debugging */
 #define SCM_DEBUG_PARSER        0  /* enable parser debugging */
+#define SCM_DEBUG_BACKTRACE_SEP 1  /* enable frame-separator on backtrace */
 
 /*===========================================================================
   Dependency Resolution

Modified: branches/r5rs/sigscheme/error.c
===================================================================
--- branches/r5rs/sigscheme/error.c	2005-09-30 11:29:02 UTC (rev 1685)
+++ branches/r5rs/sigscheme/error.c	2005-09-30 11:35:44 UTC (rev 1686)
@@ -138,10 +138,12 @@
 
     /* show each frame's obj */
     for (f = scm_trace_root; f; f = f->prev) {
+#if SCM_DEBUG_BACKTRACE_SEP
         SigScm_ErrorPrintf("------------------------------\n");
+#endif
 
+        env = f->env;
         obj = f->obj;
-        env = f->env;
 
         SigScm_WriteToPort(scm_current_error_port, obj);
         SigScm_ErrorNewline();
@@ -150,7 +152,7 @@
         case ScmSymbol:
             if (UNBOUNDP(obj, env))
                 break;
-            SigScm_ErrorPrintf("  - \"%s\": ", SCM_SYMBOL_NAME(obj));
+            SigScm_ErrorPrintf("  - [%s]: ", SCM_SYMBOL_NAME(obj));
             SigScm_WriteToPort(scm_current_error_port, symbol_value(obj, env));
             SigScm_ErrorNewline();
             break;
@@ -161,7 +163,7 @@
                 if (SYMBOLP(proc)) {
                     if (UNBOUNDP(proc, env))
                         break;
-                    SigScm_ErrorPrintf("  - \"%s\": ", SCM_SYMBOL_NAME(proc));
+                    SigScm_ErrorPrintf("  - [%s]: ", SCM_SYMBOL_NAME(proc));
                     SigScm_WriteToPort(scm_current_error_port,
                                        symbol_value(proc, env));
                     SigScm_ErrorNewline();