From ce5adf032b94014a4f3ae43bf45e5f27e6a7ec39 Mon Sep 17 00:00:00 2001
From: MCorange99 <mcorange@mcorangehq.xyz>
Date: Sat, 18 May 2024 15:06:45 +0300
Subject: [PATCH] Changed test/example to work with recent changes

---
 xap_test.c | 125 +++++++++++++++++++++++++++--------------------------
 1 file changed, 63 insertions(+), 62 deletions(-)

diff --git a/xap_test.c b/xap_test.c
index 4c8bf19..c413615 100644
--- a/xap_test.c
+++ b/xap_test.c
@@ -1,74 +1,77 @@
-#define XAP_DISPLAY_VERSION
-#define XAP_USE_COLOR
-#define XAP_IMPL
-#include "xap.h"
 #include <stdio.h>
 #include <stdlib.h>
 
+// Macro isnt directly used by XAP
+#define VERSION "0.0.1"
+
+#define XAP_DISPLAY_VERSION
+#define XAP_USE_COLOR
+#define XAP_EXIT_ON_ERROR
+#define XAP_IMPL
+#include "xap.h"
 
 static size_t DEFAULT_UINT = 420;
 static s_size_t DEFAULT_INT = -420;
 static float DEFAULT_FLOAT = 69.420;
 static bool DEFAULT_BOOL = false;
 
+static xap_arg_t args[] = {
+    {
+        .s_long = "str",
+        .s_short = 's',
+        .description = "An example how the XAP_ARG_STR type works",
+        .type = XAP_ARG_STR,
+        .default_value = "Hello :3"
+    },
+    {
+        .s_long = "uint",
+        .s_short = 'u',
+        .description = "An example how the XAP_ARG_UINT type works",
+        .type = XAP_ARG_UINT,
+        .default_value = &DEFAULT_UINT
+    },
+    {
+        .s_long = "int",
+        .s_short = 'i',
+        .description = "An example how the XAP_ARG_INT type works",
+        .type = XAP_ARG_INT,
+        .default_value = &DEFAULT_INT
+    },
+    {
+        .s_long = "float",
+        .s_short = 'f',
+        .description = "An example how the XAP_ARG_FLOAT type works",
+        .type = XAP_ARG_FLOAT,
+        .default_value = &DEFAULT_FLOAT
+    },
+    {
+        .s_long = "bool",
+        .s_short = 'b',
+        .description = "An example how the XAP_ARG_BOOL type works",
+        .type = XAP_ARG_BOOL,
+        .default_value = &DEFAULT_BOOL
+    },
+    {
+        .s_long = "toggle",
+        .s_short = 't',
+        .description = "An example how the XAP_ARG_STR type works",
+        .type = XAP_ARG_TOGGLE,
+        .default_value = NULL // XAP_ARG_STR doesnt accept default values
+    }
+};
+
+
 int main(int argc, char** argv) {
     xap_t xap = {
         .description = "Testing program for XAP :3",
-        .version = "0.0.1",
+        .version = VERSION,
         .footer = "This pogram is licenced under blah blah blah",
         .post_args_name = "files",
         .post_args_description = "Files to blah blah :3"
     };
     
     
-    xap_arg_t a_str = {
-        .s_long = "str",
-        .s_short = 's',
-        .description = "An example how the XAP_ARG_STR type works",
-        .type = XAP_ARG_STR,
-        .default_value = "Hello :3"
-    };
-
-    xap_arg_t a_uint = {
-        .s_long = "uint",
-        .s_short = 'u',
-        .description = "An example how the XAP_ARG_UINT type works",
-        .type = XAP_ARG_UINT,
-        .default_value = &DEFAULT_UINT
-    };
-
-    xap_arg_t a_int = {
-        .s_long = "int",
-        .s_short = 'i',
-        .description = "An example how the XAP_ARG_INT type works",
-        .type = XAP_ARG_INT,
-        .default_value = &DEFAULT_INT
-    };
-
-    xap_arg_t a_float = {
-        .s_long = "float",
-        .s_short = 'f',
-        .description = "An example how the XAP_ARG_FLOAT type works",
-        .type = XAP_ARG_FLOAT,
-        .default_value = &DEFAULT_FLOAT
-    };
-
-    xap_arg_t a_bool = {
-        .s_long = "bool",
-        .s_short = 'b',
-        .description = "An example how the XAP_ARG_BOOL type works",
-        .type = XAP_ARG_BOOL,
-        .default_value = &DEFAULT_BOOL
-    };
-
-    xap_arg_t a_toggle = {
-        .s_long = "toggle",
-        .s_short = 't',
-        .description = "An example how the XAP_ARG_STR type works",
-        .type = XAP_ARG_TOGGLE,
-        .default_value = NULL // XAP_ARG_STR doesnt accept default values
-    };
-
+    
     xap_arg_t a_req = {
         .s_long = "required",
         .s_short = 'r',
@@ -79,25 +82,23 @@ int main(int argc, char** argv) {
     };
 
     
-    xap_arg_add(&xap, a_str);
-    xap_arg_add(&xap, a_uint);
-    xap_arg_add(&xap, a_int);
-    xap_arg_add(&xap, a_float);
-    xap_arg_add(&xap, a_bool); 
-    xap_arg_add(&xap, a_toggle);
-    xap_arg_add(&xap, a_req);
+    xap_arg_add_arr(&xap, args); // Add from a static arr
+    xap_arg_add(&xap, a_req);    // Add a single arg
+
+    // Join 2 xap instances, for some reason idk
+    // xap_arg_add_many(&xap, xap2->args.items, xap2->args.count);
 
     xap_parse(&xap, argc, argv);
 
     
-    bool* v_str = xap_get_arg_value_str(&xap, "str");
+    char* v_str = xap_get_arg_value_str(&xap, "str");
     size_t* v_uint = xap_get_arg_value_uint(&xap, "uint");
     // s_size_t is a macro for ptrdiff_t aka signed size_t
     s_size_t* v_int = xap_get_arg_value_int(&xap, "int");
     float* v_float = xap_get_arg_value_float(&xap, "float");
     bool* v_bool = xap_get_arg_value_bool(&xap, "bool");
     
+    // Print all args, for debugging
     // xap_print_args(&xap);
     
-    // printf("Did not exit\n");
 }