* 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.
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);
{
SCM cs = SCM_CAR (rest);
long *cs_data;
+ int k;
SCM_VALIDATE_SMOB (argnum, cs, charset);
argnum++;
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;
}