Merge pull request #5 from dreamer-coding/main

Update Project

Author: dreamer-coding

.github/ciimage/Dockerfile.archlinux

@@ -11,13 +11,10 @@ RUN pacman -Syu --noconfirm && \
     clang \
     gdb \
     llvm \
-    rust \
-    cargo \
     wget \
     python \
     python-pip \
     git \
-    cmake \
     meson \
     ninja \
     tzdata && \

.github/ciimage/Dockerfile.debian

@@ -15,7 +15,6 @@ RUN apt-get update && \
     gdb \
     llvm \
     libstdc++-8-dev \
-    cmake \
     wget \
     python3 \
     python3-pip \

.github/ciimage/Dockerfile.fedora

@@ -13,15 +13,13 @@ RUN dnf -y update && \
     clang \
     gdb \
     llvm \
-    rust \
-    cargo \
     wget \
     python3 \
     python3-pip \
     git && \
     dnf clean all
 # Install Meson and Ninja using pip
-RUN python3 -m pip install --no-cache-dir cmake meson ninja
+RUN python3 -m pip install --no-cache-dir meson ninja
 
 # Set environment variables
 ENV CC=/usr/bin/clang

.github/ciimage/Dockerfile.ubuntu

@@ -15,8 +15,6 @@ RUN apt-get update && \
     gdb \
     llvm \
     libstdc++-10-dev \
-    rustc \
-    cargo \
     wget \
     python3 \
     python3-pip \
@@ -25,7 +23,7 @@ RUN apt-get update && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/*
 
-RUN python3 -m pip install --no-cache-dir cmake meson ninja
+RUN python3 -m pip install --no-cache-dir meson ninja
 
 # Set environment variables
 ENV CC=/usr/bin/gcc

.github/workflows/meson_ci.yml

@@ -344,4 +344,4 @@ jobs:
 
       - name: Build the Project
         run: |
-          meson compile -C builddir
+          meson compile -C builddir

code/logic/meson.build

@@ -1,6 +1,6 @@
 dir = include_directories('.')
 
-fossil_sys_lib = library('fossil-sys',
+fossil_sys_lib = static_library('fossil-sys',
     files('memory.c', 'datetime.c', 'hostinfo.c', 'syscall.c', 'bitwise.c'),
     install: true,
     dependencies: [dependency('threads')],

code/tests/cases/test_bitwise.c

@@ -11,7 +11,7 @@
  * Copyright (C) 2024 Fossil Logic. All rights reserved.
  * -----------------------------------------------------------------------------
  */
-#include <fossil/test/framework.h>
+#include <fossil/pizza/framework.h>
 
 #include "fossil/sys/framework.h"
 
@@ -23,7 +23,7 @@
 // * * * * * * * * * * * * * * * * * * * * * * * *
 
 // Define the test suite and add test cases
