admin/C-Macro-Collections
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed container_generate to collection_generate macro

Browse Source
This commit is contained in:
Leonardo committed 2019-03-27 14:29:01 -03:00
1 parent c2103b1397
commit 8e3f2c45fa
7 files changed
+27 -28
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

examples/for_each.c
+4 -4
View File
@@ -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[])
{
examples/iterator.c
+1 -1
View File
@@ -4,7 +4,7 @@
#include <stdbool.h>
#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[])
{
examples/separate_header_source/containers.c
+4 -4
View File
@@ -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)
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)
examples/separate_header_source/containers.h
+4 -4
View File
@@ -3,7 +3,7 @@
#include <stdbool.h>
#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)
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)
examples/tree_print.c
-1
View File
@@ -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++)
src/macro_collections.h
+7 -7
View File
@@ -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"
tests/foreach.c
+7 -7
View File
@@ -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[])
{