Author: yamakenz
Date: Thu Jul 19 23:29:18 2007
New Revision: 4751
Modified:
trunk/doc/COMPATIBILITY
trunk/uim/uim-scm.c
trunk/uim/uim-scm.h
Log:
* uim/uim-scm.h
- (uim_scm_is_initialized): New function decl
- (uim_scm_gc_any_contextp): Fix uim_scm_is_alive() with
uim_scm_is_initialized()
* uim/uim-scm.c
- (uim_scm_is_initialized): New function
- (uim_scm_get_output, uim_scm_set_output): Fix uim_scm_is_alive()
with uim_scm_is_initialized(). Thanks No.784 of [uim thread 7]
* doc/COMPATIBILITY
- Record uim_scm_is_initialized()
Modified: trunk/doc/COMPATIBILITY
==============================================================================
--- trunk/doc/COMPATIBILITY (original)
+++ trunk/doc/COMPATIBILITY Thu Jul 19 23:29:18 2007
@@ -312,12 +312,13 @@
Affects: uim developers, IM developers
Updates: C API, libuim ABI
Version: 1.5.0
-Revision: ac4333, ac4334, ac4339, ac4347, ac4351-ac4353, ac4355, ac4444, ac4446
+Revision: ac4333, ac4334, ac4339, ac4347, ac4351-ac4353, ac4355, ac4444,
ac4446, ac4751
Date: 2007-01-09 -
Modifier: YamaKen
Related: SigScheme introduction to uim
URL:
Changes:
+ (new) uim_scm_is_initialized()
(new) uim_scm_ensure()
(new) uim_scm_symbolp()
(new) uim_scm_gc_protectedp()
Modified: trunk/uim/uim-scm.c
==============================================================================
--- trunk/uim/uim-scm.c (original)
+++ trunk/uim/uim-scm.c Thu Jul 19 23:29:18 2007
@@ -136,7 +136,8 @@
FILE *
uim_scm_get_output(void)
{
- assert(uim_scm_gc_any_contextp());
+ /* semantic assertion */
+ assert(!uim_scm_is_initialized() || uim_scm_is_initialized());
return uim_output;
}
@@ -144,7 +145,8 @@
void
uim_scm_set_output(FILE *fp)
{
- assert(uim_scm_gc_any_contextp());
+ /* semantic assertion */
+ assert(!uim_scm_is_initialized() || uim_scm_is_initialized());
uim_output = fp;
}
@@ -387,6 +389,12 @@
uim_scm_gc_protected_contextp(void)
{
return (initialized && scm_gc_protected_contextp());
+}
+
+uim_bool
+uim_scm_is_initialized(void)
+{
+ return initialized;
}
uim_bool
Modified: trunk/uim/uim-scm.h
==============================================================================
--- trunk/uim/uim-scm.h (original)
+++ trunk/uim/uim-scm.h Thu Jul 19 23:29:18 2007
@@ -85,6 +85,7 @@
void
uim_scm_set_output(FILE *fp);
+uim_bool uim_scm_is_initialized(void);
uim_bool
uim_scm_is_alive(void);
long
@@ -103,7 +104,7 @@
uim_bool uim_scm_gc_protected_contextp(void);
/* for semantic assertions */
#define uim_scm_gc_any_contextp() \
- (uim_scm_is_alive() \
+ (uim_scm_is_initialized() \
&& (!uim_scm_gc_protected_contextp() || uim_scm_gc_protected_contextp()))
/* evaluations */
