Add cvector_iterator (#58)

eteran · Oct 31, 2023 · fa19a27 · fa19a27
1 parent 61ccddf
commit fa19a27
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/cvector.h b/cvector.h
@@ -42,6 +42,11 @@ typedef struct cvector_metadata_t {
  */
 #define cvector_vector_type(type) type *
 
+/**
+ * @brief cvector_iterator - The iterator type used for cvector
+ */
+#define cvector_iterator(type) cvector_vector_type(type)
+
 /**
  * @brief cvector_vec_to_base - For internal use, converts a vector pointer to a metadata pointer
  * @param vec - the vector

diff --git a/example.c b/example.c
@@ -42,7 +42,7 @@ int main(int argc, char *argv[]) {
 
     /* iterator over the vector using "iterator" style */
     if (v) {
-        int *it;
+        cvector_iterator(int) it;
         int i = 0;
         for (it = cvector_begin(v); it != cvector_end(v); ++it) {
             printf("v[%d] = %d\n", i, *it);

diff --git a/test.c b/test.c
@@ -34,7 +34,7 @@ int main() {
 
     /* iterator over the vector using "iterator" style */
     if (v) {
-        int *it;
+        cvector_iterator(int) it;
         int i = 0;
         for (it = cvector_begin(v); it != cvector_end(v); ++it) {
             printf("v[%d] = %d\n", i, *it);

diff --git a/unit-tests.c b/unit-tests.c
@@ -48,7 +48,7 @@ UTEST(test, vector_iterator) {
 
     /* iterator over the vector using "iterator" style */
     if (v) {
-        int *it;
+        cvector_iterator(int) it;
         int i = 0;
         for (it = cvector_begin(v); it != cvector_end(v); ++it) {
             switch (i) {
@@ -182,7 +182,7 @@ UTEST(test, vector_free_all) {
 }
 
 UTEST(test, vector_for_each_int) {
-    char **it;
+    cvector_iterator(char *) it;
     int i;
     cvector_vector_type(char *) v = NULL;
     for (i = 0; i < 10; ++i) {