From d95744e9865c423588a884ef8effa0c4a204226a Mon Sep 17 00:00:00 2001 From: Gary Houston Date: Sun, 22 Jul 2001 23:21:03 +0000 Subject: [PATCH] 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. --- srfi/ChangeLog | 4 ---- srfi/srfi-14.c | 14 +++----------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/srfi/ChangeLog b/srfi/ChangeLog index 3a3937b29..b287451b2 100644 --- a/srfi/ChangeLog +++ b/srfi/ChangeLog @@ -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. diff --git a/srfi/srfi-14.c b/srfi/srfi-14.c index 8d628252a..8a7a7321a 100644 --- a/srfi/srfi-14.c +++ b/srfi/srfi-14.c @@ -1153,12 +1153,9 @@ SCM_DEFINE (scm_char_set_xor, "char-set-xor", 0, 0, 1, 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_DEFINE (scm_char_set_xor, "char-set-xor", 0, 0, 1, { SCM cs = SCM_CAR (rest); long *cs_data; + int k; SCM_VALIDATE_SMOB (argnum, cs, charset); argnum++; @@ -1174,14 +1172,8 @@ SCM_DEFINE (scm_char_set_xor, "char-set-xor", 0, 0, 1, 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; }