[uim-commit] r3017 - branches/r5rs/sigscheme/src

[yamaken at freedesktop.org]

Author: yamaken
Date: 2006-01-29 11:07:59 -0800 (Sun, 29 Jan 2006)
New Revision: 3017

Modified:
   branches/r5rs/sigscheme/src/operations.c
   branches/r5rs/sigscheme/src/sigschemeinternal.h
Log:
* sigscheme/src/sigschemeinternal.h
  - (STRING_EQUALP): Moved from operations.c
* sigscheme/src/operations.c
  - (STRING_EQUALP): Move to sigschemeinternal.h


Modified: branches/r5rs/sigscheme/src/operations.c
===================================================================
--- branches/r5rs/sigscheme/src/operations.c	2006-01-29 18:56:05 UTC (rev 3016)
+++ branches/r5rs/sigscheme/src/operations.c	2006-01-29 19:07:59 UTC (rev 3017)
@@ -61,10 +61,7 @@
 =======================================*/
 #define EQVP(a, b)   (NFALSEP(scm_p_eqvp((a), (b))))
 #define EQUALP(a, b) (NFALSEP(scm_p_equalp((a), (b))))
-#define STRING_EQUALP(str1, str2)                                            \
-    (EQ((str1), (str2))                                                      \
-     || (SCM_STRING_LEN(str1) == SCM_STRING_LEN(str2)  /* rough rejection */ \
-         && strcmp(SCM_STRING_STR(str1), SCM_STRING_STR(str2)) == 0))
+
 #define STRING_CMP(str1, str2)                                               \
     (string_cmp(SCM_MANGLE(name), (str1), (str2), scm_false))
 #define STRING_CI_CMP(str1, str2)                                            \

Modified: branches/r5rs/sigscheme/src/sigschemeinternal.h
===================================================================
--- branches/r5rs/sigscheme/src/sigschemeinternal.h	2006-01-29 18:56:05 UTC (rev 3016)
+++ branches/r5rs/sigscheme/src/sigschemeinternal.h	2006-01-29 19:07:59 UTC (rev 3017)
@@ -380,6 +380,11 @@
 /* error handlings */
 #define SCM_ERR_HEADER "Error: "
 
+#define STRING_EQUALP(str1, str2)                                            \
+    (EQ((str1), (str2))                                                      \
+     || (SCM_STRING_LEN(str1) == SCM_STRING_LEN(str2)  /* rough rejection */ \
+         && strcmp(SCM_STRING_STR(str1), SCM_STRING_STR(str2)) == 0))
+
 /* result encoders for scm_length() */
 #define SCM_LISTLEN_ENCODE_DOTTED(len)   (-(len))
 #define SCM_LISTLEN_ENCODE_CIRCULAR(len) (SCM_INT_T_MIN)