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

[kzk at freedesktop.org]

Author: kzk
Date: 2005-08-18 08:53:49 -0700 (Thu, 18 Aug 2005)
New Revision: 1223

Modified:
   branches/r5rs/uim/uim-scm.c
Log:
* sigscheme/uim-scm.c
  - (uim_scm_eval, uim_scm_apply): pass SigScm_nil instead of NULL
  - (uim_scm_eval_c_string): strdup passed str
  - (uim_scm_require_file): use ScmOp_require instead of using
    UIM_EVAL_FSTRING1


Modified: branches/r5rs/uim/uim-scm.c
===================================================================
--- branches/r5rs/uim/uim-scm.c	2005-08-18 15:20:51 UTC (rev 1222)
+++ branches/r5rs/uim/uim-scm.c	2005-08-18 15:53:49 UTC (rev 1223)
@@ -305,7 +305,7 @@
   uim_lisp stack_start;
 
   uim_scm_gc_protect_stack(&stack_start);
-  ret = (uim_lisp)ScmOp_eval((ScmObj)obj, NULL);
+  ret = (uim_lisp)ScmOp_eval((ScmObj)obj, SigScm_nil);
   uim_scm_gc_unprotect_stack(&stack_start);
   return ret;
 }
@@ -316,7 +316,7 @@
 {
   return (uim_lisp)ScmOp_apply(Scm_NewCons((ScmObj)proc,
 					   Scm_NewCons((ScmObj)args, SigScm_nil)),	
-			       NULL);
+			       SigScm_nil);
 }
 
 uim_lisp
@@ -330,7 +330,7 @@
 uim_lisp
 uim_scm_eval_c_string(const char *str)
 {
-  return (uim_lisp)Scm_eval_c_string(str);
+  return (uim_lisp)Scm_eval_c_string(strdup(str));
 }
 
 uim_lisp
@@ -443,7 +443,7 @@
   if (!fn)
     return UIM_FALSE;
 
-  UIM_EVAL_FSTRING1(NULL, "(require \"%s\")", fn);
+  ScmOp_require(Scm_NewStringCopying(fn));
 
   /* TODO: fixme */
   return UIM_TRUE;