From abe740db038faab3a8f328e13a96b3314f6e8fd1 Mon Sep 17 00:00:00 2001 From: Leonardo Date: Thu, 4 Apr 2019 13:21:02 -0300 Subject: [PATCH] Changed iterator member name count to index to follow a standard --- src/deque.h | 20 ++++++++++---------- src/queue.h | 20 ++++++++++---------- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/deque.h b/src/deque.h index 39004bd..781f60c 100644 --- a/src/deque.h +++ b/src/deque.h @@ -52,7 +52,7 @@ { \ struct SNAME##_s *target; \ size_t cursor; \ - size_t count; \ + size_t index; \ bool start; \ bool end; \ }; \ @@ -296,7 +296,7 @@ { \ iter->target = target; \ iter->cursor = target->front; \ - iter->count = 0; \ + iter->index = 0; \ iter->start = true; \ iter->end = PFX##_empty(target); \ } \ @@ -315,7 +315,7 @@ FMOD void PFX##_iter_tostart(SNAME##_iter *iter) \ { \ iter->cursor = iter->target->front; \ - iter->count = 0; \ + iter->index = 0; \ iter->start = true; \ iter->end = PFX##_empty(iter->target); \ } \ @@ -327,7 +327,7 @@ else \ iter->cursor = (iter->target->rear == 0) ? iter->target->count - 1 : iter->target->rear - 1; \ \ - iter->count = iter->target->count - 1; \ + iter->index = iter->target->count - 1; \ iter->start = PFX##_empty(iter->target); \ iter->end = true; \ } \ @@ -337,16 +337,16 @@ if (iter->end) \ return false; \ \ - *index = iter->count; \ + *index = iter->index; \ *result = iter->target->buffer[iter->cursor]; \ iter->start = false; \ \ - if (iter->count == iter->target->count - 1) \ + if (iter->index == iter->target->count - 1) \ iter->end = true; \ else \ { \ iter->cursor = (iter->cursor + 1) % (iter->target->capacity); \ - iter->count++; \ + iter->index++; \ } \ \ return true; \ @@ -357,16 +357,16 @@ if (iter->start) \ return false; \ \ - *index = iter->count; \ + *index = iter->index; \ *result = iter->target->buffer[iter->cursor]; \ iter->end = false; \ \ - if (iter->count == 0) \ + if (iter->index == 0) \ iter->start = true; \ else \ { \ iter->cursor = (iter->cursor == 0) ? iter->target->capacity - 1 : iter->cursor - 1; \ - iter->count--; \ + iter->index--; \ } \ \ return true; \ diff --git a/src/queue.h b/src/queue.h index 03431a6..f1045c9 100644 --- a/src/queue.h +++ b/src/queue.h @@ -52,7 +52,7 @@ { \ struct SNAME##_s *target; \ size_t cursor; \ - size_t count; \ + size_t index; \ bool start; \ bool end; \ }; \ @@ -234,7 +234,7 @@ { \ iter->target = target; \ iter->cursor = target->front; \ - iter->count = 0; \ + iter->index = 0; \ iter->start = true; \ iter->end = PFX##_empty(target); \ } \ @@ -253,7 +253,7 @@ FMOD void PFX##_iter_tostart(SNAME##_iter *iter) \ { \ iter->cursor = iter->target->front; \ - iter->count = 0; \ + iter->index = 0; \ iter->start = true; \ iter->end = PFX##_empty(iter->target); \ } \ @@ -265,7 +265,7 @@ else \ iter->cursor = (iter->target->rear == 0) ? iter->target->count - 1 : iter->target->rear - 1; \ \ - iter->count = iter->target->count - 1; \ + iter->index = iter->target->count - 1; \ iter->start = PFX##_empty(iter->target); \ iter->end = true; \ } \ @@ -275,16 +275,16 @@ if (iter->end) \ return false; \ \ - *index = iter->count; \ + *index = iter->index; \ *result = iter->target->buffer[iter->cursor]; \ iter->start = false; \ \ - if (iter->count == iter->target->count - 1) \ + if (iter->index == iter->target->count - 1) \ iter->end = true; \ else \ { \ iter->cursor = (iter->cursor + 1) % (iter->target->capacity); \ - iter->count++; \ + iter->index++; \ } \ \ return true; \ @@ -295,16 +295,16 @@ if (iter->start) \ return false; \ \ - *index = iter->count; \ + *index = iter->index; \ *result = iter->target->buffer[iter->cursor]; \ iter->end = false; \ \ - if (iter->count == 0) \ + if (iter->index == 0) \ iter->start = true; \ else \ { \ iter->cursor = (iter->cursor == 0) ? iter->target->capacity - 1 : iter->cursor - 1; \ - iter->count--; \ + iter->index--; \ } \ \ return true; \