[uim-commit] r2872 - branches/r5rs/sigscheme

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-01-09 08:53:13 -0800 (Mon, 09 Jan 2006)
New Revision: 2872

Modified:
   branches/r5rs/sigscheme/operations.c
Log:
* sigscheme/operations.c
  - (scm_p_eqvp, scm_p_equalp): Simplify


Modified: branches/r5rs/sigscheme/operations.c
===================================================================
--- branches/r5rs/sigscheme/operations.c	2006-01-09 16:46:36 UTC (rev 2871)
+++ branches/r5rs/sigscheme/operations.c	2006-01-09 16:53:13 UTC (rev 2872)
@@ -107,16 +107,12 @@
     switch (type) {
 #if !SCM_HAS_IMMEDIATE_INT
     case ScmInt:
-        if ((SCM_INT_VALUE(obj1) == SCM_INT_VALUE(obj2)))
-            return SCM_TRUE;
-        break;
+        return MAKE_BOOL(SCM_INT_VALUE(obj1) == SCM_INT_VALUE(obj2));
 #endif
 
 #if !SCM_HAS_IMMEDIATE_CHAR
     case ScmChar:
-        if ((SCM_CHAR_VALUE(obj1) == SCM_CHAR_VALUE(obj2)))
-            return SCM_TRUE;
-        break;
+        return MAKE_BOOL(SCM_CHAR_VALUE(obj1) == SCM_CHAR_VALUE(obj2));
 #endif
 
     default:
@@ -148,16 +144,12 @@
     switch (type) {
 #if !SCM_HAS_IMMEDIATE_INT
     case ScmInt:
-        if ((SCM_INT_VALUE(obj1) == SCM_INT_VALUE(obj2)))
-            return SCM_TRUE;
-        break;
+        return MAKE_BOOL(SCM_INT_VALUE(obj1) == SCM_INT_VALUE(obj2));
 #endif
 
 #if !SCM_HAS_IMMEDIATE_CHAR
     case ScmChar:
-        if ((SCM_CHAR_VALUE(obj1) == SCM_CHAR_VALUE(obj2)))
-            return SCM_TRUE;
-        break;
+        return MAKE_BOOL(SCM_CHAR_VALUE(obj1) == SCM_CHAR_VALUE(obj2));
 #endif
 
     case ScmString:
@@ -195,14 +187,12 @@
 
 #if SCM_USE_NONSTD_FEATURES
     case ScmCPointer:
-        if (SCM_C_POINTER_VALUE(obj1) == SCM_C_POINTER_VALUE(obj2))
-            return SCM_TRUE;
-        break;
+        return MAKE_BOOL(SCM_C_POINTER_VALUE(obj1)
+                         == SCM_C_POINTER_VALUE(obj2));
 
     case ScmCFuncPointer:
-        if (SCM_C_FUNCPOINTER_VALUE(obj1) == SCM_C_FUNCPOINTER_VALUE(obj2))
-            return SCM_TRUE;
-        break;
+        return MAKE_BOOL(SCM_C_FUNCPOINTER_VALUE(obj1)
+                         == SCM_C_FUNCPOINTER_VALUE(obj2));
 #endif
 
     default: