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

[yamaken at freedesktop.org]

Author: yamaken
Date: 2005-11-03 08:12:42 -0800 (Thu, 03 Nov 2005)
New Revision: 1980

Modified:
   branches/r5rs/uim/uim-scm.c
Log:
* uim/uim-scm.c
  - (uim_scm_nullp, uim_scm_consp, uim_scm_integerp, uim_scm_stringp,
    uim_scm_eq, uim_scm_string_equal): Simplify. See the definition
    about uim_bool in uim.h to check the validness


Modified: branches/r5rs/uim/uim-scm.c
===================================================================
--- branches/r5rs/uim/uim-scm.c	2005-11-03 16:08:22 UTC (rev 1979)
+++ branches/r5rs/uim/uim-scm.c	2005-11-03 16:12:42 UTC (rev 1980)
@@ -361,55 +361,37 @@
 uim_bool
 uim_scm_nullp(uim_lisp obj)
 {
-  if (SCM_NULLP((ScmObj)obj))
-    return UIM_TRUE;
-
-  return UIM_FALSE;
+  return (SCM_NULLP((ScmObj)obj));
 }
 
 uim_bool
 uim_scm_consp(uim_lisp obj)
 {
-  if (SCM_CONSP((ScmObj)obj))
-    return UIM_TRUE;
-
-  return UIM_FALSE;  
+  return (SCM_CONSP((ScmObj)obj));
 }
 
 uim_bool
 uim_scm_integerp(uim_lisp obj)
 {
-  if (SCM_INTP((ScmObj)obj))
-    return UIM_TRUE;
-
-  return UIM_FALSE;  
+  return (SCM_INTP((ScmObj)obj));
 }
 
 uim_bool
 uim_scm_stringp(uim_lisp obj)
 {
-  if (SCM_STRINGP((ScmObj)obj))
-    return UIM_TRUE;
-
-  return UIM_FALSE;  
+  return (SCM_STRINGP((ScmObj)obj));
 }
 
 uim_bool
 uim_scm_eq(uim_lisp a, uim_lisp b)
 {
-  if (SCM_EQ((ScmObj)a, (ScmObj)b))
-    return UIM_TRUE;
-
-  return UIM_FALSE;
+  return (SCM_EQ((ScmObj)a, (ScmObj)b));
 }
 
 uim_bool
 uim_scm_string_equal(uim_lisp a, uim_lisp b)
 {
-  if (SCM_NFALSEP(ScmOp_stringequal((ScmObj)a, (ScmObj)b)))
-    return UIM_TRUE;
-
-  return UIM_FALSE;
+  return (SCM_NFALSEP(ScmOp_stringequal((ScmObj)a, (ScmObj)b)));
 }
 
 uim_lisp