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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-12-20 05:54:59 -0800 (Tue, 20 Dec 2005)
New Revision: 2667

Modified:
   branches/r5rs/sigscheme/sigscheme.h
   branches/r5rs/sigscheme/storage.c
Log:
* sigscheme/sigscheme.h
  - (scm_make_cons, scm_make_symbol, scm_make_cpointer,
    scm_make_cfunc_pointer): Rename args
* sigscheme/storage.c
  - (scm_make_cons, scm_make_symbol, scm_make_cpointer,
    scm_make_cfunc_pointer): Ditto


Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h	2005-12-20 13:41:44 UTC (rev 2666)
+++ branches/r5rs/sigscheme/sigscheme.h	2005-12-20 13:54:59 UTC (rev 2667)
@@ -675,10 +675,9 @@
 /* storage.c */
 /* Don't use these functions directly. Use SCM_MAKE_*() or MAKE_*() instead to
  * allow flexible object allocation. */
-/* FIXME: rename to scm_make_*() */
-ScmObj scm_make_cons(ScmObj a, ScmObj b);
+ScmObj scm_make_cons(ScmObj kar, ScmObj kdr);
 ScmObj scm_make_int(int val);
-ScmObj scm_make_symbol(char *name, ScmObj v_cell);
+ScmObj scm_make_symbol(char *name, ScmObj val);
 ScmObj scm_make_char(int val);
 ScmObj scm_make_immutable_string(char *str);
 ScmObj scm_make_immutable_string_copying(const char *str);
@@ -693,8 +692,8 @@
 ScmObj scm_make_value_packet(ScmObj values);
 #endif
 #if SCM_USE_NONSTD_FEATURES
-ScmObj scm_make_cpointer(void *data);
-ScmObj scm_make_cfunc_pointer(ScmCFunc func);
+ScmObj scm_make_cpointer(void *ptr);
+ScmObj scm_make_cfunc_pointer(ScmCFunc ptr);
 #endif
 
 /* storage-gc.c */

Modified: branches/r5rs/sigscheme/storage.c
===================================================================
--- branches/r5rs/sigscheme/storage.c	2005-12-20 13:41:44 UTC (rev 2666)
+++ branches/r5rs/sigscheme/storage.c	2005-12-20 13:54:59 UTC (rev 2667)
@@ -151,13 +151,14 @@
   Object Allocators
 ===========================================================================*/
 ScmObj
-scm_make_cons(ScmObj a, ScmObj b)
+scm_make_cons(ScmObj kar, ScmObj kdr)
 {
-    ScmObj obj = scm_alloc_cell();
+    ScmObj obj;
 
+    obj = scm_alloc_cell();
     SCM_ENTYPE_CONS(obj);
-    SET_CAR(obj, a);
-    SET_CDR(obj, b);
+    SET_CAR(obj, kar);
+    SET_CDR(obj, kdr);
 
     return obj;
 }
@@ -178,13 +179,14 @@
 }
 
 ScmObj
-scm_make_symbol(char *name, ScmObj v_cell)
+scm_make_symbol(char *name, ScmObj val)
 {
-    ScmObj obj = scm_alloc_cell();
+    ScmObj obj;
 
+    obj = scm_alloc_cell();
     SCM_ENTYPE_SYMBOL(obj);
     SCM_SYMBOL_SET_NAME(obj, name);
-    SCM_SYMBOL_SET_VCELL(obj, v_cell);
+    SCM_SYMBOL_SET_VCELL(obj, val);
 
     return obj;
 }
@@ -326,23 +328,25 @@
 
 #if SCM_USE_NONSTD_FEATURES
 ScmObj
-scm_make_cpointer(void *data)
+scm_make_cpointer(void *ptr)
 {
-    ScmObj obj = scm_alloc_cell();
+    ScmObj obj;
 
+    obj = scm_alloc_cell();
     SCM_ENTYPE_C_POINTER(obj);
-    SCM_C_POINTER_SET_VALUE(obj, data);
+    SCM_C_POINTER_SET_VALUE(obj, ptr);
 
     return obj;
 }
 
 ScmObj
-scm_make_cfunc_pointer(ScmCFunc func)
+scm_make_cfunc_pointer(ScmCFunc ptr)
 {
-    ScmObj obj = scm_alloc_cell();
+    ScmObj obj;
 
+    obj = scm_alloc_cell();
     SCM_ENTYPE_C_FUNCPOINTER(obj);
-    SCM_C_FUNCPOINTER_SET_VALUE(obj, func);
+    SCM_C_FUNCPOINTER_SET_VALUE(obj, ptr);
 
     return obj;
 }