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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-11-29 21:41:42 -0800 (Tue, 29 Nov 2005)
New Revision: 2287

Modified:
   branches/r5rs/sigscheme/error.c
   branches/r5rs/sigscheme/operations-siod.c
   branches/r5rs/sigscheme/operations-srfi34.c
   branches/r5rs/sigscheme/sigscheme.h
Log:
* sigscheme/sigscheme.h
  - (ScmOp_sscm_error_objectp, ScmOp_sscm_fatal_error,
    ScmOp_sscm_inspect_error, ScmOp_sscm_backtrace,
    ScmOp_sscm_closure_code): Rename to ScmOp_*()
  - (ScmOp_error_objectp, ScmOp_fatal_error, ScmOp_inspect_error,
    ScmOp_backtrace, ScmOp_closure_code): Renamed from ScmOp_sscm_*()
  - (SCM_ERROBJP): Follow the renamings
* sigscheme/error.c
  - (ScmOp_sscm_error_objectp, ScmOp_sscm_fatal_error,
    ScmOp_sscm_inspect_error, ScmOp_sscm_backtrace): Rename to
    ScmOp_*()
  - (ScmOp_error_objectp, ScmOp_inspect_error, ScmOp_backtrace):
    Renamed from ScmOp_sscm_*()
  - (ScmOp_fatal_error):
    * Renamed from ScmOp_sscm_fatal_error()
    * Follow the renamings
  - (SigScm_Die): Follow the renamings
* sigscheme/operations-siod.c
  - (ScmOp_sscm_closure_code, ScmOp_closure_code): Rename
    ScmOp_sscm_closure_code() with ScmOp_closure_code()
* sigscheme/operations-srfi34.c
  - (ScmOp_SRFI34_raise): Follow the renamings


Modified: branches/r5rs/sigscheme/error.c
===================================================================
--- branches/r5rs/sigscheme/error.c	2005-11-30 05:24:44 UTC (rev 2286)
+++ branches/r5rs/sigscheme/error.c	2005-11-30 05:41:42 UTC (rev 2287)
@@ -99,7 +99,7 @@
 #endif
 
 /* The name 'error?' should be reserved for SRFI-35 */
-ScmObj ScmOp_sscm_error_objectp(ScmObj obj)
+ScmObj ScmOp_error_objectp(ScmObj obj)
 {
     DECLARE_FUNCTION("%%error-object?", ProcedureFixed1);
     return (CONSP(obj) && EQ(CAR(obj), err_obj_tag)) ? SCM_TRUE : SCM_FALSE;
@@ -131,17 +131,17 @@
         /* NOTREACHED */
     }
 #endif
-    ScmOp_sscm_fatal_error(err_obj);
+    ScmOp_fatal_error(err_obj);
 }
 
-ScmObj ScmOp_sscm_fatal_error(ScmObj err_obj)
+ScmObj ScmOp_fatal_error(ScmObj err_obj)
 {
     DECLARE_FUNCTION("%%fatal-error", ProcedureFixed1);
 
     if (!fatal_err_looped) {
         fatal_err_looped = TRUE;
         ASSERT_ERROBJP(err_obj);
-        ScmOp_sscm_inspect_error(err_obj);
+        ScmOp_inspect_error(err_obj);
     }
 
 #if 0
@@ -153,7 +153,7 @@
     /* NOTREACHED */
 }
 
-ScmObj ScmOp_sscm_inspect_error(ScmObj err_obj)
+ScmObj ScmOp_inspect_error(ScmObj err_obj)
 {
     ScmObj rest, err_obj_tag, reason, objs, trace_stack;
     DECLARE_FUNCTION("%%inspect-error", ProcedureFixed1);
@@ -188,7 +188,7 @@
     return SCM_UNDEF;
 }
 
-ScmObj ScmOp_sscm_backtrace(void)
+ScmObj ScmOp_backtrace(void)
 {
     DECLARE_FUNCTION("%%backtrace", ProcedureFixed0);
 
@@ -210,7 +210,7 @@
     reason = strdup("SigScheme Died");
 #endif /* HAVE_ASPRINTF */
     err_obj = Scm_MakeErrorObj(Scm_NewImmutableString(reason), LIST_1(SCM_UNDEF));
-    ScmOp_sscm_fatal_error(err_obj);
+    ScmOp_fatal_error(err_obj);
     /* NOTREACHED */
     return 1;  /* dummy value for boolean expression */
 }

