procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* data.c (bool_vector_binop_driver): Rename locals for sanity's sake.

Browse source 
The old names predated the API change that put destination at end.
This commit is contained in:
Paul Eggert 2013-11-18 11:31:05 -08:00
parent ec2c4ee6d2
commit 23e79746d1
2 changed files with 24 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/ChangeLog
View file

@ -1,5 +1,8 @@
2013-11-18 Paul Eggert <eggert@cs.ucla.edu>
* data.c (bool_vector_binop_driver): Rename locals for sanity's sake.
The old names predated the API change that put destination at end.
Improve API of recently-added bool vector functions (Bug#15912).
The old API had (bool-vector-count-matches A B)
and (bool-vector-count-matches-at A B I), which gave the

42
src/data.c
View file

@ -3018,62 +3018,62 @@ enum bool_vector_op { bool_vector_exclusive_or,
bool_vector_subsetp };
static Lisp_Object
bool_vector_binop_driver (Lisp_Object op1,
Lisp_Object op2,
bool_vector_binop_driver (Lisp_Object a,
Lisp_Object b,
Lisp_Object dest,
enum bool_vector_op op)
{
EMACS_INT nr_bits;
bits_word *adata, *bdata, *cdata;
bits_word *adata, *bdata, *destdata;
ptrdiff_t i = 0;
ptrdiff_t nr_words;
CHECK_BOOL_VECTOR (op1);
CHECK_BOOL_VECTOR (op2);
CHECK_BOOL_VECTOR (a);
CHECK_BOOL_VECTOR (b);
nr_bits = bool_vector_size (op1);
if (bool_vector_size (op2) != nr_bits)
wrong_length_argument (op1, op2, dest);
nr_bits = bool_vector_size (a);
if (bool_vector_size (b) != nr_bits)
wrong_length_argument (a, b, dest);
nr_words = bool_vector_words (nr_bits);
bdata = bool_vector_data (op1);
cdata = bool_vector_data (op2);
adata = bool_vector_data (a);
bdata = bool_vector_data (b);
if (NILP (dest))
{
dest = make_uninit_bool_vector (nr_bits);
adata = bool_vector_data (dest);
destdata = bool_vector_data (dest);
}
else
{
CHECK_BOOL_VECTOR (dest);
adata = bool_vector_data (dest);
destdata = bool_vector_data (dest);
if (bool_vector_size (dest) != nr_bits)
wrong_length_argument (op1, op2, dest);
wrong_length_argument (a, b, dest);
switch (op)
{
case bool_vector_exclusive_or:
while (adata[i] == (bdata[i] ^ cdata[i]))
while (destdata[i] == (adata[i] ^ bdata[i]))
if (! (++i < nr_words))
return Qnil;
break;
case bool_vector_subsetp:
case bool_vector_union:
while (adata[i] == (bdata[i] | cdata[i]))
while (destdata[i] == (adata[i] | bdata[i]))
if (! (++i < nr_words))
return Qnil;
break;
case bool_vector_intersection:
while (adata[i] == (bdata[i] & cdata[i]))
while (destdata[i] == (adata[i] & bdata[i]))
if (! (++i < nr_words))
return Qnil;
break;
case bool_vector_set_difference:
while (adata[i] == (bdata[i] &~ cdata[i]))
while (destdata[i] == (adata[i] &~ bdata[i]))
if (! (++i < nr_words))
return Qnil;
break;
@ -3084,7 +3084,7 @@ bool_vector_binop_driver (Lisp_Object op1,
{
case bool_vector_exclusive_or:
do
adata[i] = bdata[i] ^ cdata[i];
destdata[i] = adata[i] ^ bdata[i];
while (++i < nr_words);
break;
@ -3093,19 +3093,19 @@ bool_vector_binop_driver (Lisp_Object op1,
case bool_vector_union:
do
adata[i] = bdata[i] | cdata[i];
destdata[i] = adata[i] | bdata[i];
while (++i < nr_words);
break;
case bool_vector_intersection:
do
adata[i] = bdata[i] & cdata[i];
destdata[i] = adata[i] & bdata[i];
while (++i < nr_words);
break;
case bool_vector_set_difference:
do
adata[i] = bdata[i] &~ cdata[i];
destdata[i] = adata[i] &~ bdata[i];
while (++i < nr_words);
break;
}