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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-09-26 19:31:44 -0700 (Mon, 26 Sep 2005)
New Revision: 1604

Modified:
   branches/r5rs/sigscheme/sigscheme.c
   branches/r5rs/sigscheme/sigscheme.h
Log:
* sigscheme/sigscheme.h
* sigscheme/sigscheme.c
  - Move the positions of some functions to prepare subsequent
    work. No actual code changes are applied


Modified: branches/r5rs/sigscheme/sigscheme.c
===================================================================
--- branches/r5rs/sigscheme/sigscheme.c	2005-09-27 02:19:48 UTC (rev 1603)
+++ branches/r5rs/sigscheme/sigscheme.c	2005-09-27 02:31:44 UTC (rev 1604)
@@ -438,6 +438,58 @@
 /*===========================================================================
   Scheme Function Export Related Functions
 ===========================================================================*/
+/* Left for compatibility only.  To be removed after complete transition. */
+void Scm_RegisterFunc0(const char *name, ScmFuncType0 func)
+{
+    Scm_RegisterFunc(name, func, FUNCTYPE_0);
+}
+
+void Scm_RegisterFunc1(const char *name, ScmFuncType1 func)
+{
+    Scm_RegisterFunc(name, func, FUNCTYPE_1);
+}
+
+void Scm_RegisterFunc2(const char *name, ScmFuncType2 func)
+{
+    Scm_RegisterFunc(name, func, FUNCTYPE_2);
+}
+
+void Scm_RegisterFunc3(const char *name, ScmFuncType3 func)
+{
+    Scm_RegisterFunc(name, func, FUNCTYPE_3);
+}
+
+void Scm_RegisterFunc4(const char *name, ScmFuncType4 func)
+{
+    Scm_RegisterFunc(name, func, FUNCTYPE_4);
+}
+
+void Scm_RegisterFunc5(const char *name, ScmFuncType5 func)
+{
+    Scm_RegisterFunc(name, func, FUNCTYPE_5);
+}
+
+void Scm_RegisterFuncEvaledList(const char *name, ScmFuncTypeEvaledList func)
+{
+    Scm_RegisterFunc(name, func, FUNCTYPE_EVALED_LIST);
+}
+
+void Scm_RegisterFuncRawList(const char *name, ScmFuncTypeRawList func)
+{
+    Scm_RegisterFunc(name, func, FUNCTYPE_RAW_LIST);
+}
+
+void Scm_RegisterFuncRawListTailRec(const char *name, ScmFuncTypeRawListTailRec func)
+{
+    Scm_RegisterFunc(name, func, FUNCTYPE_RAW_LIST_TAIL_REC);
+}
+
+void Scm_RegisterFuncRawListWithTailFlag(const char *name, ScmFuncTypeRawListWithTailFlag func)
+{
+    Scm_RegisterFunc(name, func, FUNCTYPE_RAW_LIST_WITH_TAIL_FLAG);
+}
+
+/* New Interfaces */
 static int Scm_RegisterFunc(const char *name, ScmFuncType c_func, enum ScmFuncTypeCode type)
 {
     ScmObj sym  = Scm_Intern(name);
@@ -1335,55 +1387,3 @@
     Scm_RegisterFunc(name, func, SCM_PROCEDURE_VARIADIC_TAIL_REC | 15);
 }
 #endif
