Pad logger struct for MSVC

LICENSE

@@ -0,0 +1,201 @@
+                             Apache License
+                       Version 2.0, January 2004
+                    http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+  "License" shall mean the terms and conditions for use, reproduction,
+  and distribution as defined by Sections 1 through 9 of this document.
+
+  "Licensor" shall mean the copyright owner or entity authorized by
+  the copyright owner that is granting the License.
+
+  "Legal Entity" shall mean the union of the acting entity and all
+  other entities that control, are controlled by, or are under common
+  control with that entity. For the purposes of this definition,
+  "control" means (i) the power, direct or indirect, to cause the
+  direction or management of such entity, whether by contract or
+  otherwise, or (ii) ownership of fifty percent (50%) or more of the
+  outstanding shares, or (iii) beneficial ownership of such entity.
+
+  "You" (or "Your") shall mean an individual or Legal Entity
+  exercising permissions granted by this License.
+
+  "Source" form shall mean the preferred form for making modifications,
+  including but not limited to software source code, documentation
+  source, and configuration files.
+
+  "Object" form shall mean any form resulting from mechanical
+  transformation or translation of a Source form, including but
+  not limited to compiled object code, generated documentation,
+  and conversions to other media types.
+
+  "Work" shall mean the work of authorship, whether in Source or
+  Object form, made available under the License, as indicated by a
+  copyright notice that is included in or attached to the work
+  (an example is provided in the Appendix below).
+
+  "Derivative Works" shall mean any work, whether in Source or Object
+  form, that is based on (or derived from) the Work and for which the
+  editorial revisions, annotations, elaborations, or other modifications
+  represent, as a whole, an original work of authorship. For the purposes
+  of this License, Derivative Works shall not include works that remain
+  separable from, or merely link (or bind by name) to the interfaces of,
+  the Work and Derivative Works thereof.
+
+  "Contribution" shall mean any work of authorship, including
+  the original version of the Work and any modifications or additions
+  to that Work or Derivative Works thereof, that is intentionally
+  submitted to Licensor for inclusion in the Work by the copyright owner
+  or by an individual or Legal Entity authorized to submit on behalf of
+  the copyright owner. For the purposes of this definition, "submitted"
+  means any form of electronic, verbal, or written communication sent
+  to the Licensor or its representatives, including but not limited to
+  communication on electronic mailing lists, source code control systems,
+  and issue tracking systems that are managed by, or on behalf of, the
+  Licensor for the purpose of discussing and improving the Work, but
+  excluding communication that is conspicuously marked or otherwise
+  designated in writing by the copyright owner as "Not a Contribution."
+
+  "Contributor" shall mean Licensor and any individual or Legal Entity
+  on behalf of whom a Contribution has been received by Licensor and
+  subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  copyright license to reproduce, prepare Derivative Works of,
+  publicly display, publicly perform, sublicense, and distribute the
+  Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+  this License, each Contributor hereby grants to You a perpetual,
+  worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+  (except as stated in this section) patent license to make, have made,
+  use, offer to sell, sell, import, and otherwise transfer the Work,
+  where such license applies only to those patent claims licensable
+  by such Contributor that are necessarily infringed by their
+  Contribution(s) alone or by combination of their Contribution(s)
+  with the Work to which such Contribution(s) was submitted. If You
+  institute patent litigation against any entity (including a
+  cross-claim or counterclaim in a lawsuit) alleging that the Work
+  or a Contribution incorporated within the Work constitutes direct
+  or contributory patent infringement, then any patent licenses
+  granted to You under this License for that Work shall terminate
+  as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+  Work or Derivative Works thereof in any medium, with or without
+  modifications, and in Source or Object form, provided that You
+  meet the following conditions:
+
+  (a) You must give any other recipients of the Work or
+      Derivative Works a copy of this License; and
+
+  (b) You must cause any modified files to carry prominent notices
+      stating that You changed the files; and
+
+  (c) You must retain, in the Source form of any Derivative Works
+      that You distribute, all copyright, patent, trademark, and
+      attribution notices from the Source form of the Work,
+      excluding those notices that do not pertain to any part of
+      the Derivative Works; and
+
+  (d) If the Work includes a "NOTICE" text file as part of its
+      distribution, then any Derivative Works that You distribute must
+      include a readable copy of the attribution notices contained
+      within such NOTICE file, excluding those notices that do not
+      pertain to any part of the Derivative Works, in at least one
+      of the following places: within a NOTICE text file distributed
+      as part of the Derivative Works; within the Source form or
+      documentation, if provided along with the Derivative Works; or,
+      within a display generated by the Derivative Works, if and
+      wherever such third-party notices normally appear. The contents
+      of the NOTICE file are for informational purposes only and
+      do not modify the License. You may add Your own attribution
+      notices within Derivative Works that You distribute, alongside
+      or as an addendum to the NOTICE text from the Work, provided
+      that such additional attribution notices cannot be construed
+      as modifying the License.
+
+  You may add Your own copyright statement to Your modifications and
+  may provide additional or different license terms and conditions
+  for use, reproduction, or distribution of Your modifications, or
+  for any such Derivative Works as a whole, provided Your use,
+  reproduction, and distribution of the Work otherwise complies with
+  the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+  any Contribution intentionally submitted for inclusion in the Work
+  by You to the Licensor shall be under the terms and conditions of
+  this License, without any additional terms or conditions.
+  Notwithstanding the above, nothing herein shall supersede or modify
+  the terms of any separate license agreement you may have executed
+  with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+  names, trademarks, service marks, or product names of the Licensor,
+  except as required for reasonable and customary use in describing the
+  origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+  agreed to in writing, Licensor provides the Work (and each
+  Contributor provides its Contributions) on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+  implied, including, without limitation, any warranties or conditions
+  of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+  PARTICULAR PURPOSE. You are solely responsible for determining the
+  appropriateness of using or redistributing the Work and assume any
+  risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+  whether in tort (including negligence), contract, or otherwise,
+  unless required by applicable law (such as deliberate and grossly
+  negligent acts) or agreed to in writing, shall any Contributor be
+  liable to You for damages, including any direct, indirect, special,
+  incidental, or consequential damages of any character arising as a
+  result of this License or out of the use or inability to use the
+  Work (including but not limited to damages for loss of goodwill,
+  work stoppage, computer failure or malfunction, or any and all
+  other commercial damages or losses), even if such Contributor
+  has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+  the Work or Derivative Works thereof, You may choose to offer,
+  and charge a fee for, acceptance of support, warranty, indemnity,
+  or other liability obligations and/or rights consistent with this
+  License. However, in accepting such obligations, You may act only
+  on Your own behalf and on Your sole responsibility, not on behalf
+  of any other Contributor, and only if You agree to indemnify,
+  defend, and hold each Contributor harmless for any liability
+  incurred by, or claims asserted against, such Contributor by reason
+  of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+  To apply the Apache License to your work, attach the following
+  boilerplate notice, with the fields enclosed by brackets "[]"
+  replaced with your own identifying information. (Don't include
+  the brackets!)  The text should be enclosed in the appropriate
+  comment syntax for the file format. We also recommend that a
+  file or class name and description of purpose be included on the
+  same "printed page" as the copyright notice for easier
+  identification within third-party archives.
+
+Copyright [2026] [Abdelrahman Said]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+   http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.

