mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-22 20:40:29 +02:00
Code Activity

* Fix parameter error reporting and avoid redundant parameter checks.

Browse source
This commit is contained in:
Dirk Herrmann 2001-01-26 18:04:32 +00:00
parent 13070bd3b0
commit a49af0c0f7
2 changed files with 95 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

15
libguile/ChangeLog
View file

@ -1,3 +1,18 @@
2001-01-26 Dirk Herrmann <D.Herrmann@tu-bs.de>
The following patch was sent by Martin Grabmueller. It makes sure
that in case of parameter errors the correct function name is
shown, and that parameter types are only checked once.
* strop.c (string_copy, string_upcase_x, string_downcase_x,
string_capitalize_x): New functions. Each one performs the core
functionality of the corresponding scm_* function.
(scm_string_copy, scm_string_upcase_x, scm_string_upcase,
scm_string_downcase_x, scm_string_downcase,
scm_string_capitalize_x, scm_string_capitalize): Reduced to
parameter checking wrappers of the above functions.
2001-01-26 Dirk Herrmann <D.Herrmann@tu-bs.de>
* continuations.c, dynl.c, keywords.c, load.c: Include

99
libguile/strop.c
View file

@ -330,6 +330,14 @@ SCM_DEFINE (scm_string_to_list, "string->list", 1, 0, 0,
#undef FUNC_NAME
/* Helper function for the string copy and string conversion functions.
* No argument checking is performed. */
static SCM
string_copy (SCM str)
{
return scm_makfromstr (SCM_STRING_CHARS (str), SCM_STRING_LENGTH (str), 0);
}
SCM_DEFINE (scm_string_copy, "string-copy", 1, 0, 0,
(SCM str),
@ -337,7 +345,8 @@ SCM_DEFINE (scm_string_copy, "string-copy", 1, 0, 0,
#define FUNC_NAME s_scm_string_copy
{
SCM_VALIDATE_STRING (1, str);
return scm_makfromstr (SCM_STRING_CHARS (str), SCM_STRING_LENGTH (str), 0);
return string_copy (str);
}
#undef FUNC_NAME
@ -357,8 +366,23 @@ SCM_DEFINE (scm_string_fill_x, "string-fill!", 2, 0, 0,
}
#undef FUNC_NAME
/* Helper function for the string uppercase conversion functions.
* No argument checking is performed. */
static SCM
string_upcase_x (SCM v)
{
unsigned long k;
for (k = 0; k < SCM_STRING_LENGTH (v); ++k)
SCM_STRING_UCHARS (v) [k] = scm_upcase (SCM_STRING_UCHARS (v) [k]);
return v;
}
SCM_DEFINE (scm_string_upcase_x, "string-upcase!", 1, 0, 0,
(SCM v),
(SCM str),
"Destructively upcase every character in @code{str}.\n\n"
"(qdocs:) Converts each element in @var{str} to upper case.\n\n"
"@example\n"
@ -369,28 +393,41 @@ SCM_DEFINE (scm_string_upcase_x, "string-upcase!", 1, 0, 0,
"@end example")
#define FUNC_NAME s_scm_string_upcase_x
{
unsigned long k;
SCM_VALIDATE_STRING (1, str);
SCM_VALIDATE_STRING (1, v);
for (k = 0; k < SCM_STRING_LENGTH (v); ++k)
SCM_STRING_UCHARS (v) [k] = scm_upcase (SCM_STRING_UCHARS (v) [k]);
return v;
return string_upcase_x (str);
}
#undef FUNC_NAME
SCM_DEFINE (scm_string_upcase, "string-upcase", 1, 0, 0,
(SCM str),
"Upcase every character in @code{str}.")
#define FUNC_NAME s_scm_string_upcase
{
return scm_string_upcase_x(scm_string_copy(str));
SCM_VALIDATE_STRING (1, str);
return string_upcase_x (string_copy (str));
}
#undef FUNC_NAME
/* Helper function for the string lowercase conversion functions.
* No argument checking is performed. */
static SCM
string_downcase_x (SCM v)
{
unsigned long k;
for (k = 0; k < SCM_STRING_LENGTH (v); ++k)
SCM_STRING_UCHARS (v) [k] = scm_downcase (SCM_STRING_UCHARS (v) [k]);
return v;
}
SCM_DEFINE (scm_string_downcase_x, "string-downcase!", 1, 0, 0,
(SCM v),
(SCM str),
"Destructively downcase every character in @code{str}.\n\n"
"(qdocs:) Converts each element in @var{str} to lower case.\n\n"
"@example\n"
@ -403,35 +440,33 @@ SCM_DEFINE (scm_string_downcase_x, "string-downcase!", 1, 0, 0,
"@end example")
#define FUNC_NAME s_scm_string_downcase_x
{
unsigned long k;
SCM_VALIDATE_STRING (1, str);
SCM_VALIDATE_STRING (1, v);
for (k = 0; k < SCM_STRING_LENGTH (v); ++k)
SCM_STRING_UCHARS (v) [k] = scm_downcase (SCM_STRING_UCHARS (v) [k]);
return v;
return string_downcase_x (str);
}
#undef FUNC_NAME
SCM_DEFINE (scm_string_downcase, "string-downcase", 1, 0, 0,
(SCM str),
"Downcase every character in @code{str}.")
#define FUNC_NAME s_scm_string_downcase
{
SCM_VALIDATE_STRING (1, str);
return scm_string_downcase_x(scm_string_copy(str));
return string_downcase_x (string_copy (str));
}
#undef FUNC_NAME
SCM_DEFINE (scm_string_capitalize_x, "string-capitalize!", 1, 0, 0,
(SCM str),
"Destructively capitalize every character in @code{str}.")
#define FUNC_NAME s_scm_string_capitalize_x
/* Helper function for the string capitalization functions.
* No argument checking is performed. */
static SCM
string_capitalize_x (SCM str)
{
char *sz;
int i, len, in_word=0;
SCM_VALIDATE_STRING (1,str);
len = SCM_STRING_LENGTH(str);
sz = SCM_STRING_CHARS (str);
for(i=0; i<len; i++) {
@ -447,18 +482,32 @@ SCM_DEFINE (scm_string_capitalize_x, "string-capitalize!", 1, 0, 0,
}
return str;
}
SCM_DEFINE (scm_string_capitalize_x, "string-capitalize!", 1, 0, 0,
(SCM str),
"Destructively capitalize every character in @code{str}.")
#define FUNC_NAME s_scm_string_capitalize_x
{
SCM_VALIDATE_STRING (1, str);
return string_capitalize_x (str);
}
#undef FUNC_NAME
SCM_DEFINE (scm_string_capitalize, "string-capitalize", 1, 0, 0,
(SCM str),
"Capitalize every character in @code{str}.")
#define FUNC_NAME s_scm_string_capitalize
{
SCM_VALIDATE_STRING (1, str);
return scm_string_capitalize_x(scm_string_copy(str));
return string_capitalize_x (string_copy (str));
}
#undef FUNC_NAME
SCM_DEFINE (scm_string_ci_to_symbol, "string-ci->symbol", 1, 0, 0,
(SCM str),
"Return the symbol whose name is @var{str}, downcased in necessary(???).")