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

Make the set notation more correct.

Browse source 
The empty set is now {}, the set of everything is now {...} and the rest
now have {} around the members.
This commit is contained in:
Bill Currie 2012-12-09 22:17:55 +09:00
parent f3adb70ee4
commit 6473951daa
2 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
libs/util/set.c
View file

@ -564,24 +564,25 @@ set_as_string (const set_t *set)
if (!str)
str = dstring_new ();
dstring_clearstr (str);
if (set_is_empty (set)) {
dstring_copystr (str, "[empty]");
dstring_copystr (str, "{}");
return str->str;
}
if (set_is_everything (set)) {
dstring_copystr (str, "[everything]");
dstring_copystr (str, "{...}");
return str->str;
}
dstring_copystr (str, "{");
for (i = 0; i < set->size; i++) {
if (set_is_member (set, i)) {
if (str->str[0])
if (str->str[1])
dasprintf (str, " %d", i);
else
dsprintf (str, "%d", i);
dasprintf (str, "%d", i);
}
}
if (set->inverted)
dasprintf (str, "%s%d ...", str->str[0] ? " " : "", i);
dasprintf (str, "%s%d ...", str->str[1] ? " " : "", i);
dstring_appendstr (str, "}");
return str->str;
}

32
libs/util/test/test-set.c
View file

@ -116,23 +116,23 @@ struct {
int test_expect;
const char *str_expect;
} tests[] = {
{make_empty, 0, 0, check_size, SIZE, "[empty]"},
{make_empty2, 0, 0, check_size, SIZE, "[empty]"},
{make_everything, 0, 0, check_size, SIZE, "[everything]"},
{make_empty_invert, 0, 0, check_size, SIZE, "[everything]"},
{make_everything_invert, 0, 0, check_size, SIZE, "[empty]"},
{make_SIZE, 0, 0, check_size, SIZE + BITS, "64"},
{make_empty, 0, 0, check_size, SIZE, "{}"},
{make_empty2, 0, 0, check_size, SIZE, "{}"},
{make_everything, 0, 0, check_size, SIZE, "{...}"},
{make_empty_invert, 0, 0, check_size, SIZE, "{...}"},
{make_everything_invert, 0, 0, check_size, SIZE, "{}"},
{make_SIZE, 0, 0, check_size, SIZE + BITS, "{64}"},
{make_0_to_SIZEm1, 0, 0, check_size, SIZE,
"0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15"
"{0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15"
" 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31"
" 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47"
" 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63"
" 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63}"
},
{make_everything, make_0_to_SIZEm1, set_difference, check_size,
SIZE, "64 ..."
SIZE, "{64 ...}"
},
{make_0_to_SIZEm1, make_everything, set_reverse_difference,
check_size, SIZE, "64 ..."
check_size, SIZE, "{64 ...}"
},
{make_everything, make_empty, 0, set_is_subset, 1, 0},
{make_everything, make_empty, 0, set_is_equivalent, 0, 0},
@ -165,12 +165,12 @@ struct {
{make_not_5, make_not_55, 0, set_is_equivalent, 0, 0},
{make_not_5, make_not_55, 0, set_is_intersecting, 1, 0},
{make_not_5, make_not_55, 0, set_is_disjoint, 0, 0},
{make_5, make_55, set_union, set_is_equivalent, 0, "5 55"},
{make_5, make_55, set_union, set_is_intersecting, 1, "5 55"},
{make_5, make_55, set_union, set_is_disjoint, 0, "5 55"},
{make_55, make_5, set_union, set_is_equivalent, 0, "5 55"},
{make_55, make_5, set_union, set_is_intersecting, 1, "5 55"},
{make_55, make_5, set_union, set_is_disjoint, 0, "5 55"},
{make_5, make_55, set_union, set_is_equivalent, 0, "{5 55}"},
{make_5, make_55, set_union, set_is_intersecting, 1, "{5 55}"},
{make_5, make_55, set_union, set_is_disjoint, 0, "{5 55}"},
{make_55, make_5, set_union, set_is_equivalent, 0, "{5 55}"},
{make_55, make_5, set_union, set_is_intersecting, 1, "{5 55}"},
{make_55, make_5, set_union, set_is_disjoint, 0, "{5 55}"},
{make_not_SIZE, make_everything, 0, set_is_equivalent, 0, 0},
{make_not_SIZE, make_everything, 0, set_is_intersecting, 1, 0},
{make_not_SIZE, make_everything, 0, set_is_disjoint, 0, 0},