From 92772640898232d0d1d085ff37edaa6361216a3c Mon Sep 17 00:00:00 2001 From: Leonardo Date: Sun, 24 Mar 2019 15:59:37 -0300 Subject: [PATCH] Removing unnecessary headers and fixing examples --- examples/for_each/main.c | 10 +++++----- examples/iterator/main.c | 2 +- src/deque.h | 1 - src/foreach.h | 1 - src/linkedlist.h | 1 - src/list.h | 1 - src/queue.h | 1 - src/stack.h | 1 - 8 files changed, 6 insertions(+), 12 deletions(-) diff --git a/examples/for_each/main.c b/examples/for_each/main.c index adf43c2..1964121 100644 --- a/examples/for_each/main.c +++ b/examples/for_each/main.c @@ -41,16 +41,16 @@ int main(int argc, char const *argv[]) FOR_EACH(l, list, , int, l, { if (index == 0) printf("[ %d, ", var); - else if (index == l_count(l) - 1) + else if (index == iter.target->count - 1) printf("%d ]\n", var); else printf("%d, ", var); }) FOR_EACH(s, stack, , int, s, { - if (index == 0) + if (index == iter.target->count - 1) printf("[ %d, ", var); - else if (index == s_count(s) - 1) + else if (index == 0) printf("%d ]\n", var); else printf("%d, ", var); @@ -59,7 +59,7 @@ int main(int argc, char const *argv[]) FOR_EACH(q, queue, , int, q, { if (index == 0) printf("[ %d, ", var); - else if (index == q_count(q) - 1) + else if (index == iter.target->count - 1) printf("%d ]\n", var); else printf("%d, ", var); @@ -68,7 +68,7 @@ int main(int argc, char const *argv[]) FOR_EACH(d, deque, , int, d, { if (index == 0) printf("[ %d, ", var); - else if (index == d_count(d) - 1) + else if (index == iter.target->count - 1) printf("%d ]\n", var); else printf("%d, ", var); diff --git a/examples/iterator/main.c b/examples/iterator/main.c index 6611f33..94f8291 100644 --- a/examples/iterator/main.c +++ b/examples/iterator/main.c @@ -13,7 +13,7 @@ int main(int argc, char const *argv[]) // Initliazie linked list and add some elements linked *ll = ll_new(); - for (int i = 0; i < 100; i++) + for (int i = 0; i < 20; i++) ll_push_back(ll, i); // Initialize iterator diff --git a/src/deque.h b/src/deque.h index d0c8c87..f9fe592 100644 --- a/src/deque.h +++ b/src/deque.h @@ -17,7 +17,6 @@ #include #include -#include #define DEQUE_GENERATE(PFX, SNAME, FMOD, K, T) \ DEQUE_GENERATE_STRUCT(PFX, SNAME, FMOD, K, T) \ diff --git a/src/foreach.h b/src/foreach.h index 5625809..d3bcc17 100644 --- a/src/foreach.h +++ b/src/foreach.h @@ -13,7 +13,6 @@ #include #include -#include #define FOR_EACH(PFX, SNAME, K, T, TARGET, BODY) \ do \ diff --git a/src/linkedlist.h b/src/linkedlist.h index 65b6b76..763db5d 100644 --- a/src/linkedlist.h +++ b/src/linkedlist.h @@ -17,7 +17,6 @@ #include #include -#include #define LINKEDLIST_GENERATE(PFX, SNAME, FMOD, K, T) \ LINKEDLIST_GENERATE_STRUCT(PFX, SNAME, FMOD, K, T) \ diff --git a/src/list.h b/src/list.h index 4b89b7e..8599736 100644 --- a/src/list.h +++ b/src/list.h @@ -17,7 +17,6 @@ #include #include -#include #define LIST_GENERATE(PFX, SNAME, FMOD, K, T) \ LIST_GENERATE_STRUCT(PFX, SNAME, FMOD, K, T) \ diff --git a/src/queue.h b/src/queue.h index 3bbb12f..f72323a 100644 --- a/src/queue.h +++ b/src/queue.h @@ -17,7 +17,6 @@ #include #include -#include #define QUEUE_GENERATE(PFX, SNAME, FMOD, K, T) \ QUEUE_GENERATE_STRUCT(PFX, SNAME, FMOD, K, T) \ diff --git a/src/stack.h b/src/stack.h index 2ec1a5f..b4be4cf 100644 --- a/src/stack.h +++ b/src/stack.h @@ -17,7 +17,6 @@ #include #include -#include #define STACK_GENERATE(PFX, SNAME, FMOD, K, T) \ STACK_GENERATE_STRUCT(PFX, SNAME, FMOD, K, T) \