[uim-commit] r1181 - branches/r5rs/uim

[tkng at freedesktop.org]

Author: tkng
Date: 2005-08-10 12:47:22 -0700 (Wed, 10 Aug 2005)
New Revision: 1181

Modified:
   branches/r5rs/uim/uim-scm.c
Log:
* uim/uim-scm.c:
 -(uim_scm_init_subr_0, uim_scm_init_subr_1, uim_scm_init_subr_2,
   uim_scm_init_subr_3, uim_scm_init_subr_4, uim_scm_init_subr_5):
   Renamed dummy argument name. fcn -> func.


Modified: branches/r5rs/uim/uim-scm.c
===================================================================
--- branches/r5rs/uim/uim-scm.c	2005-08-10 19:34:32 UTC (rev 1180)
+++ branches/r5rs/uim/uim-scm.c	2005-08-10 19:47:22 UTC (rev 1181)
@@ -43,23 +43,6 @@
 #include "uim-compat-scm.h"
 #include "context.h"
 
-/*
-  To avoid namespace pollution, all siod functions are defined as
-  static and wrapped into uim-scm.c by direct inclusion rather than
-  linked via public symbols. After elaboration of uim-scm API, the
-  Scheme interpreter implementation can be switched to another one
-  such as uim-scm-tinyscheme.c or uim-scm-gauche.c. But *.[hc] under
-  uim/ and *.scm are still depending on siod in several ways. At least
-  full test suite for *.scm files are required to migrate to another
-  Scheme implementation.  -- YamaKen 2004-12-21, 2005-01-10
-*/
-#include "slib.c"
-#ifdef UIM_COMPAT_SCM
-#include "uim-compat-scm.c"
-#endif
-
-static void siod_init_subr(const char *name, long type, SUBR_FUNC fcn);
-
 static uim_lisp true_sym;
 static uim_lisp false_sym;
 static uim_lisp protected_arg0;
@@ -270,7 +253,7 @@
 uim_bool
 uim_scm_consp(uim_lisp obj)
 {
-  return SCM_CONSP(SCM_CONS(obj));
+  return SCM_CONSP(obj);
 }
 
 uim_bool
@@ -461,38 +444,38 @@
 #endif
 
 void
-uim_scm_init_subr_0(const char *name, uim_lisp (*fcn)(void))
+uim_scm_init_subr_0(const char *name, uim_lisp (*func)(void))
 {
   Scm_InitSubr0(name, func);
 }
 
 void
-uim_scm_init_subr_1(const char *name, uim_lisp (*fcn)(uim_lisp))
+uim_scm_init_subr_1(const char *name, uim_lisp (*func)(uim_lisp))
 {
   Scm_InitSubr1(name, func);
 }
 
 void
-uim_scm_init_subr_2(const char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp))
+uim_scm_init_subr_2(const char *name, uim_lisp (*func)(uim_lisp, uim_lisp))
 {
   Scm_InitSubr2(name, func);
 }
 
 void
-uim_scm_init_subr_3(const char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp, uim_lisp))
+uim_scm_init_subr_3(const char *name, uim_lisp (*func)(uim_lisp, uim_lisp, uim_lisp))
 {
   Scm_InitSubr3(name, func);
 }
 
 void
-uim_scm_init_subr_4(const char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp, uim_lisp,
+uim_scm_init_subr_4(const char *name, uim_lisp (*func)(uim_lisp, uim_lisp, uim_lisp,
 						uim_lisp))
 {
   Scm_InitSubr4(name, func);
 }
 
 void
-uim_scm_init_subr_5(const char *name, uim_lisp (*fcn)(uim_lisp, uim_lisp, uim_lisp,
+uim_scm_init_subr_5(const char *name, uim_lisp (*func)(uim_lisp, uim_lisp, uim_lisp,
 						uim_lisp, uim_lisp))
 {
   Scm_InitSubr5(name, func);