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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-11-20 08:30:30 -0800 (Sun, 20 Nov 2005)
New Revision: 2190

Modified:
   branches/r5rs/sigscheme/operations-siod.c
   branches/r5rs/sigscheme/sigscheme.h
Log:
* sigscheme/sigscheme.h
  - (ScmOp_sscm_equal, ScmOp_SIOD_equal): Rename ScmOp_sscm_equal() to
    ScmOp_SIOD_equal()
* sigscheme/operations-siod.c
  - (ScmOp_sscm_equal, ScmOp_SIOD_equal):
    * Ditto
    * Rename Scheme-level function name "%%=" to "="
  - (SigScm_Initialize_SIOD):
    * Remove obsolete alias definition
    * Simplify 'use'


Modified: branches/r5rs/sigscheme/operations-siod.c
===================================================================
--- branches/r5rs/sigscheme/operations-siod.c	2005-11-20 16:11:06 UTC (rev 2189)
+++ branches/r5rs/sigscheme/operations-siod.c	2005-11-20 16:30:30 UTC (rev 2190)
@@ -101,14 +101,13 @@
 =======================================*/
 void SigScm_Initialize_SIOD(void)
 {
-    ScmExp_use(Scm_Intern("srfi-60"), SCM_INTERACTION_ENV);
+    Scm_Use("srfi-60");
     Scm_DefineAlias("bit-and"               , "logand");
     Scm_DefineAlias("bit-or"                , "logior");
     Scm_DefineAlias("bit-xor"               , "logxor");
     Scm_DefineAlias("bit-not"               , "lognot");
 
     REGISTER_FUNC_TABLE(siod_func_info_table);
-    Scm_DefineAlias("=", "%%=");
 
     null_port         = SCM_FALSE;
     saved_output_port = SCM_FALSE;
@@ -155,9 +154,9 @@
     return SCM_SYMBOL_SET_VCELL(var, val);
 }
 
-ScmObj ScmOp_sscm_equal(ScmObj obj1, ScmObj obj2)
+ScmObj ScmOp_SIOD_equal(ScmObj obj1, ScmObj obj2)
 {
-    DECLARE_FUNCTION("%%=", ProcedureFixed2);
+    DECLARE_FUNCTION("=", ProcedureFixed2);
 
     if (EQ(obj1, obj2))
         return SCM_TRUE;

Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h	2005-11-20 16:11:06 UTC (rev 2189)
+++ branches/r5rs/sigscheme/sigscheme.h	2005-11-20 16:30:30 UTC (rev 2190)
@@ -747,7 +747,7 @@
 void   SigScm_Initialize_SIOD(void);
 ScmObj ScmOp_symbol_value(ScmObj var);
 ScmObj ScmOp_set_symbol_valued(ScmObj var, ScmObj val);
-ScmObj ScmOp_sscm_equal(ScmObj obj1, ScmObj obj2);
+ScmObj ScmOp_SIOD_equal(ScmObj obj1, ScmObj obj2);
 ScmObj ScmOp_the_environment(ScmEvalState *eval_state);
 ScmObj ScmOp_sscm_closure_code(ScmObj closure);
 ScmObj ScmOp_verbose(ScmObj args);