Makefile

@@ -153,7 +153,7 @@ builddir:
 	@mkdir -p "$(BUILD_DIR)"
 
 build-c-test:
-	$(CC) $(CSTD) $(CFLAGS) $(BUILD_FLAGS) $(TEST_INCLUDE) $(TEST_C_SRC) -o "$(TEST_C_OUT)"
+	bear -- $(CC) $(CSTD) $(CFLAGS) $(BUILD_FLAGS) $(TEST_INCLUDE) $(TEST_C_SRC) -o "$(TEST_C_OUT)"
 
 run-c-test: build-c-test
 	@echo -e "\n\033[34;1mRUNNING C TESTS\033[0m"
@@ -161,7 +161,7 @@ run-c-test: build-c-test
 	@rm "$(TEST_C_OUT)"
 
 build-cc-test:
-	$(CXX) $(CXXSTD) $(CFLAGS) $(BUILD_FLAGS) $(TEST_INCLUDE) $(TEST_CXX_SRC) "$(LIB_OUT)" -o "$(TEST_CXX_OUT)"
+	bear -a -- $(CXX) $(CXXSTD) $(CFLAGS) $(BUILD_FLAGS) $(TEST_INCLUDE) $(TEST_CXX_SRC) "$(LIB_OUT)" -o "$(TEST_CXX_OUT)"
 
 run-cc-test: build-cc-test
 	@echo -e "\n\033[34;1mRUNNING C++ TESTS\033[0m"
