X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/mLib/blobdiff_plain/ece42f686d1b7624c7e9b1674e97399221b95e2c..573eadb534c42c4feace5e493cc135dd5e7b00d9:/assoc-test.c?ds=sidebyside diff --git a/assoc-test.c b/assoc-test.c index fc1f82e..5949857 100644 --- a/assoc-test.c +++ b/assoc-test.c @@ -14,7 +14,7 @@ static int cmp(const void *a, const void *b) { const word *const *v = b; const word *const *w = a; - return (strcmp(ATOM_NAME((*w)->_b.a), ATOM_NAME((*v)->_b.a))); + return (strcmp(ATOM_NAME(ASSOC_ATOM(*w)), ATOM_NAME(ASSOC_ATOM(*v)))); } int main(void) @@ -74,9 +74,9 @@ int main(void) for (vv = v, assoc_mkiter(&i, &t); (w = assoc_next(&i)) != 0; vv++) *vv = w; qsort(v, n, sizeof(*v), cmp); - printf("%s:%i", ATOM_NAME((*v)->_b.a), (*v)->i); + printf("%s:%i", ATOM_NAME(ASSOC_ATOM(*v)), (*v)->i); for (vv = v + 1; --n; vv++) - printf(" %s:%i", ATOM_NAME((*vv)->_b.a), (*vv)->i); + printf(" %s:%i", ATOM_NAME(ASSOC_ATOM(*vv)), (*vv)->i); free(v); putchar('\n'); } @@ -85,5 +85,6 @@ int main(void) } assoc_destroy(&t); + atom_destroytable(&at); return (0); }