[uim-commit] r2669 - branches/r5rs/sigscheme
yamaken at freedesktop.org
yamaken at freedesktop.org
Tue Dec 20 06:37:21 PST 2005
Author: yamaken
Date: 2005-12-20 06:37:16 -0800 (Tue, 20 Dec 2005)
New Revision: 2669
Modified:
branches/r5rs/sigscheme/sigscheme.h
branches/r5rs/sigscheme/storage-compact.h
branches/r5rs/sigscheme/storage-fatty.h
Log:
* sigscheme/sigscheme.h
- (SCM_MAKE_INT, SCM_MAKE_CONS, SCM_MAKE_SYMBOL, SCM_MAKE_CHAR,
SCM_MAKE_STRING, SCM_MAKE_STRING_COPYING,
SCM_MAKE_IMMUTABLE_STRING, SCM_MAKE_IMMUTABLE_STRING_COPYING,
SCM_MAKE_FUNC, SCM_MAKE_CLOSURE, SCM_MAKE_VECTOR, SCM_MAKE_PORT,
SCM_MAKE_CONTINUATION, SCM_MAKE_C_POINTER, SCM_MAKE_C_FUNCPOINTER,
SCM_MAKE_VALUEPACKET): Make explicitly argumented
- (scm_make_cons, scm_make_int, scm_make_symbol, scm_make_char,
scm_make_immutable_string, scm_make_immutable_string_copying,
scm_make_string, scm_make_string_copying, scm_make_func,
scm_make_closure, scm_make_vector, scm_make_port,
scm_make_continuation, scm_make_value_packet, scm_make_cpointer,
scm_make_cfunc_pointer): Move to storage-*.h
* sigscheme/storage-fatty.h
- (scm_make_cons, scm_make_int, scm_make_symbol, scm_make_char,
scm_make_immutable_string, scm_make_immutable_string_copying,
scm_make_string, scm_make_string_copying, scm_make_func,
scm_make_closure, scm_make_vector, scm_make_port,
scm_make_continuation, scm_make_value_packet, scm_make_cpointer,
scm_make_cfunc_pointer): Moved from sigscheme.h
* sigscheme/storage-compact.h
- (scm_make_cons, scm_make_int, scm_make_symbol, scm_make_char,
scm_make_immutable_string, scm_make_immutable_string_copying,
scm_make_string, scm_make_string_copying, scm_make_func,
scm_make_closure, scm_make_vector, scm_make_port,
scm_make_continuation, scm_make_value_packet, scm_make_cpointer,
scm_make_cfunc_pointer): Moved from sigscheme.h
Modified: branches/r5rs/sigscheme/sigscheme.h
===================================================================
--- branches/r5rs/sigscheme/sigscheme.h 2005-12-20 14:01:27 UTC (rev 2668)
+++ branches/r5rs/sigscheme/sigscheme.h 2005-12-20 14:37:16 UTC (rev 2669)
@@ -309,25 +309,29 @@
Object Creators
=======================================*/
#define SCM_MAKE_BOOL(x) ((x) ? SCM_TRUE : SCM_FALSE)
-/* FIXME: define arguments */
-#define SCM_MAKE_INT SCM_SAL_MAKE_INT
-#define SCM_MAKE_CONS SCM_SAL_MAKE_CONS
-#define SCM_MAKE_SYMBOL SCM_SAL_MAKE_SYMBOL
-#define SCM_MAKE_CHAR SCM_SAL_MAKE_CHAR
-#define SCM_MAKE_STRING SCM_SAL_MAKE_STRING
-#define SCM_MAKE_STRING_COPYING SCM_SAL_MAKE_STRING_COPYING
-#define SCM_MAKE_IMMUTABLE_STRING SCM_SAL_MAKE_IMMUTABLE_STRING
-#define SCM_MAKE_IMMUTABLE_STRING_COPYING SCM_SAL_MAKE_IMMUTABLE_STRING_COPYING
-#define SCM_MAKE_FUNC SCM_SAL_MAKE_FUNC
-#define SCM_MAKE_CLOSURE SCM_SAL_MAKE_CLOSURE
-#define SCM_MAKE_VECTOR SCM_SAL_MAKE_VECTOR
-#define SCM_MAKE_PORT SCM_SAL_MAKE_PORT
-#define SCM_MAKE_CONTINUATION SCM_SAL_MAKE_CONTINUATION
+#define SCM_MAKE_INT(val) SCM_SAL_MAKE_INT(val)
+#define SCM_MAKE_CONS(kar, kdr) SCM_SAL_MAKE_CONS(kar, kdr)
+#define SCM_MAKE_SYMBOL(name, val) SCM_SAL_MAKE_SYMBOL(name, val)
+#define SCM_MAKE_CHAR(val) SCM_SAL_MAKE_CHAR(val)
+#define SCM_MAKE_STRING(str) SCM_SAL_MAKE_STRING(str)
+#define SCM_MAKE_STRING_COPYING(str) SCM_SAL_MAKE_STRING_COPYING(str)
+#define SCM_MAKE_IMMUTABLE_STRING(str) SCM_SAL_MAKE_IMMUTABLE_STRING(str)
+#define SCM_MAKE_IMMUTABLE_STRING_COPYING(str) \
+ SCM_SAL_MAKE_IMMUTABLE_STRING_COPYING(str)
+/* SCM_MAKE_FUNC(enum ScmFuncTypeCode type, ScmFuncType func) */
+#define SCM_MAKE_FUNC(type, func) SCM_SAL_MAKE_FUNC(type, func)
+#define SCM_MAKE_CLOSURE(exp, env) SCM_SAL_MAKE_CLOSURE(exp, env)
+/* SCM_MAKE_VECTOR(ScmObj *vec, int len) */
+#define SCM_MAKE_VECTOR(vec, len) SCM_SAL_MAKE_VECTOR(vec, len)
+#define SCM_MAKE_PORT(cport, flag) SCM_SAL_MAKE_PORT(cport, flag)
+#define SCM_MAKE_CONTINUATION() SCM_SAL_MAKE_CONTINUATION()
#if SCM_USE_NONSTD_FEATURES
-#define SCM_MAKE_C_POINTER SCM_SAL_MAKE_C_POINTER
-#define SCM_MAKE_C_FUNCPOINTER SCM_SAL_MAKE_C_FUNCPOINTER
+/* SCM_MAKE_C_POINTER(void *ptr) */
+#define SCM_MAKE_C_POINTER(ptr) SCM_SAL_MAKE_C_POINTER(ptr)
+/* SCM_MAKE_C_FUNCPOINTER(ScmCFunc ptr) */
+#define SCM_MAKE_C_FUNCPOINTER(ptr) SCM_SAL_MAKE_C_FUNCPOINTER(ptr)
#endif /* SCM_USE_NONSTD_FEATURES */
-#define SCM_MAKE_VALUEPACKET SCM_SAL_MAKE_VALUEPACKET
+#define SCM_MAKE_VALUEPACKET(vals) SCM_SAL_MAKE_VALUEPACKET(vals)
/*=======================================
Object Accessors
@@ -672,30 +676,6 @@
void *scm_calloc(size_t number, size_t size);
void *scm_realloc(void *ptr, size_t size);
-/* storage.c */
-/* Don't use these functions directly. Use SCM_MAKE_*() or MAKE_*() instead to
- * allow flexible object allocation. */
-ScmObj scm_make_cons(ScmObj kar, ScmObj kdr);
-ScmObj scm_make_int(int val);
-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);
-ScmObj scm_make_string(char *str);
-ScmObj scm_make_string_copying(const char *str);
-ScmObj scm_make_func(enum ScmFuncTypeCode type, ScmFuncType func);
-ScmObj scm_make_closure(ScmObj exp, ScmObj env);
-ScmObj scm_make_vector(ScmObj *vec, int len);
-ScmObj scm_make_port(ScmCharPort *cport, enum ScmPortFlag flag);
-ScmObj scm_make_continuation(void);
-#if !SCM_USE_VALUECONS
-ScmObj scm_make_value_packet(ScmObj values);
-#endif
-#if SCM_USE_NONSTD_FEATURES
-ScmObj scm_make_cpointer(void *ptr);
-ScmObj scm_make_cfunc_pointer(ScmCFunc ptr);
-#endif
-
/* storage-gc.c */
void scm_gc_protect(ScmObj *var);
void scm_gc_unprotect(ScmObj *var);
Modified: branches/r5rs/sigscheme/storage-compact.h
===================================================================
--- branches/r5rs/sigscheme/storage-compact.h 2005-12-20 14:01:27 UTC (rev 2668)
+++ branches/r5rs/sigscheme/storage-compact.h 2005-12-20 14:37:16 UTC (rev 2669)
@@ -602,6 +602,32 @@
#endif /* SCM_USE_NONSTD_FEATURES */
#define SCM_SAL_MAKE_VALUEPACKET scm_make_value_packet
+/* Don't use these functions directly. Use SCM_MAKE_*() or MAKE_*() instead to
+ * allow flexible object allocation. */
+ScmObj scm_make_cons(ScmObj kar, ScmObj kdr);
+#if 1
+/* FIXME: directly create by SCM_SAL_MAKE_*() */
+ScmObj scm_make_int(int val);
+ScmObj scm_make_char(int val);
+#endif
+ScmObj scm_make_symbol(char *name, ScmObj val);
+ScmObj scm_make_immutable_string(char *str);
+ScmObj scm_make_immutable_string_copying(const char *str);
+ScmObj scm_make_string(char *str);
+ScmObj scm_make_string_copying(const char *str);
+ScmObj scm_make_func(enum ScmFuncTypeCode type, ScmFuncType func);
+ScmObj scm_make_closure(ScmObj exp, ScmObj env);
+ScmObj scm_make_vector(ScmObj *vec, int len);
+ScmObj scm_make_port(ScmCharPort *cport, enum ScmPortFlag flag);
+ScmObj scm_make_continuation(void);
+#if !SCM_USE_VALUECONS
+ScmObj scm_make_value_packet(ScmObj values);
+#endif
+#if SCM_USE_NONSTD_FEATURES
+ScmObj scm_make_cpointer(void *ptr);
+ScmObj scm_make_cfunc_pointer(ScmCFunc ptr);
+#endif
+
/*=======================================
Type Predicates
=======================================*/
Modified: branches/r5rs/sigscheme/storage-fatty.h
===================================================================
--- branches/r5rs/sigscheme/storage-fatty.h 2005-12-20 14:01:27 UTC (rev 2668)
+++ branches/r5rs/sigscheme/storage-fatty.h 2005-12-20 14:37:16 UTC (rev 2669)
@@ -162,6 +162,29 @@
#define SCM_SAL_MAKE_VALUEPACKET(vals) (scm_make_value_packet(vals))
#endif /* SCM_USE_VALUECONS */
+/* Don't use these functions directly. Use SCM_MAKE_*() or MAKE_*() instead to
+ * allow flexible object allocation. */
+ScmObj scm_make_cons(ScmObj kar, ScmObj kdr);
+ScmObj scm_make_int(int val);
+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);
+ScmObj scm_make_string(char *str);
+ScmObj scm_make_string_copying(const char *str);
+ScmObj scm_make_func(enum ScmFuncTypeCode type, ScmFuncType func);
+ScmObj scm_make_closure(ScmObj exp, ScmObj env);
+ScmObj scm_make_vector(ScmObj *vec, int len);
+ScmObj scm_make_port(ScmCharPort *cport, enum ScmPortFlag flag);
+ScmObj scm_make_continuation(void);
+#if !SCM_USE_VALUECONS
+ScmObj scm_make_value_packet(ScmObj values);
+#endif
+#if SCM_USE_NONSTD_FEATURES
+ScmObj scm_make_cpointer(void *ptr);
+ScmObj scm_make_cfunc_pointer(ScmCFunc ptr);
+#endif
+
/*=======================================
Accessors For Scheme Objects
=======================================*/
More information about the uim-commit
mailing list