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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-11-19 20:22:20 -0800 (Sat, 19 Nov 2005)
New Revision: 2171

Modified:
   branches/r5rs/sigscheme/main.c
Log:
* sigscheme/main.c
  - Revert r2154 since SCM_USE_SRFI34 is the exception handling


Modified: branches/r5rs/sigscheme/main.c
===================================================================
--- branches/r5rs/sigscheme/main.c	2005-11-20 04:08:31 UTC (rev 2170)
+++ branches/r5rs/sigscheme/main.c	2005-11-20 04:22:20 UTC (rev 2171)
@@ -95,20 +95,20 @@
     ScmObj cond_catch = SCM_FALSE;
     int is_prompt     = is_repl_prompt();
 
-#if SCM_EXCEPTION_HANDLING
+#if SCM_USE_SRFI34
     /* prepare the constant part of the form to get the loop fast */
     sym_guard = Scm_Intern("guard");
     cond_catch = LIST_2(Scm_Intern("err"),
                         LIST_2(SYM_ELSE,
                                LIST_2(Scm_Intern("%%inspect-error"),
                                       Scm_Intern("err"))));
-#endif /* SCM_EXCEPTION_HANDLING */
+#endif /* SCM_USE_SRFI34 */
 
     if (is_prompt)
         SigScm_PortPrintf(scm_current_output_port, PROMPT_STR);
 
     while (s_exp = SigScm_Read(scm_current_input_port), !EOFP(s_exp)) {
-#if SCM_EXCEPTION_HANDLING
+#if SCM_USE_SRFI34
         /*
          * Error-proof evaluation
          *
@@ -122,9 +122,9 @@
          */
         result = EVAL(LIST_3(sym_guard, cond_catch, s_exp),
                       SCM_INTERACTION_ENV);
-#else /* SCM_EXCEPTION_HANDLING */
+#else /* SCM_USE_SRFI34 */
         result = EVAL(s_exp, SCM_INTERACTION_ENV);
-#endif /* SCM_EXCEPTION_HANDLING */
+#endif /* SCM_USE_SRFI34 */
 
 #if SCM_USE_SRFI38
         SigScm_WriteToPortWithSharedStructure(scm_current_output_port, result);