fix(scanner): adjust container allocations

Author: amaanq

src/scanner.c

@@ -6,21 +6,25 @@
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 
 #define VEC_RESIZE(vec, _cap)                                                  \
-    void *tmp = realloc((vec).data, (_cap) * sizeof((vec).data[0]));           \
-    assert(tmp != NULL);                                                       \
-    (vec).data = tmp;                                                          \
-    (vec).cap = (_cap);
+    do {                                                                       \
+        void *tmp = realloc((vec).data, (_cap) * sizeof((vec).data[0]));       \
+        assert(tmp != NULL);                                                   \
+        (vec).data = tmp;                                                      \
+        (vec).cap = (_cap);                                                    \
+    } while (0)
 
 #define VEC_GROW(vec, _cap)                                                    \
     if ((vec).cap < (_cap)) {                                                  \
         VEC_RESIZE((vec), (_cap));                                             \
     }
 
 #define VEC_PUSH(vec, el)                                                      \
-    if ((vec).cap == (vec).len) {                                              \
-        VEC_RESIZE((vec), MAX(16, (vec).len * 2));                             \
-    }                                                                          \
-    (vec).data[(vec).len++] = (el);
+    do {                                                                       \
+        if ((vec).cap == (vec).len) {                                          \
+            VEC_RESIZE((vec), MAX(16, (vec).len * 2));                         \
+        }                                                                      \
+        (vec).data[(vec).len++] = (el);                                        \
+    } while (0)
 
 #define VEC_POP(vec) (vec).len--;
 
@@ -39,9 +43,17 @@
 
 #define QUEUE_RESIZE(queue, _cap)                                              \
     do {                                                                       \
-        void *tmp = realloc((queue).data, (_cap) * sizeof((queue).data[0]));   \
+        void *tmp = calloc((_cap), sizeof((queue).data[0]));                   \
         assert(tmp != NULL);                                                   \
+        uint32_t count = (queue).tail - (queue).head;                          \
+        for (uint32_t i = 0; i < count; i++) {                                 \
+            ((uint16_t *)tmp)[i] = (queue).data[((queue).head + i) % (queue).cap]; \
+        }                                                                      \
+        if ((queue).data != NULL)                                              \
+            free((queue).data);                                                \
         (queue).data = tmp;                                                    \
+        (queue).head = 0;                                                      \
+        (queue).tail = count;                                                  \
         (queue).cap = (_cap);                                                  \
     } while (0)