Modified: branches/r5rs/sigscheme/operations-siod.c
===================================================================
--- branches/r5rs/sigscheme/operations-siod.c	2005-11-30 05:24:44 UTC (rev 2286)
+++ branches/r5rs/sigscheme/operations-siod.c	2005-11-30 05:41:42 UTC (rev 2287)
@@ -176,7 +176,7 @@
     return eval_state->env;
 }
 
-ScmObj ScmOp_sscm_closure_code(ScmObj closure)
+ScmObj ScmOp_closure_code(ScmObj closure)
 {
     ScmObj exp, body;
     DECLARE_FUNCTION("%%closure-code", ProcedureFixed1);

Modified: branches/r5rs/sigscheme/operations-srfi34.c
===================================================================
--- branches/r5rs/sigscheme/operations-srfi34.c	2005-11-30 05:24:44 UTC (rev 2286)
+++ branches/r5rs/sigscheme/operations-srfi34.c	2005-11-30 05:41:42 UTC (rev 2287)
@@ -242,7 +242,7 @@
             err_obj = obj;
         else
             err_obj = Scm_MakeErrorObj(errmsg_fallback_exhausted, LIST_1(obj));
-        ScmOp_sscm_fatal_error(err_obj);
+        ScmOp_fatal_error(err_obj);
         /* NOTREACHED */
     }
 

Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h	2005-11-30 05:24:44 UTC (rev 2286)
+++ branches/r5rs/sigscheme/sigscheme.h	2005-11-30 05:41:42 UTC (rev 2287)
@@ -84,7 +84,7 @@
 #define SCM_ASSERT(cond) \
     ((cond) || SigScm_Die("assertion failed.", __FILE__, __LINE__))
 
-#define SCM_ERROBJP(obj)       (NFALSEP(ScmOp_sscm_error_objectp(obj)))
+#define SCM_ERROBJP(obj)       (NFALSEP(ScmOp_error_objectp(obj)))
 #define SCM_LISTP(obj)         (CONSP(obj) || NULLP(obj))
 
 #define SCM_SYMBOL_BOUNDP(sym) (!SCM_EQ(SCM_SYMBOL_VCELL(sym), SCM_UNBOUND))
@@ -642,10 +642,10 @@
 void SigScm_ShowBacktrace(ScmObj trace_stack);
 ScmObj Scm_MakeErrorObj(ScmObj reason, ScmObj objs);
 void   Scm_RaiseError(ScmObj err_obj) SCM_NORETURN;
-ScmObj ScmOp_sscm_error_objectp(ScmObj obj);
-ScmObj ScmOp_sscm_fatal_error(ScmObj err_obj) SCM_NORETURN;
-ScmObj ScmOp_sscm_inspect_error(ScmObj err_obj);
-ScmObj ScmOp_sscm_backtrace(void);
+ScmObj ScmOp_error_objectp(ScmObj obj);
+ScmObj ScmOp_fatal_error(ScmObj err_obj) SCM_NORETURN;
+ScmObj ScmOp_inspect_error(ScmObj err_obj);
+ScmObj ScmOp_backtrace(void);
 
 /* debug.c */
 int  SigScm_DebugCategories(void);
@@ -759,7 +759,7 @@
 ScmObj ScmOp_set_symbol_valued(ScmObj var, ScmObj val);
 ScmObj ScmOp_SIOD_equal(ScmObj obj1, ScmObj obj2);
 ScmObj ScmOp_the_environment(ScmEvalState *eval_state);
-ScmObj ScmOp_sscm_closure_code(ScmObj closure);
+ScmObj ScmOp_closure_code(ScmObj closure);
 ScmObj ScmOp_verbose(ScmObj args);
 ScmObj ScmOp_eof_val(void);
 ScmObj ScmExp_undefine(ScmObj var, ScmObj env);