Implement helper function for dynamic arrays

Author: SiebelsTim

Diff for: .clang-format

@@ -25,7 +25,7 @@ ConstructorInitializerAllOnOneLineOrOnePerLine: false
 ConstructorInitializerIndentWidth: 4
 DerivePointerAlignment: false
 ExperimentalAutoDetectBinPacking: false
-IndentCaseLabels: false
+IndentCaseLabels: true
 IndentWrappedFunctionNames: false
 IndentFunctionDeclarationAfterType: false
 MaxEmptyLinesToKeep: 1
@@ -47,7 +47,7 @@ Standard:        Cpp11
 IndentWidth:     4
 TabWidth:        8
 UseTab:          Never
-BreakBeforeBraces: Attach
+BreakBeforeBraces: Linux
 SpacesInParentheses: false
 SpacesInSquareBrackets: false
 SpacesInAngles:  false

Diff for: CMakeLists.txt

@@ -6,5 +6,5 @@ set(CMAKE_C_COMPILER  "/usr/bin/clang")
 set(CMAKE_C_STANDARD 11)
 set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -O0 -Wall -Wextra -fsanitize=address -fno-omit-frame-pointer")
 
-set(SOURCE_FILES main.c lex.c lex.h run.h run.c parse.c parse.h scope.c scope.h compile.c compile.h)
+set(SOURCE_FILES main.c lex.c lex.h run.h run.c parse.c parse.h scope.c scope.h compile.c compile.h array-util.h)
 add_executable(PHPInterp ${SOURCE_FILES})

Diff for: array-util.h

@@ -0,0 +1,23 @@
+#ifndef PHPINTERP_ARRAY_UTIL_H
+#define PHPINTERP_ARRAY_UTIL_H
+
+#include <stddef.h>
+#include <stdlib.h>
+#include <memory.h>
+
+static void try_resize(size_t* capacity, size_t size, void** ptr,
+                       size_t elemsize, void (*error)(char*))
+{
+    if (*capacity < size + 1) {
+        *capacity *= 2;
+        void* tmp = realloc(*ptr, elemsize * (*capacity));
+        if (!tmp) {
+            error("Out of memory");
+            return;
+        }
+
+        *ptr = tmp;
+    }
+}
+
+#endif //PHPINTERP_ARRAY_UTIL_H

Diff for: run.c

@@ -8,6 +8,7 @@
 #include "parse.h"
 #include "scope.h"
 #include "compile.h"
+#include "array-util.h"
 
 Variant cpy_var(Variant var)
 {
@@ -69,17 +70,8 @@ static void destroy_runtime(Runtime* R)
 
 static inline void try_stack_resize(Runtime* R)
 {
-    if (R->stackcapacity < R->stacksize+1) {
-        R->stackcapacity *= 2;
-        Variant* tmp = realloc(R->stack, sizeof(*R->stack) * R->stackcapacity);
-        if (!tmp) {
-            runtimeerror("Out of memory");
-            return;;
-        }
-
-        memset(&tmp[R->stacksize], 0, R->stackcapacity - R->stacksize);
-        R->stack = tmp;
-    }
+    try_resize(&R->stackcapacity, R->stacksize, (void*)&R->stack,
+               sizeof(*R->stack), runtimeerror);
 }
 
 static void push(Runtime* R, Variant val)

Diff for: scope.c

@@ -1,6 +1,7 @@
 #include <memory.h>
 #include <stdlib.h>
 #include "scope.h"
+#include "array-util.h"
 
 static const Variant undefined = {.type = UNDEFINED};
 
@@ -36,19 +37,10 @@ Variant lookup(Runtime *R, char *str)
     return undefined;
 }
 
-static void try_resize(Scope* scope)
+static void try_vars_resize(Scope* scope)
 {
-    if (scope->capacity < scope->size+1) {
-        scope->capacity *= 2;
-        Variable* tmp = realloc(scope->vars, sizeof(*scope->vars) * scope->capacity);
-        if (!tmp) {
-            runtimeerror("Out of memory");
-            return;
-        }
-
-        memset(&tmp[scope->size], 0, scope->capacity - scope->size);
-        scope->vars = tmp;
-    }
+    try_resize(&scope->capacity, scope->size, (void*)&scope->vars,
+               sizeof(*scope->vars), runtimeerror);
 }
 
 Variable* set_var(Runtime* R, char* str, Variant var)
@@ -63,7 +55,7 @@ Variable* set_var(Runtime* R, char* str, Variant var)
         }
     }
 
-    try_resize(R->scope);
+    try_vars_resize(R->scope);
     const size_t idx = R->scope->size++;
     vars[idx].name = strdup(str);
     vars[idx].value = cpy_var(var);