qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-13 08:27:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix some errors in the set code.

Browse source 
I really need to write some unit tests for the set code, but with this (and
an uncommitted dags patch (still thinking about it)) ctf compiles.
This commit is contained in:
Bill Currie 2012-11-26 17:19:02 +09:00
parent 8e225cd726
commit e28aa0a5fb
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
tools/qfcc/source/set.c
View file

@ -46,7 +46,7 @@
#include "qfcc.h" #include "qfcc.h"
#include "set.h" #include "set.h"
#define BITS (sizeof (unsigned) * 8) #define BITS (sizeof (((set_t *) 0)->map[0]) * 8)
set_t *free_sets; set_t *free_sets;
set_iter_t *free_set_iters; set_iter_t *free_set_iters;
@ -101,9 +101,11 @@ set_expand (set_t *set, unsigned x)
if (x < set->size) if (x < set->size)
return; return;
size = (x + BITS - 1) & ~(BITS - 1); size = (x + BITS) & ~(BITS - 1);
set->map = malloc (size / 8); set->map = malloc (size / 8);
memcpy (set->map, map, set->size / 8); memcpy (set->map, map, set->size / 8);
memset (set->map + set->size / BITS, 0, (size - set->size) / 8);
set->size = size;
if (map != set->defmap) if (map != set->defmap)
free (map); free (map);
} }
@ -147,6 +149,8 @@ set_intersection (set_t *dst, const set_t *src)
set_expand (dst, size); set_expand (dst, size);
for (i = 0; i < src->size / BITS; i++) for (i = 0; i < src->size / BITS; i++)
dst->map[i] &= src->map[i]; dst->map[i] &= src->map[i];
for ( ; i < dst->size / BITS; i++)
dst->map[i] = 0;
return dst; return dst;
} }
@ -173,6 +177,8 @@ set_assign (set_t *dst, const set_t *src)
set_expand (dst, size); set_expand (dst, size);
for (i = 0; i < src->size / BITS; i++) for (i = 0; i < src->size / BITS; i++)
dst->map[i] = src->map[i]; dst->map[i] = src->map[i];
for ( ; i < dst->size / BITS; i++)
dst->map[i] = 0;
return dst; return dst;
} }
@ -263,14 +269,20 @@ set_is_subset (const set_t *set, const set_t *sub)
return 1; return 1;
} }
int static inline int
set_is_member (const set_t *set, unsigned x) _set_is_member (const set_t *set, unsigned x)
{ {
if (x >= set->size) if (x >= set->size)
return 0; return 0;
return (set->map[x / BITS] & (1 << (x % BITS))) != 0; return (set->map[x / BITS] & (1 << (x % BITS))) != 0;
} }
int
set_is_member (const set_t *set, unsigned x)
{
return _set_is_member (set, x);
}
unsigned unsigned
set_size (const set_t *set) set_size (const set_t *set)
{ {