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

[kzk at freedesktop.org]

Author: kzk
Date: 2005-08-25 21:47:37 -0700 (Thu, 25 Aug 2005)
New Revision: 1325

Modified:
   branches/r5rs/uim/Makefile.am
   branches/r5rs/uim/uim-compat-scm.c
   branches/r5rs/uim/uim-scm.c
Log:
* rename SigScm_nil to SigScm_null

* uim/uim-compat-scm.c
  - (uim_scm_c_strs_into_list): use SigScm_null instead of SCM_NIL
* uim/uim-scm.c
  - (uim_scm_null_list, uim_scm_eval, uim_scm_apply): use SigScm_null
    instead of SigScm_nil
* uim/Makefile.am 
  - (uim_sh_LDADD, uim_module_manager_LDADD, uim_agent_LDADD): link
    against libsscm.la


Modified: branches/r5rs/uim/Makefile.am
===================================================================
--- branches/r5rs/uim/Makefile.am	2005-08-26 04:43:32 UTC (rev 1324)
+++ branches/r5rs/uim/Makefile.am	2005-08-26 04:47:37 UTC (rev 1325)
@@ -115,7 +115,7 @@
 uim_sh_LIBS =
 uim_sh_CPPFLAGS = $(uim_defs) -I$(top_srcdir)
 uim_sh_CFLAGS =
-uim_sh_LDADD = libuim.la
+uim_sh_LDADD = libuim.la $(top_builddir)/sigscheme/libsscm.la
 uim_sh_SOURCES = uim-sh.c
 if LIBEDIT
   uim_sh_CFLAGS += -DLIBEDIT
@@ -126,7 +126,7 @@
 uim_module_manager_LIBS =
 uim_module_manager_CPPFLAGS = $(uim_defs) -I$(top_srcdir) -DUIM_DATADIR=\""$(datadir)/uim"\"
 uim_module_manager_CFLAGS =
-uim_module_manager_LDADD = libuim.la
+uim_module_manager_LDADD = libuim.la $(top_builddir)/sigscheme/libsscm.la
 uim_module_manager_SOURCES = uim-module-manager.c
 if NEED_SETENV_C
 uim_module_manager_SOURCES += setenv.c
@@ -135,4 +135,4 @@
 noinst_PROGRAMS = uim-agent
 
 uim_agent_SOURCES = agent.c
-uim_agent_LDADD   = libuim.la
+uim_agent_LDADD   = libuim.la $(top_builddir)/sigscheme/libsscm.la

Modified: branches/r5rs/uim/uim-compat-scm.c
===================================================================
--- branches/r5rs/uim/uim-compat-scm.c	2005-08-26 04:43:32 UTC (rev 1324)
+++ branches/r5rs/uim/uim-compat-scm.c	2005-08-26 04:47:37 UTC (rev 1325)
@@ -138,8 +138,8 @@
 uim_lisp
 uim_scm_c_strs_into_list(int n_strs, const char *const *strs)
 {
-  uim_lisp lst = (uim_lisp)SCM_NIL;
-  uim_lisp str = (uim_lisp)SCM_NIL;
+  uim_lisp lst = (uim_lisp)SigScm_null;
+  uim_lisp str = (uim_lisp)SigScm_null;
   const char *c_str;
   int i;
 

Modified: branches/r5rs/uim/uim-scm.c
===================================================================
--- branches/r5rs/uim/uim-scm.c	2005-08-26 04:43:32 UTC (rev 1324)
+++ branches/r5rs/uim/uim-scm.c	2005-08-26 04:47:37 UTC (rev 1325)
@@ -241,7 +241,7 @@
 uim_lisp
 uim_scm_null_list(void)
 {
-  return (uim_lisp)SigScm_nil;
+  return (uim_lisp)SigScm_null;
 }
 
 uim_bool
@@ -305,7 +305,7 @@
   uim_lisp stack_start;
 
   uim_scm_gc_protect_stack(&stack_start);
-  ret = (uim_lisp)ScmOp_eval((ScmObj)obj, SigScm_nil);
+  ret = (uim_lisp)ScmOp_eval((ScmObj)obj, SigScm_null);
   uim_scm_gc_unprotect_stack(&stack_start);
   return ret;
 }
@@ -315,8 +315,8 @@
 uim_scm_apply(uim_lisp proc, uim_lisp args)
 {
   return (uim_lisp)ScmOp_apply(Scm_NewCons((ScmObj)proc,
-					   Scm_NewCons((ScmObj)args, SigScm_nil)),	
-			       SigScm_nil);
+					   Scm_NewCons((ScmObj)args, SigScm_null)),	
+			       SigScm_null);
 }
 
 uim_lisp
@@ -325,7 +325,7 @@
   /* TODO : fixme Kazuki Ohta <mover at hct.zaq.ne.jp> */
   return (uim_lisp)Scm_NewCons(SigScm_quote,
 			       Scm_NewCons((ScmObj)obj,
-					   SigScm_nil));
+					   SigScm_null));
 }
 #endif  /* UIM_SCM_EXTENDED_API */