@@ -175,6 +175,6 @@ install: build-lib
 	@bash $(HEADER_INSTALL_CMD) $(LIB_SRC) "$(INCLUDE_INSTALL)" $(INCLUDES)
 
 build-lib: builddir
-	$(CC) -c $(CSTD) $(CFLAGS) $(BUILD_FLAGS) $(LIBFLAGS) $(LIB_SRC) -o "$(OBJ_OUT)"
+	bear -a -- $(CC) -c $(CSTD) $(CFLAGS) $(BUILD_FLAGS) $(LIBFLAGS) $(LIB_SRC) -o "$(OBJ_OUT)"
 	$(AR) r "$(LIB_OUT)" "$(OBJ_OUT)"
 	@rm "$(OBJ_OUT)"

README.md

@@ -1,3 +1,5 @@
 # Wizard Apprentice Standard Library
 
-A group of utilities for C/C++ projects
+**Wizard Apprentice Standard Library** (`wapp`) is a lightweight collection of reusable utilities for **C and C++** projects.
+
+For more information about the library and how to use it, check the [wiki](https://git.thewizardapprentice.com/abdelrahman/wizapp-stdlib/wiki).

VERSION

@@ -1 +1 @@
-1.0.0
+1.1.1

build

@@ -55,4 +55,4 @@ if ! contains ${BUILD_TYPE} "${ACCEPTED_BUILD_TYPES[@]}"; then
   exit 1
 fi
 
-bear -- make BUILD_TYPE=$BUILD_TYPE $ARGS
+make BUILD_TYPE=$BUILD_TYPE $ARGS

src/base/queue/queue.c

@@ -30,7 +30,10 @@ GenericQueue *_queue_push_alloc(const Allocator *allocator, GenericQueue *queue,
 	GenericQueue *output = queue;
 
 	u64 capacity = wapp_array_capacity(queue->items);
-	if (queue->count >= capacity) {
+
+	// NOTE (Abdelrahman): Extracted into variable to fix MSVC error
+	b8 queue_full = queue->count >= capacity;
+	if (queue_full) {
 		u64 new_capacity = wapp_misc_utils_u64_round_up_pow2(capacity * 2);
 		u64 array_size   = _array_calc_alloc_size(new_capacity, item_size);
 		u64 alloc_size   = sizeof(GenericQueue) + array_size;
@@ -51,7 +54,27 @@ GenericQueue *_queue_push_alloc(const Allocator *allocator, GenericQueue *queue,
 		void *copy_boundary = (void *)((uptr)(queue->items) + (queue->front * item_size));
 
 		memcpy(output->items, copy_boundary, front_count * item_size);
-		if (back_count > 0) {
+
+		/**
+		 * NOTE (Abdelrahman): Since this is a ring buffer, the elements at the beginning of the array
+		 * aren't always the ones at the front of the queue. When that's the case, the memcpy above
+		 * will only copy a subset of the elements. This is why we need to copy the remaining ones.
+		 *
+		 * Example: Take a queue that looks like this with a capacity of 5 elements
+		 *
+		 *     0       1   |   2       3       4
+		 *  ---------------|-----------------------
+		 * |   *   |   *   |   *   |   *   |   *   |
+		 *  ---------------|-----------------------
+		 *                 |
+		 *            queue_front = 2
+		 *            queue_back  = 2
+		 *
+		 * In this case, the first memcpy will only copy elements 2-4. The memcpy below will be
+		 * responsible for copying elements 0-1.
+		*/
+		b8 items_left_to_copy = back_count > 0;
+		if (items_left_to_copy) {
 			void *back_copy_dst = (void *)((uptr)(output->items) + (front_count * item_size));
 			memcpy(back_copy_dst, queue->items, back_count * item_size);
 		}

src/common/aliases/aliases.h

@@ -60,7 +60,7 @@ typedef intptr_t iptr;
 
 #ifdef WAPP_PLATFORM_CPP
 #define wapp_class_mem static
-#define BEGIN_C_LINKAGE extern "C" {
+#define BEGIN_C_LINKAGE wapp_extern "C" {
 #define END_C_LINKAGE }
 #endif // WAPP_PLATFORM_CPP
 

src/common/assert/assert.h

@@ -13,7 +13,7 @@
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP
 
-#define wapp_static_assert(EXPR, MSG) extern char ASSERTION_FAILED[EXPR ? 1 : -1]
+#define wapp_static_assert(EXPR, MSG) wapp_extern char ASSERTION_FAILED[EXPR ? 1 : -1]
 
 #ifndef WAPP_NO_RUNTIME_ASSERT
 	#define wapp_runtime_assert(EXPR, MSG) __wapp_runtime_assert(EXPR, MSG)

src/log/log.c

@@ -0,0 +1,102 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#include "log.h"
+#include "../common/aliases/aliases.h"
+#include "../common/assert/assert.h"
+#include "../os/file/file.h"
+#include "common/misc/misc_utils.h"
+
+#define LOG_LEVEL_STR_LENGTH 8
+#define LOG_PREFIX_BUF_LENGTH 16
+
+typedef struct {
+	WFile *outlog;
+	WFile *errlog;
+	LogLevel level;
+
+	wapp_misc_utils_reserve_padding(2 * sizeof(WFile *) + sizeof(LogLevel));
+} LogConfig;
+
+wapp_intern LogConfig LOG_CONFIG = {
+	.level = WAPP_LOG_DEBUG,
+};
+wapp_intern Str8RO LOG_LEVEL_STRINGS[COUNT_LOG_LEVEL] = {
+	[WAPP_LOG_FATAL]    = wapp_str8_lit_ro_initialiser_list("[ FATAL    ] "),
+	[WAPP_LOG_CRITICAL] = wapp_str8_lit_ro_initialiser_list("[ CRITICAL ] "),
+	[WAPP_LOG_ERROR]    = wapp_str8_lit_ro_initialiser_list("[ ERROR    ] "),
+	[WAPP_LOG_WARNING]  = wapp_str8_lit_ro_initialiser_list("[ WARNING  ] "),
+	[WAPP_LOG_INFO]     = wapp_str8_lit_ro_initialiser_list("[ INFO     ] "),
+	[WAPP_LOG_DEBUG]    = wapp_str8_lit_ro_initialiser_list("[ DEBUG    ] "),
+};
+
+wapp_intern void _write_log_line(WFile *fp, const Logger *logger, Str8 msg, LogLevel level);
+
+void wapp_log_set_level(LogLevel level) {
+	LOG_CONFIG.level = level;
+}
+
+void wapp_log_configure(WFile *outlog, WFile *errlog, LogLevel level) {
+	LOG_CONFIG.outlog = outlog;
+	LOG_CONFIG.errlog = errlog;
+	LOG_CONFIG.level  = level;
+}
+
+Logger wapp_log_make_logger(Str8 name) {
+	return (Logger){ .name = name };
+}
+
+void wapp_log_debug(const Logger *logger, Str8 msg) {
+	wapp_debug_assert(logger != NULL, "`logger` should not be NULL");
+	if (LOG_CONFIG.level < WAPP_LOG_DEBUG) { return; }
+
+	WFile *fp = LOG_CONFIG.outlog != NULL ? LOG_CONFIG.outlog : wapp_file_stdout();
+	_write_log_line(fp, logger, msg, WAPP_LOG_DEBUG);
+}
+
+void wapp_log_info(const Logger *logger, Str8 msg) {
+	wapp_debug_assert(logger != NULL, "`logger` should not be NULL");
+	if (LOG_CONFIG.level < WAPP_LOG_INFO) { return; }
+
+	WFile *fp = LOG_CONFIG.outlog != NULL ? LOG_CONFIG.outlog : wapp_file_stdout();
+	_write_log_line(fp, logger, msg, WAPP_LOG_INFO);
+}
+
+void wapp_log_warning(const Logger *logger, Str8 msg) {
+	wapp_debug_assert(logger != NULL, "`logger` should not be NULL");
+	if (LOG_CONFIG.level < WAPP_LOG_WARNING) { return; }
+
+	WFile *fp = LOG_CONFIG.outlog != NULL ? LOG_CONFIG.outlog : wapp_file_stdout();
+	_write_log_line(fp, logger, msg, WAPP_LOG_WARNING);
+}
+
+void wapp_log_error(const Logger *logger, Str8 msg) {
+	wapp_debug_assert(logger != NULL, "`logger` should not be NULL");
+	if (LOG_CONFIG.level < WAPP_LOG_ERROR) { return; }
+
+	WFile *fp = LOG_CONFIG.errlog != NULL ? LOG_CONFIG.errlog : wapp_file_stderr();
+	_write_log_line(fp, logger, msg, WAPP_LOG_ERROR);
+}
+
+void wapp_log_critical(const Logger *logger, Str8 msg) {
+	wapp_debug_assert(logger != NULL, "`logger` should not be NULL");
+	if (LOG_CONFIG.level < WAPP_LOG_CRITICAL) { return; }
+
+	WFile *fp = LOG_CONFIG.errlog != NULL ? LOG_CONFIG.errlog : wapp_file_stderr();
+	_write_log_line(fp, logger, msg, WAPP_LOG_CRITICAL);
+}
+
+void wapp_log_fatal(const Logger *logger, Str8 msg) {
+	wapp_debug_assert(logger != NULL, "`logger` should not be NULL");
+	if (LOG_CONFIG.level < WAPP_LOG_FATAL) { return; }
+
+	WFile *fp = LOG_CONFIG.errlog != NULL ? LOG_CONFIG.errlog : wapp_file_stderr();
+	_write_log_line(fp, logger, msg, WAPP_LOG_FATAL);
+}
+
+wapp_intern void _write_log_line(WFile *fp, const Logger *logger, Str8 msg, LogLevel level) {
+	wapp_file_write((void *)LOG_LEVEL_STRINGS[level].buf, fp, LOG_LEVEL_STRINGS[level].size);
+	wapp_file_write((void *)logger->name.buf, fp, logger->name.size);
+	wapp_file_write((void *)": ", fp, 2);
+	wapp_file_write((void *)msg.buf, fp, msg.size);
+	wapp_file_write((void *)"\n", fp, 1);
+}

src/log/log.h

@@ -0,0 +1,34 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef LOG_H
+#define LOG_H
+
+#include "../os/file/file.h"
+#include "../base/strings/str8/str8.h"
+
+typedef enum {
+	WAPP_LOG_FATAL,
+	WAPP_LOG_CRITICAL,
+	WAPP_LOG_ERROR,
+	WAPP_LOG_WARNING,
+	WAPP_LOG_INFO,
+	WAPP_LOG_DEBUG,
+
+	COUNT_LOG_LEVEL,
+} LogLevel;
+
+typedef struct {
+	Str8 name;
+} Logger;
+
+void wapp_log_set_level(LogLevel level);
+void wapp_log_configure(WFile *outlog, WFile *errlog, LogLevel level);
+Logger wapp_log_make_logger(Str8 name);
+void wapp_log_debug(const Logger *logger, Str8 msg);
+void wapp_log_info(const Logger *logger, Str8 msg);
+void wapp_log_warning(const Logger *logger, Str8 msg);
+void wapp_log_error(const Logger *logger, Str8 msg);
+void wapp_log_critical(const Logger *logger, Str8 msg);
+void wapp_log_fatal(const Logger *logger, Str8 msg);
+
+#endif // !LOG_H

src/log/wapp_log.c

@@ -0,0 +1,10 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef WAPP_LOG_C
+#define WAPP_LOG_C
+
+#include "log.c"
+#include "../base/wapp_base.c"
+#include "../os/wapp_os.c"
+
+#endif // !WAPP_LOG_C

src/log/wapp_log.h

@@ -0,0 +1,11 @@
+// vim:fileencoding=utf-8:foldmethod=marker
+
+#ifndef WAPP_LOG_H
+#define WAPP_LOG_H
+
+#include "log.h"
+#include "../common/wapp_common.h"
+#include "../base/wapp_base.h"
+#include "../os/wapp_os.h"
+
+#endif // !WAPP_LOG_H

src/os/file/file.h

@@ -34,6 +34,18 @@ typedef enum {
 	FILE_SEEK_ORIGIN_COUNT,
 } FileSeekOrigin;
 
+// Return value should not be cached as it's not guaranteed to remain the same. Always call
+// wapp_file_stdin to get the standard input stream
+wapp_extern WFile *wapp_file_stdin(void);
+
+// Return value should not be cached as it's not guaranteed to remain the same. Always call
+// wapp_file_stdout to get the standard output stream
+wapp_extern WFile *wapp_file_stdout(void);
+
+// Return value should not be cached as it's not guaranteed to remain the same. Always call
+// wapp_file_stderr to get the standard error stream
+wapp_extern WFile *wapp_file_stderr(void);
+
 WFile *wapp_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode);
 i64    wapp_file_get_current_position(WFile *file);
 i64    wapp_file_seek(WFile *file, i64 offset, FileSeekOrigin origin);
@@ -47,14 +59,14 @@ i32    wapp_file_close(WFile *file);
 i32    wapp_file_rename(Str8RO *old_filepath, Str8RO *new_filepath);
 i32    wapp_file_remove(Str8RO *filepath);
 
-extern WFile *_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode);
+wapp_extern WFile *_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode);
-extern i64    _file_seek(WFile *file, i64 offset, FileSeekOrigin origin);
+wapp_extern i64    _file_seek(WFile *file, i64 offset, FileSeekOrigin origin);
-extern u64    _file_read(void *dst_buf, u64 byte_count, WFile *file, u64 file_length);
+wapp_extern u64    _file_read(void *dst_buf, u64 byte_count, WFile *file, u64 file_length);
-extern i64    _file_write(const void *src_buf, WFile *file, u64 byte_count);
+wapp_extern i64    _file_write(const void *src_buf, WFile *file, u64 byte_count);
-extern i32    _file_flush(WFile *file);
+wapp_extern i32    _file_flush(WFile *file);
-extern i32    _file_close(WFile *file);
+wapp_extern i32    _file_close(WFile *file);
-extern i32    _file_rename(Str8RO *old_filepath, Str8RO *new_filepath);
+wapp_extern i32    _file_rename(Str8RO *old_filepath, Str8RO *new_filepath);
-extern i32    _file_remove(Str8RO *filepath);
+wapp_extern i32    _file_remove(Str8RO *filepath);
 
 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE

src/os/file/posix/file_posix.c

@@ -49,6 +49,21 @@ wapp_intern i32 file_seek_origins[FILE_SEEK_ORIGIN_COUNT] = {
 	[WAPP_SEEK_END]     = SEEK_END,
 };
 
+WFile *wapp_file_stdin(void) {
+	wapp_persist WFile _stdin  = { .fd = STDIN_FILENO };
+	return &_stdin;
+}
+
+WFile *wapp_file_stdout(void) {
+	wapp_persist WFile _stdout = { .fd = STDOUT_FILENO };
+	return &_stdout;
+}
+
+WFile *wapp_file_stderr(void) {
+	wapp_persist WFile _stderr = { .fd = STDERR_FILENO };
+	return &_stderr;
+}
+
 WFile *_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode) {
 	wapp_persist c8 tmp[WAPP_PATH_MAX] = {0};
 	memset(tmp, 0, WAPP_PATH_MAX);

src/os/file/win/file_win.c

@@ -54,6 +54,24 @@ wapp_intern DWORD file_seek_origins[FILE_SEEK_ORIGIN_COUNT] = {
 	[WAPP_SEEK_END]     = FILE_END,
 };
 
+WFile *wapp_file_stdin(void) {
+	wapp_persist WFile _stdin  = { .fh = INVALID_HANDLE_VALUE };
+	_stdin.fh = GetStdHandle(STD_INPUT_HANDLE);
+	return &_stdin;
+}
+
+WFile *wapp_file_stdout(void) {
+	wapp_persist WFile _stdout = { .fh = INVALID_HANDLE_VALUE };
+	_stdout.fh = GetStdHandle(STD_OUTPUT_HANDLE);
+	return &_stdout;
+}
+
+WFile *wapp_file_stderr(void) {
+	wapp_persist WFile _stderr = { .fh = INVALID_HANDLE_VALUE };
+	_stderr.fh = GetStdHandle(STD_ERROR_HANDLE);
+	return &_stderr;
+}
+
 WFile *_file_open(const Allocator *allocator, Str8RO *filepath, FileAccessMode mode) {
 	wapp_persist c8 tmp[WAPP_PATH_MAX] = {0};
 	memset(tmp, 0, WAPP_PATH_MAX);

src/os/shell/commander/commander.c

@@ -86,7 +86,7 @@ EXECUTE_COMMAND_CLOSE:
 wapp_intern CMDError get_command_output(FILE *fp, CMDOutHandling out_handling, Str8 *out_buf) {
 	Str8 out = wapp_str8_buf(OUT_BUF_LEN);
 
-	out.size = fread((void *)out.buf, sizeof(u8), out.capacity, fp);
+	out.size = fread((void *)out.buf, sizeof(c8), out.capacity, fp);
 	if (out_handling == SHELL_OUTPUT_CAPTURE && out_buf != NULL) {
 		if (out.size >= out_buf->capacity) {
 			return SHELL_ERR_OUT_BUF_FULL;

src/os/shell/commander/commander.h

@@ -10,6 +10,8 @@
 #include <stdio.h>
 #include <stdlib.h>
 
+// TODO (Abdelrahman): This module needs rethinking
+
 #ifdef WAPP_PLATFORM_CPP
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP

src/os/shell/termcolour/termcolour.h

@@ -12,6 +12,8 @@
 BEGIN_C_LINKAGE
 #endif // !WAPP_PLATFORM_CPP
 
+// TODO (Abdelrahman): Look into moving away from stdio in the implementation
+
 void wapp_shell_termcolour_print_text(Str8RO *text, TerminalColour colour);
 void wapp_shell_termcolour_clear_colour(void);
 

src/uuid/uuid.h

@@ -22,11 +22,22 @@ struct WUUID {
 
 // TODO (Abdelrahman): Update UUID implementation to work properly with C++ and tests for validation
 
+#ifdef WAPP_PLATFORM_CPP
+#define wapp_uuid_gen_uuid4() ([&](){           \
+	wapp_persist WUUID uuid = wapp_uuid_create(); \
+	return *(wapp_uuid_init_uuid4(&uuid));        \
+}())
+#else
 #define wapp_uuid_gen_uuid4() *(wapp_uuid_init_uuid4(&wapp_uuid_create()))
+#endif
 
 /* Low level UUID API */
 
+#ifdef WAPP_PLATFORM_CPP
+#define wapp_uuid_create() ([&](){ return WUUID{wapp_str8_buf(UUID_BUF_LENGTH)}; }())
+#else
 #define wapp_uuid_create() ((WUUID){.uuid = wapp_str8_buf(UUID_BUF_LENGTH)})
+#endif
 
 // Just returns the same pointer that was passed in with the UUID initialised.
 // Fails when passed a NULL pointer.

src/wapp.c

@@ -6,8 +6,9 @@
 #include "wapp.h"
 #include "base/wapp_base.c"
 #include "os/wapp_os.c"
+#include "log/wapp_log.c"
 #include "prng/wapp_prng.c"
-#include "uuid/uuid.c"
+#include "uuid/wapp_uuid.c"
 #include "testing/wapp_testing.c"
 
 #endif // !WAPP_C

src/wapp.h

@@ -6,6 +6,7 @@
 #include "common/wapp_common.h"
 #include "base/wapp_base.h"
 #include "os/wapp_os.h"
+#include "log/wapp_log.h"
 #include "prng/wapp_prng.h"
 #include "uuid/wapp_uuid.h"
 #include "testing/wapp_testing.h"

tests/queue/test_queue.c

@@ -47,7 +47,7 @@ TestFuncResult test_queue_push_alloc(void) {
 
 	u64 remaining = wapp_queue_capacity(&queue) - queue.count;
 	for (u64 i = 0; i < remaining; ++i) {
-		item = remaining + i;
+		item = (i32)(remaining + i);
 		wapp_queue_push(i32, &queue, &item);
 	}
 

tests/queue/test_queue.cc

@@ -45,7 +45,7 @@ TestFuncResult test_queue_push_alloc(void) {
 
 	u64 remaining = wapp_queue_capacity(&queue) - queue.count;
 	for (u64 i = 0; i < remaining; ++i) {
-		item = remaining + i;
+		item = (i32)(remaining + i);
 		wapp_queue_push(i32, &queue, &item);
 	}