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

[Gary Houston]

CVSROOT:        /cvs
Module name:    guile
Changes by:     Gary Houston <address@hidden>   01/07/22 16:21:03

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

Log message:
        Reverse the n-ary logxor change.  The behaviour is weird in a set
        context, but consistent with logxor and scsh.  Maybe it should get
        the benefit of the doubt.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/srfi/ChangeLog.diff?cvsroot=OldCVS&tr1=1.58&tr2=1.59&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/guile/guile-core/srfi/srfi-14.c.diff?cvsroot=OldCVS&tr1=1.20&tr2=1.21&r1=text&r2=text

Patches:
Index: guile/guile-core/srfi/ChangeLog
diff -u guile/guile-core/srfi/ChangeLog:1.58 
guile/guile-core/srfi/ChangeLog:1.59
--- guile/guile-core/srfi/ChangeLog:1.58        Sun Jul 22 15:01:50 2001
+++ guile/guile-core/srfi/ChangeLog     Sun Jul 22 16:21:03 2001
@@ -2,10 +2,6 @@
 
        * srfi-14.c (scm_char_set_intersection, scm_char_set_xor): remove
        the compulsory cs1 arguments: all args are optional in final spec.
-       (scm_char_set_xor): bug fix: characters should only be included if
-       they occur in exactly one argument, but were included if they
-       occured an odd number of times >= 3, e.g, in (char-set-xor a a a)
-       where a is (char-set #\a).  fix it with a "mask" array.
 
        * srfi-14.h: declarations updated.
 
Index: guile/guile-core/srfi/srfi-14.c
diff -u guile/guile-core/srfi/srfi-14.c:1.20 
guile/guile-core/srfi/srfi-14.c:1.21
--- guile/guile-core/srfi/srfi-14.c:1.20        Sun Jul 22 15:01:50 2001
+++ guile/guile-core/srfi/srfi-14.c     Sun Jul 22 16:21:03 2001
@@ -1153,12 +1153,9 @@
     res = make_char_set (FUNC_NAME);
   else
     {
-      long * p;
       int argnum = 2;
-      long mask[LONGS_PER_CHARSET];
-      int k;
+      long * p;
 
-      memset (mask, 0, sizeof mask);
       res = scm_char_set_copy (SCM_CAR (rest));
       p = (long *) SCM_SMOB_DATA (res);
       rest = SCM_CDR (rest);
@@ -1167,6 +1164,7 @@
        {
          SCM cs = SCM_CAR (rest);
          long *cs_data;
+         int k;
 
          SCM_VALIDATE_SMOB (argnum, cs, charset);
          argnum++;
@@ -1174,14 +1172,8 @@
          rest = SCM_CDR (rest);
 
          for (k = 0; k < LONGS_PER_CHARSET; k++)
-           {
-             mask[k] |= p[k] & cs_data[k];
-             p[k] ^= cs_data[k];
-           }
+           p[k] ^= cs_data[k];
        }
-      /* avoid including characters that occur an odd number of times >= 3.  */
-      for (k = 0; k < LONGS_PER_CHARSET; k++)
-       p[k] &= ~mask[k];
     }
   return res;
 }