From 8e3f2c45faad81628376f6945515b2b683dc56f3 Mon Sep 17 00:00:00 2001 From: Leonardo Date: Wed, 27 Mar 2019 14:29:01 -0300 Subject: [PATCH] Changed container_generate to collection_generate macro --- examples/for_each.c | 8 ++++---- examples/iterator.c | 2 +- examples/separate_header_source/containers.c | 8 ++++---- examples/separate_header_source/containers.h | 8 ++++---- examples/tree_print.c | 1 - src/macro_collections.h | 14 +++++++------- tests/foreach.c | 14 +++++++------- 7 files changed, 27 insertions(+), 28 deletions(-) diff --git a/examples/for_each.c b/examples/for_each.c index 4c93745..6c1ecdb 100644 --- a/examples/for_each.c +++ b/examples/for_each.c @@ -4,10 +4,10 @@ #include "../src/macro_collections.h" // Create containers to use only in this file -CONTAINER_GENERATE(LIST, PUBLIC, l, list, static, , int) -CONTAINER_GENERATE(STACK, PUBLIC, s, stack, static, , int) -CONTAINER_GENERATE(QUEUE, PUBLIC, q, queue, static, , int) -CONTAINER_GENERATE(DEQUE, PUBLIC, d, deque, static, , int) +COLLECTION_GENERATE(LIST, PUBLIC, l, list, static, , int) +COLLECTION_GENERATE(STACK, PUBLIC, s, stack, static, , int) +COLLECTION_GENERATE(QUEUE, PUBLIC, q, queue, static, , int) +COLLECTION_GENERATE(DEQUE, PUBLIC, d, deque, static, , int) int main(int argc, char const *argv[]) { diff --git a/examples/iterator.c b/examples/iterator.c index 96c43af..e26cace 100644 --- a/examples/iterator.c +++ b/examples/iterator.c @@ -4,7 +4,7 @@ #include #include "../src/macro_collections.h" -CONTAINER_GENERATE(LINKEDLIST, PUBLIC, ll, linked, static, , int) +COLLECTION_GENERATE(LINKEDLIST, PUBLIC, ll, linked, static, , int) int main(int argc, char const *argv[]) { diff --git a/examples/separate_header_source/containers.c b/examples/separate_header_source/containers.c index e2177ff..fa63e51 100644 --- a/examples/separate_header_source/containers.c +++ b/examples/separate_header_source/containers.c @@ -1,6 +1,6 @@ #include "containers.h" -CONTAINER_GENERATE_SOURCE(LIST, PUBLIC, il, int_list, , , int) -CONTAINER_GENERATE_SOURCE(STACK, PRIVATE, cs, char_stack, , , char) -CONTAINER_GENERATE_SOURCE(QUEUE, PUBLIC, queue, index_queue, , , size_t) -CONTAINER_GENERATE_SOURCE(DEQUE, PUBLIC, dq, deque, , , int) \ No newline at end of file +COLLECTION_GENERATE_SOURCE(LIST, PUBLIC, il, int_list, , , int) +COLLECTION_GENERATE_SOURCE(STACK, PRIVATE, cs, char_stack, , , char) +COLLECTION_GENERATE_SOURCE(QUEUE, PUBLIC, queue, index_queue, , , size_t) +COLLECTION_GENERATE_SOURCE(DEQUE, PUBLIC, dq, deque, , , int) \ No newline at end of file diff --git a/examples/separate_header_source/containers.h b/examples/separate_header_source/containers.h index 77ca095..41c0fc9 100644 --- a/examples/separate_header_source/containers.h +++ b/examples/separate_header_source/containers.h @@ -3,7 +3,7 @@ #include #include "macro_collections.h" -CONTAINER_GENERATE_HEADER(LIST, PUBLIC, il, int_list, , , int) -CONTAINER_GENERATE_HEADER(STACK, PRIVATE, cs, char_stack, , , char) -CONTAINER_GENERATE_HEADER(QUEUE, PUBLIC, queue, index_queue, , , size_t) -CONTAINER_GENERATE_HEADER(DEQUE, PUBLIC, dq, deque, , , int) \ No newline at end of file +COLLECTION_GENERATE_HEADER(LIST, PUBLIC, il, int_list, , , int) +COLLECTION_GENERATE_HEADER(STACK, PRIVATE, cs, char_stack, , , char) +COLLECTION_GENERATE_HEADER(QUEUE, PUBLIC, queue, index_queue, , , size_t) +COLLECTION_GENERATE_HEADER(DEQUE, PUBLIC, dq, deque, , , int) \ No newline at end of file diff --git a/examples/tree_print.c b/examples/tree_print.c index 1081440..fc39eea 100644 --- a/examples/tree_print.c +++ b/examples/tree_print.c @@ -27,7 +27,6 @@ int intcmp(int a, int b) int main(int argc, char const *argv[]) { - srand((unsigned)time(NULL)); set *set1 = set_new(intcmp); for (int i = 0; i < 31; i++) diff --git a/src/macro_collections.h b/src/macro_collections.h index 9f65461..ea459e1 100644 --- a/src/macro_collections.h +++ b/src/macro_collections.h @@ -20,16 +20,16 @@ #define CONCATH(C, P) CONCATH_(C, P) #define CONCATC(C, P) CONCATC_(C, P) -#define CONTAINER_GENERATE(C, P, PFX, SNAME, FMOD, K, V) \ - CONTAINER_GENERATE_HEADER(C, P, PFX, SNAME, FMOD, K, V) \ - CONTAINER_GENERATE_SOURCE(C, P, PFX, SNAME, FMOD, K, V) +#define COLLECTION_GENERATE(C, P, PFX, SNAME, FMOD, K, V) \ + COLLECTION_GENERATE_HEADER(C, P, PFX, SNAME, FMOD, K, V) \ + COLLECTION_GENERATE_SOURCE(C, P, PFX, SNAME, FMOD, K, V) -#define CONTAINER_GENERATE_HEADER(C, P, PFX, SNAME, FMOD, K, V) \ - CONCATH(C, P) \ +#define COLLECTION_GENERATE_HEADER(C, P, PFX, SNAME, FMOD, K, V) \ + CONCATH(C, P) \ (PFX, SNAME, FMOD, K, V) -#define CONTAINER_GENERATE_SOURCE(C, P, PFX, SNAME, FMOD, K, V) \ - CONCATC(C, P) \ +#define COLLECTION_GENERATE_SOURCE(C, P, PFX, SNAME, FMOD, K, V) \ + CONCATC(C, P) \ (PFX, SNAME, FMOD, K, V) #include "list.h" diff --git a/tests/foreach.c b/tests/foreach.c index fd5de0f..0b5d74b 100644 --- a/tests/foreach.c +++ b/tests/foreach.c @@ -7,13 +7,13 @@ int cmp(int a, int b) return a - b; } -CONTAINER_GENERATE(LIST, PUBLIC, l, list, /**/, /**/, int) -CONTAINER_GENERATE(STACK, PUBLIC, s, stack, /**/, /**/, int) -CONTAINER_GENERATE(QUEUE, PUBLIC, q, queue, /**/, /**/, int) -CONTAINER_GENERATE(DEQUE, PUBLIC, d, deque, /**/, /**/, int) -CONTAINER_GENERATE(LINKEDLIST, PUBLIC, ll, linked, /**/, /**/, int) -CONTAINER_GENERATE(HEAP, PUBLIC, h, heap, /**/, /**/, int) -CONTAINER_GENERATE(TREESET, PUBLIC, ts, tset, /**/, /**/, int) +COLLECTION_GENERATE(LIST, PUBLIC, l, list, /**/, /**/, int) +COLLECTION_GENERATE(STACK, PUBLIC, s, stack, /**/, /**/, int) +COLLECTION_GENERATE(QUEUE, PUBLIC, q, queue, /**/, /**/, int) +COLLECTION_GENERATE(DEQUE, PUBLIC, d, deque, /**/, /**/, int) +COLLECTION_GENERATE(LINKEDLIST, PUBLIC, ll, linked, /**/, /**/, int) +COLLECTION_GENERATE(HEAP, PUBLIC, h, heap, /**/, /**/, int) +COLLECTION_GENERATE(TREESET, PUBLIC, ts, tset, /**/, /**/, int) int main(int argc, char const *argv[]) {