-
-
-/* Left for compatibility only.  To be removed after complete transition. */
-void Scm_RegisterFunc0(const char *name, ScmFuncType0 func)
-{
-    Scm_RegisterFunc(name, func, FUNCTYPE_0);
-}
-
-void Scm_RegisterFunc1(const char *name, ScmFuncType1 func)
-{
-    Scm_RegisterFunc(name, func, FUNCTYPE_1);
-}
-
-void Scm_RegisterFunc2(const char *name, ScmFuncType2 func)
-{
-    Scm_RegisterFunc(name, func, FUNCTYPE_2);
-}
-
-void Scm_RegisterFunc3(const char *name, ScmFuncType3 func)
-{
-    Scm_RegisterFunc(name, func, FUNCTYPE_3);
-}
-
-void Scm_RegisterFunc4(const char *name, ScmFuncType4 func)
-{
-    Scm_RegisterFunc(name, func, FUNCTYPE_4);
-}
-
-void Scm_RegisterFunc5(const char *name, ScmFuncType5 func)
-{
-    Scm_RegisterFunc(name, func, FUNCTYPE_5);
-}
-
-void Scm_RegisterFuncEvaledList(const char *name, ScmFuncTypeEvaledList func)
-{
-    Scm_RegisterFunc(name, func, FUNCTYPE_EVALED_LIST);
-}
-
-void Scm_RegisterFuncRawList(const char *name, ScmFuncTypeRawList func)
-{
-    Scm_RegisterFunc(name, func, FUNCTYPE_RAW_LIST);
-}
-
-void Scm_RegisterFuncRawListTailRec(const char *name, ScmFuncTypeRawListTailRec func)
-{
-    Scm_RegisterFunc(name, func, FUNCTYPE_RAW_LIST_TAIL_REC);
-}
-
-void Scm_RegisterFuncRawListWithTailFlag(const char *name, ScmFuncTypeRawListWithTailFlag func)
-{
-    Scm_RegisterFunc(name, func, FUNCTYPE_RAW_LIST_WITH_TAIL_FLAG);
-}

Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h	2005-09-27 02:19:48 UTC (rev 1603)
+++ branches/r5rs/sigscheme/sigscheme.h	2005-09-27 02:31:44 UTC (rev 1604)
@@ -171,6 +171,20 @@
 void SigScm_Initialize(void);
 void SigScm_Finalize(void);
 void Scm_DefineAlias(const char *newsym, const char *sym);
+
+/* For compatibility only; slated for removal. */
+void Scm_RegisterFunc0(const char *name, ScmFuncType0 func);
+void Scm_RegisterFunc1(const char *name, ScmFuncType1 func);
+void Scm_RegisterFunc2(const char *name, ScmFuncType2 func);
+void Scm_RegisterFunc3(const char *name, ScmFuncType3 func);
+void Scm_RegisterFunc4(const char *name, ScmFuncType4 func);
+void Scm_RegisterFunc5(const char *name, ScmFuncType5 func);
+void Scm_RegisterFuncEvaledList(const char *name, ScmFuncTypeEvaledList func);
+void Scm_RegisterFuncRawList(const char *name, ScmFuncTypeRawList func);
+void Scm_RegisterFuncRawListTailRec(const char *name, ScmFuncTypeRawListTailRec func);
+void Scm_RegisterFuncRawListWithTailFlag(const char *name, ScmFuncTypeRawListWithTailFlag func);
+
+/* Procedure/Syntax Registration */
 void Scm_RegisterReductionOperator(const char *name, ScmObj (*func)(ScmObj, ScmObj, enum ScmReductionState*));
 void Scm_RegisterSyntaxFixed0(const char *name, ScmObj (*func)(ScmObj));
 #if SCM_FUNCTYPE_MAND_MAX >= 1
@@ -541,18 +555,6 @@
 void Scm_RegisterProcedureVariadicTailRec15(const char *name, ScmObj (*func)(ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmObj, ScmEvalState*));
 #endif
 
-/* For compatibility only; slated for removal. */
-void Scm_RegisterFunc0(const char *name, ScmFuncType0 func);
-void Scm_RegisterFunc1(const char *name, ScmFuncType1 func);
-void Scm_RegisterFunc2(const char *name, ScmFuncType2 func);
-void Scm_RegisterFunc3(const char *name, ScmFuncType3 func);
-void Scm_RegisterFunc4(const char *name, ScmFuncType4 func);
-void Scm_RegisterFunc5(const char *name, ScmFuncType5 func);
-void Scm_RegisterFuncEvaledList(const char *name, ScmFuncTypeEvaledList func);
-void Scm_RegisterFuncRawList(const char *name, ScmFuncTypeRawList func);
-void Scm_RegisterFuncRawListTailRec(const char *name, ScmFuncTypeRawListTailRec func);
-void Scm_RegisterFuncRawListWithTailFlag(const char *name, ScmFuncTypeRawListWithTailFlag func);
-
 /* datas.c */
 void   SigScm_InitStorage(void);
 void   SigScm_FinalizeStorage(void);