guile/guile-core/srfi ChangeLog srfi-14.c srfi-...

[Gary Houston]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Gary Houston <address@hidden>   01/07/16 15:30:25

Modified files:
        guile-core/srfi: ChangeLog srfi-14.c srfi-14.scm 

Log message:
        * srfi-14.scm: export string->char-set!, not string-char-set!.
        
        * srfi-14.c (scm_char_set_ref, scm_char_set_cursor_next,
        scm_end_of_char_set_p): reject negative cursor values.
        (scm_list_to_char_set, scm_list_to_char_set_x): when reporting
        type error in list component, omit the position (was always 1).

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/srfi/ChangeLog.diff?cvsroot=OldCVS&tr1=1.52&tr2=1.53&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/srfi/srfi-14.c.diff?cvsroot=OldCVS&tr1=1.15&tr2=1.16&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/srfi/srfi-14.scm.diff?cvsroot=OldCVS&tr1=1.5&tr2=1.6&r1=text&r2=text

Patches:
Index: guile/guile-core/srfi/ChangeLog
diff -u guile/guile-core/srfi/ChangeLog:1.52 
guile/guile-core/srfi/ChangeLog:1.53
--- guile/guile-core/srfi/ChangeLog:1.52        Mon Jul 16 11:51:11 2001
+++ guile/guile-core/srfi/ChangeLog     Mon Jul 16 15:30:25 2001
@@ -1,3 +1,12 @@
+2001-07-16  Gary Houston  <address@hidden>
+
+       * srfi-14.scm: export string->char-set!, not string-char-set!.
+
+       * srfi-14.c (scm_char_set_ref, scm_char_set_cursor_next,
+       scm_end_of_char_set_p): reject negative cursor values.
+       (scm_list_to_char_set, scm_list_to_char_set_x): when reporting
+       type error in list component, omit the position (was always 1).
+
 2001-07-16  Martin Grabmueller  <address@hidden>
 
        (scm_char_set_map): Bug-fix: char-set-map was modifying the
@@ -11,7 +20,7 @@
        more values.
 
 2001-07-15  Gary Houston  <address@hidden>
-
+       
        * srfi-14.c (scm_char_set_hash): recognise 0 instead of #f in the
        opt arg to give default bound, as in final spec.  don't allow
        negative bounds.
Index: guile/guile-core/srfi/srfi-14.c
diff -u guile/guile-core/srfi/srfi-14.c:1.15 
guile/guile-core/srfi/srfi-14.c:1.16
--- guile/guile-core/srfi/srfi-14.c:1.15        Mon Jul 16 11:51:11 2001
+++ guile/guile-core/srfi/srfi-14.c     Mon Jul 16 15:30:25 2001
@@ -241,7 +241,7 @@
   int ccursor;
 
   SCM_VALIDATE_SMOB (1, cs, charset);
-  SCM_VALIDATE_INUM_COPY (2, cursor, ccursor);
+  SCM_VALIDATE_INUM_MIN_COPY (2, cursor, 0, ccursor);
 
   if (ccursor >= SCM_CHARSET_SIZE || !SCM_CHARSET_GET (cs, ccursor))
     SCM_MISC_ERROR ("invalid character set cursor: ~A", scm_list_1 (cursor));
@@ -260,7 +260,7 @@
   int ccursor;
 
   SCM_VALIDATE_SMOB (1, cs, charset);
-  SCM_VALIDATE_INUM_COPY (2, cursor, ccursor);
+  SCM_VALIDATE_INUM_MIN_COPY (2, cursor, 0, ccursor);
 
   if (ccursor >= SCM_CHARSET_SIZE || !SCM_CHARSET_GET (cs, ccursor))
     SCM_MISC_ERROR ("invalid character set cursor: ~A", scm_list_1 (cursor));
@@ -282,7 +282,7 @@
 {
   int ccursor;
 
-  SCM_VALIDATE_INUM_COPY (1, cursor, ccursor);
+  SCM_VALIDATE_INUM_MIN_COPY (1, cursor, 0, ccursor);
   return SCM_BOOL (ccursor >= SCM_CHARSET_SIZE);
 }
 #undef FUNC_NAME
@@ -507,7 +507,7 @@
       SCM chr = SCM_CAR (list);
       int c;
 
-      SCM_VALIDATE_CHAR_COPY (1, chr, c);
+      SCM_VALIDATE_CHAR_COPY (0, chr, c);
       list = SCM_CDR (list);
 
       p[c / sizeof (long)] |= 1 << (c % sizeof (long));
@@ -534,7 +534,7 @@
       SCM chr = SCM_CAR (list);
       int c;
 
-      SCM_VALIDATE_CHAR_COPY (1, chr, c);
+      SCM_VALIDATE_CHAR_COPY (0, chr, c);
       list = SCM_CDR (list);
 
       p[c / sizeof (long)] |= 1 << (c % sizeof (long));
Index: guile/guile-core/srfi/srfi-14.scm
diff -u guile/guile-core/srfi/srfi-14.scm:1.5 
guile/guile-core/srfi/srfi-14.scm:1.6
--- guile/guile-core/srfi/srfi-14.scm:1.5       Sun Jun  3 16:33:31 2001
+++ guile/guile-core/srfi/srfi-14.scm   Mon Jul 16 15:30:25 2001
@@ -64,7 +64,7 @@
  char-set-copy
  char-set
  list->char-set list->char-set!
- string->char-set string-char-set!
+ string->char-set string->char-set!
  char-set-filter char-set-filter!
  ucs-range->char-set ucs-range->char-set!
  ->char-set