mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-05-07 18:30:25 +02:00
Code Activity

(scm_i_index): Replaced SCM_STRINGP, SCM_STRING_CHARS, and

Browse source 
SCM_STRING_LENGTH with SCM_I_STRINGP, SCM_I_STRING_CHARS, and
SCM_I_STRING_LENGTH, respectively.  Pass string object directly, not
as a pointer.  Use scm_remember_upto_here_1 to protect it.
This commit is contained in:
Marius Vollmer 2004-08-10 14:05:14 +00:00
parent 7f03f97036
commit 7fd0a36919
1 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

28
libguile/strop.c
View file

@ -48,7 +48,7 @@ xSCM_DEFINE (scm_i_index, "i-index", 2, 2, 0,
*/ */
/* implements index if direction > 0 otherwise rindex. */ /* implements index if direction > 0 otherwise rindex. */
static long static long
scm_i_index (SCM *str, SCM chr, int direction, SCM sub_start, scm_i_index (SCM str, SCM chr, int direction, SCM sub_start,
SCM sub_end, const char *why) SCM sub_end, const char *why)
{ {
unsigned char * p; unsigned char * p;
@ -57,38 +57,42 @@ scm_i_index (SCM *str, SCM chr, int direction, SCM sub_start,
long upper; long upper;
int ch; int ch;
SCM_ASSERT (SCM_STRINGP (*str), *str, SCM_ARG1, why); SCM_ASSERT (SCM_I_STRINGP (str), str, SCM_ARG1, why);
SCM_ASSERT (SCM_CHARP (chr), chr, SCM_ARG2, why); SCM_ASSERT (SCM_CHARP (chr), chr, SCM_ARG2, why);
if (scm_is_false (sub_start)) if (scm_is_false (sub_start))
lower = 0; lower = 0;
else else
lower = scm_to_signed_integer (sub_start, 0, SCM_STRING_LENGTH(*str)); lower = scm_to_signed_integer (sub_start, 0, SCM_I_STRING_LENGTH(str));
if (scm_is_false (sub_end)) if (scm_is_false (sub_end))
upper = SCM_STRING_LENGTH (*str); upper = SCM_I_STRING_LENGTH (str);
else else
upper = scm_to_signed_integer (sub_end, lower, SCM_STRING_LENGTH(*str)); upper = scm_to_signed_integer (sub_end, lower, SCM_I_STRING_LENGTH(str));
x = -1;
if (direction > 0) if (direction > 0)
{ {
p = SCM_STRING_UCHARS (*str) + lower; p = SCM_I_STRING_UCHARS (str) + lower;
ch = SCM_CHAR (chr); ch = SCM_CHAR (chr);
for (x = lower; x < upper; ++x, ++p) for (x = lower; x < upper; ++x, ++p)
if (*p == ch) if (*p == ch)
return x; goto found_it;
} }
else else
{ {
p = upper - 1 + SCM_STRING_UCHARS (*str); p = upper - 1 + SCM_I_STRING_UCHARS (str);
ch = SCM_CHAR (chr); ch = SCM_CHAR (chr);
for (x = upper - 1; x >= lower; --x, --p) for (x = upper - 1; x >= lower; --x, --p)
if (*p == ch) if (*p == ch)
return x; goto found_it;
} }
return -1; found_it:
scm_remember_upto_here_1 (str);
return x;
} }
SCM_DEFINE (scm_string_index, "string-index", 2, 2, 0, SCM_DEFINE (scm_string_index, "string-index", 2, 2, 0,
@ -115,7 +119,7 @@ SCM_DEFINE (scm_string_index, "string-index", 2, 2, 0,
frm = SCM_BOOL_F; frm = SCM_BOOL_F;
if (SCM_UNBNDP (to)) if (SCM_UNBNDP (to))
to = SCM_BOOL_F; to = SCM_BOOL_F;
pos = scm_i_index (&str, chr, 1, frm, to, FUNC_NAME); pos = scm_i_index (str, chr, 1, frm, to, FUNC_NAME);
return (pos < 0 return (pos < 0
? SCM_BOOL_F ? SCM_BOOL_F
: scm_from_long (pos)); : scm_from_long (pos));
@ -145,7 +149,7 @@ SCM_DEFINE (scm_string_rindex, "string-rindex", 2, 2, 0,
frm = SCM_BOOL_F; frm = SCM_BOOL_F;
if (SCM_UNBNDP (to)) if (SCM_UNBNDP (to))
to = SCM_BOOL_F; to = SCM_BOOL_F;
pos = scm_i_index (&str, chr, -1, frm, to, FUNC_NAME); pos = scm_i_index (str, chr, -1, frm, to, FUNC_NAME);
return (pos < 0 return (pos < 0
? SCM_BOOL_F ? SCM_BOOL_F
: scm_from_long (pos)); : scm_from_long (pos));