qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-02-16 17:01:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

[util] Rename set_size to set_count

Browse source 
After seeing set_size and thinking it redundant (thought it returned the
capacity of the set until I checked), I realized set_count would be a
much better name (set_count (node->successors) in qfcc does make much
more sense).
This commit is contained in:
Bill Currie 2021-07-27 11:52:21 +09:00
parent 05fa0538ab
commit 49c3dacbbc
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/QF/set.h
View file

@ -340,7 +340,7 @@ int set_is_member (const set_t *set, unsigned x) __attribute__((pure));
\return The number of (non-)members. Both empty sets and sets of
evertything will return 0.
*/
unsigned set_size (const set_t *set) __attribute__((pure));
unsigned set_count (const set_t *set) __attribute__((pure));
/** Find the first "member" of the set.

8
libs/ruamoko/rua_set.c
View file

@ -364,11 +364,11 @@ bi_set_is_member (progs_t *pr)
}
static void
bi_set_size (progs_t *pr)
bi_set_count (progs_t *pr)
{
bi_set_t *set = get_set (pr, __FUNCTION__, P_INT (pr, 0));
R_INT (pr) = set_size (set->set);
R_INT (pr) = set_count (set->set);
}
static void
@ -645,7 +645,7 @@ bi_i_Set__size (progs_t *pr)
PR_RESET_PARAMS (pr);
P_INT (pr, 0) = set_obj->set;
bi_set_size (pr);
bi_set_count (pr);
}
static void
@ -696,7 +696,7 @@ static builtin_t builtins[] = {
{"set_is_equivalent", bi_set_is_equivalent, -1},
{"set_is_subset", bi_set_is_subset, -1},
{"set_is_member", bi_set_is_member, -1},
{"set_size", bi_set_size, -1},
{"set_count", bi_set_count, -1},
{"set_first", bi_set_first, -1},
{"set_next", bi_set_next, -1},
{"set_as_string", bi_set_as_string, -1},

2
libs/util/set.c
View file

@ -551,7 +551,7 @@ set_is_member (const set_t *set, unsigned x)
}
unsigned
set_size (const set_t *set)
set_count (const set_t *set)
{
unsigned count = 0;
unsigned i;

2
ruamoko/include/Set.h
View file

@ -25,7 +25,7 @@ typedef struct set_iter_s *set_iter_t;
@extern int set_is_equivalent (set_t *s1, set_t *s2);
@extern int set_is_subset (set_t *set, set_t *sub);
@extern int set_is_member (set_t *set, unsigned x);
@extern unsigned set_size (set_t *set);
@extern unsigned set_count (set_t *set);
@extern set_iter_t *set_first (set_t *set);
@extern set_iter_t *set_next (set_iter_t *set_iter);
@extern string set_as_string (set_t *set);

2
ruamoko/lib/Set.r
View file

@ -20,7 +20,7 @@ int set_is_intersecting (set_t *s1, set_t *s2) = #0;
int set_is_equivalent (set_t *s1, set_t *s2) = #0;
int set_is_subset (set_t *set, set_t *sub) = #0;
int set_is_member (set_t *set, unsigned x) = #0;
unsigned set_size (set_t *set) = #0;
unsigned set_count (set_t *set) = #0;
set_iter_t *set_first (set_t *set) = #0;
set_iter_t *set_next (set_iter_t *set_iter) = #0;
string set_as_string (set_t *set) = #0;

4
tools/qfcc/source/flow.c
View file

@ -1300,12 +1300,12 @@ flow_find_successors (flowgraph_t *graph)
set_add (node->successors, graph->num_nodes + 1);
}
}
graph->num_edges += set_size (node->successors);
graph->num_edges += set_count (node->successors);
}
// set the successor for the entry dummy node to the real entry node
node = graph->nodes[graph->num_nodes];
set_add (node->successors, 0);
graph->num_edges += set_size (node->successors);
graph->num_edges += set_count (node->successors);
}
static void

2
tools/qfvis/source/qfvis.c
View file

@ -858,7 +858,7 @@ ClusterFlow (int clusternum)
set_add (visclusters, clusternum);
numvis = set_size (visclusters);
numvis = set_count (visclusters);
// expand to cluster->leaf PVS
ClusterFlowExpand (visclusters, outbuffer);