-FOSSIL_TEST_SUITE(c_bitwise_suite);
+FOSSIL_SUITE(c_bitwise_suite);
 
 // Setup function for the test suite
 FOSSIL_SETUP(c_bitwise_suite) {
@@ -44,7 +44,7 @@ FOSSIL_TEARDOWN(c_bitwise_suite) {
 // * * * * * * * * * * * * * * * * * * * * * * * *
 
 // ** Test fossil_sys_bitwise_parse Function **
-FOSSIL_TEST_CASE(c_test_bitwise_parse) {
+FOSSIL_TEST(c_test_bitwise_parse) {
     fossil_sys_bitwise_entry_t entries[] = {
         {"read", 0x1},
         {"write", 0x2},
@@ -65,7 +65,7 @@ FOSSIL_TEST_CASE(c_test_bitwise_parse) {
 }
 
 // ** Test fossil_sys_bitwise_format Function **
-FOSSIL_TEST_CASE(c_test_bitwise_format) {
+FOSSIL_TEST(c_test_bitwise_format) {
     fossil_sys_bitwise_entry_t entries[] = {
         {"read", 0x1},
         {"write", 0x2},
@@ -90,7 +90,7 @@ FOSSIL_TEST_CASE(c_test_bitwise_format) {
 }
 
 // ** Test fossil_sys_bitwise_lookup Function **
-FOSSIL_TEST_CASE(c_test_bitwise_lookup) {
+FOSSIL_TEST(c_test_bitwise_lookup) {
     fossil_sys_bitwise_entry_t entries[] = {
         {"read", 0x1},
         {"write", 0x2},

code/tests/cases/test_bitwise.cpp

@@ -11,7 +11,7 @@
  * Copyright (C) 2024 Fossil Logic. All rights reserved.
  * -----------------------------------------------------------------------------
  */
-#include <fossil/test/framework.h>
+#include <fossil/pizza/framework.h>
 
 #include "fossil/sys/framework.h"
 
@@ -23,7 +23,7 @@
 // * * * * * * * * * * * * * * * * * * * * * * * *
 
 // Define the test suite and add test cases
-FOSSIL_TEST_SUITE(cpp_bitwise_suite);
+FOSSIL_SUITE(cpp_bitwise_suite);
 
 // Setup function for the test suite
 FOSSIL_SETUP(cpp_bitwise_suite) {
@@ -44,7 +44,7 @@ FOSSIL_TEARDOWN(cpp_bitwise_suite) {
 // * * * * * * * * * * * * * * * * * * * * * * * *
 
 // ** Test fossil::sys::Bitwise::parse Function **
-FOSSIL_TEST_CASE(cpp_test_class_bitwise_parse) {
+FOSSIL_TEST(cpp_test_class_bitwise_parse) {
     fossil_sys_bitwise_entry_t entries[] = {
         {"read", 0x1},
         {"write", 0x2},
@@ -65,7 +65,7 @@ FOSSIL_TEST_CASE(cpp_test_class_bitwise_parse) {
 }
 
 // ** Test fossil::sys::Bitwise::format Function **
-FOSSIL_TEST_CASE(cpp_test_class_bitwise_format) {
+FOSSIL_TEST(cpp_test_class_bitwise_format) {
     fossil_sys_bitwise_entry_t entries[] = {
         {"read", 0x1},
         {"write", 0x2},
@@ -90,7 +90,7 @@ FOSSIL_TEST_CASE(cpp_test_class_bitwise_format) {
 }
 
 // ** Test fossil::sys::Bitwise::lookup Function **
-FOSSIL_TEST_CASE(cpp_test_class_bitwise_lookup) {
+FOSSIL_TEST(cpp_test_class_bitwise_lookup) {
     fossil_sys_bitwise_entry_t entries[] = {
         {"read", 0x1},
         {"write", 0x2},

code/tests/cases/test_cnullptr.c

@@ -11,7 +11,7 @@
  * Copyright (C) 2024 Fossil Logic. All rights reserved.
  * -----------------------------------------------------------------------------
  */
-#include <fossil/test/framework.h>
+#include <fossil/pizza/framework.h>
 
 #include "fossil/sys/framework.h"
 
@@ -31,7 +31,7 @@
 // * * * * * * * * * * * * * * * * * * * * * * * *
 
 // Define the test suite and add test cases
-FOSSIL_TEST_SUITE(c_null_suite);
+FOSSIL_SUITE(c_null_suite);
 
 // Setup function for the test suite
 FOSSIL_SETUP(c_null_suite) {
@@ -52,28 +52,28 @@ FOSSIL_TEARDOWN(c_null_suite) {
 // * * * * * * * * * * * * * * * * * * * * * * * *
 
 // Ensure the necessary macros and types are defined
-FOSSIL_TEST_CASE(c_test_cnull_definition) {
+FOSSIL_TEST(c_test_cnull_definition) {
     ASSUME_ITS_EQUAL_PTR(cnull, (void *)(0));
     ASSUME_ITS_EQUAL_PTR(cnullptr, (void *)(0));
 }
 
 // ** Test cnullify Macro **
-FOSSIL_TEST_CASE(c_test_cnullify) {
+FOSSIL_TEST(c_test_cnullify) {
     void *ptr = (void *)1;
     cnullify(ptr);
     ASSUME_ITS_EQUAL_PTR(ptr, cnull);
 }
 
 // ** Test cnotnull Macro **
-FOSSIL_TEST_CASE(c_test_cnotnull) {
+FOSSIL_TEST(c_test_cnotnull) {
     void *ptr = (void *)1;
     ASSUME_ITS_TRUE(cnotnull(ptr));
     cnullify(ptr);
     ASSUME_ITS_FALSE(cnotnull(ptr));
 }
 
 // ** Test cunwrap_or Macro **
-FOSSIL_TEST_CASE(c_test_cunwrap_or) {
+FOSSIL_TEST(c_test_cunwrap_or) {
     void *ptr = (void *)1;
     void *default_ptr = (void *)99;
     ASSUME_ITS_EQUAL_PTR(cunwrap_or(ptr, default_ptr), ptr);
@@ -82,15 +82,15 @@ FOSSIL_TEST_CASE(c_test_cunwrap_or) {
 }
 
 // ** Test cunwrap Macro **
-FOSSIL_TEST_CASE(c_test_cunwrap) {
+FOSSIL_TEST(c_test_cunwrap) {
     void *ptr = (void *)1;
     ASSUME_ITS_EQUAL_PTR(cunwrap(ptr), ptr);
     // cnullify(ptr);
     // ASSUME_ITS_EQUAL_PTR(cunwrap(ptr), cnull);  // Should exit on failure in actual code, but we test that it returns cnull
 }
 
 // ** Test csafe_cast Macro **
-FOSSIL_TEST_CASE(c_test_csafe_cast) {
+FOSSIL_TEST(c_test_csafe_cast) {
     void *ptr = (void *)1;
     int *casted_ptr = csafe_cast(int *, ptr);
     ASSUME_ITS_EQUAL_PTR(casted_ptr, (int *)ptr);
@@ -100,7 +100,7 @@ FOSSIL_TEST_CASE(c_test_csafe_cast) {
 }
 
 // ** Test cnullable and cnonnull Attributes **
-FOSSIL_TEST_CASE(c_test_nullable_nonnull) {
+FOSSIL_TEST(c_test_nullable_nonnull) {
     // These tests are intended to verify that nullable and nonnull attributes are handled by the compiler, so the actual test might be compiler-specific.
     void *ptr = cnull;
     ASSUME_ITS_TRUE(cnotnull(ptr) == 0);
@@ -109,15 +109,15 @@ FOSSIL_TEST_CASE(c_test_nullable_nonnull) {
 }
 
 // ** Test coptional Macro and cnone() and csome() **
-FOSSIL_TEST_CASE(c_test_coptional) {
+FOSSIL_TEST(c_test_coptional) {
     void *ptr = (void *)1;
     ASSUME_ITS_EQUAL_PTR(c_optional(ptr), ptr);
     cnullify(ptr);
     ASSUME_ITS_EQUAL_PTR(c_optional(ptr), cnull);
 }
 
 // ** Test COption structure and cunwrap_option Macro **
-FOSSIL_TEST_CASE(c_test_cunwrap_option) {
+FOSSIL_TEST(c_test_cunwrap_option) {
     COption some_option = csome((void *)1);
     COption none_option = cnone();
     ASSUME_ITS_EQUAL_PTR(cunwrap_option(some_option), (void *)1);
@@ -128,15 +128,15 @@ FOSSIL_TEST_CASE(c_test_cunwrap_option) {
 }
 
 // ** Test cunwrap_or_option Macro **
-FOSSIL_TEST_CASE(c_test_cunwrap_or_option) {
+FOSSIL_TEST(c_test_cunwrap_or_option) {
     COption some_option = csome((void *)1);
     COption none_option = cnone();
     ASSUME_ITS_EQUAL_PTR(cunwrap_or_option(some_option, (void *)99), (void *)1);
     ASSUME_ITS_EQUAL_PTR(cunwrap_or_option(none_option, (void *)99), (void *)99);
 }
 
 // ** Test cdrop Macro **
-FOSSIL_TEST_CASE(c_test_cdrop) {
+FOSSIL_TEST(c_test_cdrop) {
     void *ptr = (void *)1;
     cdrop(ptr);
     ASSUME_ITS_EQUAL_PTR(ptr, cnull);

code/tests/cases/test_cnullptr.cpp

@@ -11,7 +11,7 @@
  * Copyright (C) 2024 Fossil Logic. All rights reserved.
  * -----------------------------------------------------------------------------
  */
-#include <fossil/test/framework.h>
+#include <fossil/pizza/framework.h>
 #include "fossil/sys/framework.h"
 
 #ifndef cnull
@@ -30,7 +30,7 @@
 // * * * * * * * * * * * * * * * * * * * * * * * *
 
 // Define the test suite and add test cases
-FOSSIL_TEST_SUITE(cpp_null_suite);
+FOSSIL_SUITE(cpp_null_suite);
 
 // Setup function for the test suite
 FOSSIL_SETUP(cpp_null_suite) {
@@ -51,7 +51,7 @@ FOSSIL_TEARDOWN(cpp_null_suite) {
 // * * * * * * * * * * * * * * * * * * * * * * * *
 
 // ** Test csafe_cast Macro **
-FOSSIL_TEST_CASE(cpp_test_csafe_cast) {
+FOSSIL_TEST(cpp_test_csafe_cast) {
     void *ptr = reinterpret_cast<void *>(1);  // Use safe_cast instead of C cast
     int *casted_ptr = static_cast<int *>(ptr);  // Using the safe_cast macro
     ASSUME_ITS_EQUAL_PTR(casted_ptr, reinterpret_cast<int *>(ptr));
@@ -63,22 +63,22 @@ FOSSIL_TEST_CASE(cpp_test_csafe_cast) {
 }
 
 // ** Test cnullify Macro **
-FOSSIL_TEST_CASE(cpp_test_cnullify) {
+FOSSIL_TEST(cpp_test_cnullify) {
     void *ptr = reinterpret_cast<void *>(1);
     cnullify(ptr);
     ASSUME_ITS_EQUAL_PTR(ptr, cnull);
 }
 
 // ** Test cnotnull Macro **
-FOSSIL_TEST_CASE(cpp_test_cnotnull) {
+FOSSIL_TEST(cpp_test_cnotnull) {
     void *ptr = reinterpret_cast<void *>(1);
     ASSUME_ITS_TRUE(cnotnull(ptr));
     cnullify(ptr);
     ASSUME_ITS_FALSE(cnotnull(ptr));
 }
 
 // ** Test cunwrap_or Macro **
-FOSSIL_TEST_CASE(cpp_test_cunwrap_or) {
+FOSSIL_TEST(cpp_test_cunwrap_or) {
     void *ptr = reinterpret_cast<void *>(1);
     void *default_ptr = reinterpret_cast<void *>(99);
     ASSUME_ITS_EQUAL_PTR(cunwrap_or(ptr, default_ptr), ptr);
@@ -87,31 +87,31 @@ FOSSIL_TEST_CASE(cpp_test_cunwrap_or) {
 }
 
 // ** Test cunwrap Macro **
-FOSSIL_TEST_CASE(cpp_test_cunwrap) {
+FOSSIL_TEST(cpp_test_cunwrap) {
     void *ptr = reinterpret_cast<void *>(1);
     ASSUME_ITS_EQUAL_PTR(cunwrap(ptr), ptr);
     // cnullify(ptr);
     // ASSUME_ITS_EQUAL_PTR(cunwrap(ptr), cnull);  // Should return cnull when it's cnull
 }
 
 // ** Test cnullable and cnonnull Attributes **
-FOSSIL_TEST_CASE(cpp_test_nullable_nonnull) {
+FOSSIL_TEST(cpp_test_nullable_nonnull) {
     void *ptr = cnull;
     ASSUME_ITS_TRUE(cnotnull(ptr) == 0);
     ptr = reinterpret_cast<void *>(1);
     ASSUME_ITS_TRUE(cnotnull(ptr) == 1);
 }
 
 // ** Test coptional Macro and cnone() and csome() **
-FOSSIL_TEST_CASE(cpp_test_coptional) {
+FOSSIL_TEST(cpp_test_coptional) {
     void *ptr = reinterpret_cast<void *>(1);
     ASSUME_ITS_EQUAL_PTR(c_optional(ptr), ptr);
     cnullify(ptr);
     ASSUME_ITS_EQUAL_PTR(c_optional(ptr), cnull);
 }
 
 // ** Test COption structure and cunwrap_option Macro **
-FOSSIL_TEST_CASE(cpp_test_cunwrap_option) {
+FOSSIL_TEST(cpp_test_cunwrap_option) {
     COption some_option = csome(reinterpret_cast<void *>(1));
     COption none_option = cnone();
     ASSUME_ITS_EQUAL_PTR(cunwrap_option(some_option), reinterpret_cast<void *>(1));
@@ -122,15 +122,15 @@ FOSSIL_TEST_CASE(cpp_test_cunwrap_option) {
 }
 
 // ** Test cunwrap_or_option Macro **
-FOSSIL_TEST_CASE(cpp_test_cunwrap_or_option) {
+FOSSIL_TEST(cpp_test_cunwrap_or_option) {
     COption some_option = csome(reinterpret_cast<void *>(1));
     COption none_option = cnone();
     ASSUME_ITS_EQUAL_PTR(cunwrap_or_option(some_option, reinterpret_cast<void *>(99)), reinterpret_cast<void *>(1));
     ASSUME_ITS_EQUAL_PTR(cunwrap_or_option(none_option, reinterpret_cast<void *>(99)), reinterpret_cast<void *>(99));
 }
 
 // ** Test cdrop Macro **
-FOSSIL_TEST_CASE(cpp_test_cdrop) {
+FOSSIL_TEST(cpp_test_cdrop) {
     void *ptr = reinterpret_cast<void *>(1);
     cdrop(ptr);
     ASSUME_ITS_EQUAL_PTR(ptr, cnull);
@@ -142,6 +142,16 @@ FOSSIL_TEST_CASE(cpp_test_cdrop) {
 
 FOSSIL_TEST_GROUP(cpp_nullptr_tests) {
     FOSSIL_TEST_ADD(cpp_null_suite, cpp_test_csafe_cast);
+    FOSSIL_TEST_ADD(cpp_null_suite, cpp_test_cnullify);
+    FOSSIL_TEST_ADD(cpp_null_suite, cpp_test_cnotnull);
+    FOSSIL_TEST_ADD(cpp_null_suite, cpp_test_cunwrap_or);
+    FOSSIL_TEST_ADD(cpp_null_suite, cpp_test_cunwrap);
+    FOSSIL_TEST_ADD(cpp_null_suite, cpp_test_nullable_nonnull);
+    FOSSIL_TEST_ADD(cpp_null_suite, cpp_test_coptional);
+    FOSSIL_TEST_ADD(cpp_null_suite, cpp_test_cunwrap_option);
+    FOSSIL_TEST_ADD(cpp_null_suite, cpp_test_cunwrap_or_option);
+    FOSSIL_TEST_ADD(cpp_null_suite, cpp_test_cdrop);
+    FOSSIL_TEST_ADD(cpp_null_suite, cpp_test_cnotnull);
     FOSSIL_TEST_ADD(cpp_null_suite, cpp_test_nullable_nonnull);
     FOSSIL_TEST_ADD(cpp_null_suite, cpp_test_coptional);
     FOSSIL_TEST_ADD(cpp_null_suite, cpp_test_cunwrap_option);