1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-30 15:00:21 +02:00

(string-map): Swapped order of string and proc args to

conform with the srfi.  (Thanks to Alex Shinn.)
This commit is contained in:
Thien-Thi Nguyen 2001-08-23 19:02:41 +00:00
parent b46629fe3a
commit fd8a9f4b35

View file

@ -2400,7 +2400,7 @@ SCM_DEFINE (scm_string_concatenate_reverse_shared, "string-concatenate-reverse/s
SCM_DEFINE (scm_string_map, "string-map", 2, 2, 0, SCM_DEFINE (scm_string_map, "string-map", 2, 2, 0,
(SCM s, SCM proc, SCM start, SCM end), (SCM proc, SCM s, SCM start, SCM end),
"@var{proc} is a char->char procedure, it is mapped over\n" "@var{proc} is a char->char procedure, it is mapped over\n"
"@var{s}. The order in which the procedure is applied to the\n" "@var{s}. The order in which the procedure is applied to the\n"
"string elements is not specified.") "string elements is not specified.")
@ -2410,10 +2410,10 @@ SCM_DEFINE (scm_string_map, "string-map", 2, 2, 0,
int cstart, cend; int cstart, cend;
SCM result; SCM result;
SCM_VALIDATE_SUBSTRING_SPEC_COPY (1, s, cstr, SCM_VALIDATE_PROC (1, proc);
SCM_VALIDATE_SUBSTRING_SPEC_COPY (2, s, cstr,
3, start, cstart, 3, start, cstart,
4, end, cend); 4, end, cend);
SCM_VALIDATE_PROC (2, proc);
result = scm_allocate_string (cend - cstart); result = scm_allocate_string (cend - cstart);
p = SCM_STRING_CHARS (result); p = SCM_STRING_CHARS (result);
while (cstart < cend) while (cstart < cend)
@ -2430,7 +2430,7 @@ SCM_DEFINE (scm_string_map, "string-map", 2, 2, 0,
SCM_DEFINE (scm_string_map_x, "string-map!", 2, 2, 0, SCM_DEFINE (scm_string_map_x, "string-map!", 2, 2, 0,
(SCM s, SCM proc, SCM start, SCM end), (SCM proc, SCM s, SCM start, SCM end),
"@var{proc} is a char->char procedure, it is mapped over\n" "@var{proc} is a char->char procedure, it is mapped over\n"
"@var{s}. The order in which the procedure is applied to the\n" "@var{s}. The order in which the procedure is applied to the\n"
"string elements is not specified. The string @var{s} is\n" "string elements is not specified. The string @var{s} is\n"
@ -2440,10 +2440,10 @@ SCM_DEFINE (scm_string_map_x, "string-map!", 2, 2, 0,
char * cstr, *p; char * cstr, *p;
int cstart, cend; int cstart, cend;
SCM_VALIDATE_SUBSTRING_SPEC_COPY (1, s, cstr, SCM_VALIDATE_PROC (1, proc);
SCM_VALIDATE_SUBSTRING_SPEC_COPY (2, s, cstr,
3, start, cstart, 3, start, cstart,
4, end, cend); 4, end, cend);
SCM_VALIDATE_PROC (2, proc);
p = SCM_STRING_CHARS (s) + cstart; p = SCM_STRING_CHARS (s) + cstart;
while (cstart < cend) while (cstart < cend)
{ {