guile/guile-core/srfi srfi-13.c

[Thien-Thi Nguyen]

CVSROOT:        /cvs
Module name:    guile
Branch:         branch_release-1-6
Changes by:     Thien-Thi Nguyen <address@hidden>       01/08/23 12:02:41

Modified files:
        guile-core/srfi: srfi-13.c 

Log message:
        (string-map): Swapped order of string and proc args to
        conform with the srfi.  (Thanks to Alex Shinn.)

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/srfi/srfi-13.c.diff?cvsroot=OldCVS&only_with_tag=branch_release-1-6&tr1=1.11&tr2=1.11.2.1&r1=text&r2=text

Patches:
Index: guile/guile-core/srfi/srfi-13.c
diff -u guile/guile-core/srfi/srfi-13.c:1.11 
guile/guile-core/srfi/srfi-13.c:1.12
--- guile/guile-core/srfi/srfi-13.c:1.11        Thu Jun 28 09:39:00 2001
+++ guile/guile-core/srfi/srfi-13.c     Wed Aug 22 04:58:25 2001
@@ -2400,7 +2400,7 @@
 
 
 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{s}.  The order in which the procedure is applied to the\n"
            "string elements is not specified.")
@@ -2410,10 +2410,10 @@
   int cstart, cend;
   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,
                                    4, end, cend);
-  SCM_VALIDATE_PROC (2, proc);
   result = scm_allocate_string (cend - cstart);
   p = SCM_STRING_CHARS (result);
   while (cstart < cend)
@@ -2430,7 +2430,7 @@
 
 
 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{s}.  The order in which the procedure is applied to the\n"
            "string elements is not specified.  The string @var{s} is\n"
@@ -2440,10 +2440,10 @@
   char * cstr, *p;
   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,
                                    4, end, cend);
-  SCM_VALIDATE_PROC (2, proc);
   p = SCM_STRING_CHARS (s) + cstart;
   while (cstart < cend)
     {