summaryrefslogtreecommitdiff
path: root/libguile/strorder.c
diff options
context:
space:
mode:
authorDirk Herrmann <dirk@dirk-herrmanns-seiten.de>2001-01-24 18:07:29 +0000
committerDirk Herrmann <dirk@dirk-herrmanns-seiten.de>2001-01-24 18:07:29 +0000
commit3ba5a6c2f2be7ee559f336d96f923e490b4d145b (patch)
tree5eeef4a8bbd5985c7f8e77fea1be71175814e911 /libguile/strorder.c
parented6a2db9d7cd31d0b7483c5c7d6803e226439efb (diff)
downloadguile-3ba5a6c2f2be7ee559f336d96f923e490b4d145b.tar.gz
* Make sure that parameter errors are reported correctly.
Thanks to Martin Grabmueller for sending this patch.
Diffstat (limited to 'libguile/strorder.c')
-rw-r--r--libguile/strorder.c82
1 files changed, 59 insertions, 23 deletions
diff --git a/libguile/strorder.c b/libguile/strorder.c
index 815488a92..adea5de92 100644
--- a/libguile/strorder.c
+++ b/libguile/strorder.c
@@ -124,18 +124,14 @@ SCM_DEFINE1 (scm_string_ci_equal_p, "string-ci=?", scm_tc7_rpsubr,
#undef FUNC_NAME
-SCM_DEFINE1 (scm_string_less_p, "string<?", scm_tc7_rpsubr,
- (SCM s1, SCM s2),
- "Lexicographic ordering predicate; returns @t{#t} if @var{s1}\n"
- "is lexicographically less than @var{s2}. (r5rs)")
-#define FUNC_NAME s_scm_string_less_p
+/* Helper function for the lexicographic ordering predicates.
+ * No argument checking is performed. */
+static SCM
+string_less_p (SCM s1, SCM s2)
{
scm_sizet i, length1, length2, lengthm;
unsigned char *c1, *c2;
- SCM_VALIDATE_STRING (1, s1);
- SCM_VALIDATE_STRING (2, s2);
-
length1 = SCM_STRING_LENGTH (s1);
length2 = SCM_STRING_LENGTH (s2);
lengthm = min (length1, length2);
@@ -150,6 +146,19 @@ SCM_DEFINE1 (scm_string_less_p, "string<?", scm_tc7_rpsubr,
return SCM_BOOL (length1 < length2);
}
+
+
+SCM_DEFINE1 (scm_string_less_p, "string<?", scm_tc7_rpsubr,
+ (SCM s1, SCM s2),
+ "Lexicographic ordering predicate; returns @t{#t} if @var{s1}\n"
+ "is lexicographically less than @var{s2}. (r5rs)")
+#define FUNC_NAME s_scm_string_less_p
+{
+ SCM_VALIDATE_STRING (1, s1);
+ SCM_VALIDATE_STRING (2, s2);
+
+ return string_less_p (s1, s2);
+}
#undef FUNC_NAME
@@ -159,7 +168,10 @@ SCM_DEFINE1 (scm_string_leq_p, "string<=?", scm_tc7_rpsubr,
"is lexicographically less than or equal to @var{s2}. (r5rs)")
#define FUNC_NAME s_scm_string_leq_p
{
- return SCM_BOOL_NOT (scm_string_less_p (s2, s1));
+ SCM_VALIDATE_STRING (1, s1);
+ SCM_VALIDATE_STRING (2, s2);
+
+ return SCM_BOOL_NOT (string_less_p (s2, s1));
}
#undef FUNC_NAME
@@ -170,7 +182,10 @@ SCM_DEFINE1 (scm_string_gr_p, "string>?", scm_tc7_rpsubr,
"is lexicographically greater than @var{s2}. (r5rs)")
#define FUNC_NAME s_scm_string_gr_p
{
- return scm_string_less_p (s2, s1);
+ SCM_VALIDATE_STRING (1, s1);
+ SCM_VALIDATE_STRING (2, s2);
+
+ return string_less_p (s2, s1);
}
#undef FUNC_NAME
@@ -181,24 +196,22 @@ SCM_DEFINE1 (scm_string_geq_p, "string>=?", scm_tc7_rpsubr,
"is lexicographically greater than or equal to @var{s2}. (r5rs)")
#define FUNC_NAME s_scm_string_geq_p
{
- return SCM_BOOL_NOT (scm_string_less_p (s1, s2));
+ SCM_VALIDATE_STRING (1, s1);
+ SCM_VALIDATE_STRING (2, s2);
+
+ return SCM_BOOL_NOT (string_less_p (s1, s2));
}
#undef FUNC_NAME
-SCM_DEFINE1 (scm_string_ci_less_p, "string-ci<?", scm_tc7_rpsubr,
- (SCM s1, SCM s2),
- "Case insensitive lexicographic ordering predicate; \n"
- "returns @t{#t} if @var{s1} is lexicographically less than\n"
- "@var{s2} regardless of case. (r5rs)")
-#define FUNC_NAME s_scm_string_ci_less_p
+/* Helper function for the case insensitive lexicographic ordering
+ * predicates. No argument checking is performed. */
+static SCM
+string_ci_less_p (SCM s1, SCM s2)
{
scm_sizet i, length1, length2, lengthm;
unsigned char *c1, *c2;
- SCM_VALIDATE_STRING (1, s1);
- SCM_VALIDATE_STRING (2, s2);
-
length1 = SCM_STRING_LENGTH (s1);
length2 = SCM_STRING_LENGTH (s2);
lengthm = min (length1, length2);
@@ -213,6 +226,20 @@ SCM_DEFINE1 (scm_string_ci_less_p, "string-ci<?", scm_tc7_rpsubr,
return SCM_BOOL (length1 < length2);
}
+
+
+SCM_DEFINE1 (scm_string_ci_less_p, "string-ci<?", scm_tc7_rpsubr,
+ (SCM s1, SCM s2),
+ "Case insensitive lexicographic ordering predicate; \n"
+ "returns @t{#t} if @var{s1} is lexicographically less than\n"
+ "@var{s2} regardless of case. (r5rs)")
+#define FUNC_NAME s_scm_string_ci_less_p
+{
+ SCM_VALIDATE_STRING (1, s1);
+ SCM_VALIDATE_STRING (2, s2);
+
+ return string_ci_less_p (s1, s2);
+}
#undef FUNC_NAME
@@ -223,7 +250,10 @@ SCM_DEFINE1 (scm_string_ci_leq_p, "string-ci<=?", scm_tc7_rpsubr,
"or equal to @var{s2} regardless of case. (r5rs)")
#define FUNC_NAME s_scm_string_ci_leq_p
{
- return SCM_BOOL_NOT (scm_string_ci_less_p (s2, s1));
+ SCM_VALIDATE_STRING (1, s1);
+ SCM_VALIDATE_STRING (2, s2);
+
+ return SCM_BOOL_NOT (string_ci_less_p (s2, s1));
}
#undef FUNC_NAME
@@ -235,7 +265,10 @@ SCM_DEFINE1 (scm_string_ci_gr_p, "string-ci>?", scm_tc7_rpsubr,
"@var{s2} regardless of case. (r5rs)")
#define FUNC_NAME s_scm_string_ci_gr_p
{
- return scm_string_ci_less_p (s2, s1);
+ SCM_VALIDATE_STRING (1, s1);
+ SCM_VALIDATE_STRING (2, s2);
+
+ return string_ci_less_p (s2, s1);
}
#undef FUNC_NAME
@@ -247,7 +280,10 @@ SCM_DEFINE1 (scm_string_ci_geq_p, "string-ci>=?", scm_tc7_rpsubr,
"or equal to @var{s2} regardless of case. (r5rs)")
#define FUNC_NAME s_scm_string_ci_geq_p
{
- return SCM_BOOL_NOT (scm_string_ci_less_p (s1, s2));
+ SCM_VALIDATE_STRING (1, s1);
+ SCM_VALIDATE_STRING (2, s2);
+
+ return SCM_BOOL_NOT (string_ci_less_p (s1, s2));
}
#undef FUNC_NAME