From e6420cb1c9ab780e85998537444ee589b91a476a Mon Sep 17 00:00:00 2001 From: laentropia Date: Thu, 23 Apr 2026 12:39:04 -0600 Subject: [PATCH] add/fix: Added arena implementation and cmake rework --- .gitignore | 1 + CMakeLists.txt | 32 +++++++++++--------------------- external/arena | 1 - src/parser.c | 2 -- 4 files changed, 12 insertions(+), 24 deletions(-) delete mode 160000 external/arena diff --git a/.gitignore b/.gitignore index 157dd82..e920eb7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ out/Release/ # Cmake files CMakeCache.txt +cmake CMakeFiles/ cmake_install.cmake CTestTestfile.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index a64adf4..2cffd3d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,16 +3,8 @@ project(calculator VERSION 1.0 LANGUAGES C) set(CMAKE_C_STANDARD 11) set(CMAKE_C_STANDARD_REQUIRED ON) -include(FetchContent) -FetchContent_Declare( - arena - GIT_REPOSITORY https://laentropia-homelab.tail7368da.ts.net/laentropia/Arena.git - GIT_TAG main - SOURCE_DIR ${CMAKE_SOURCE_DIR}/external/arena -) - -# Export compile_commands.json (para clangd) +# clangd set(CMAKE_EXPORT_COMPILE_COMMANDS ON) add_compile_options( @@ -21,15 +13,18 @@ add_compile_options( -Wpedantic ) +include(cmake/CPM.cmake) -FetchContent_MakeAvailable(arena) - -add_library(arena STATIC - external/arena/src/arena.c +CPMAddPackage( + NAME arena + GIT_REPOSITORY https://laentropia-homelab.tail7368da.ts.net/laentropia/Arena.git + GIT_TAG main ) -target_include_directories(arena - PUBLIC ${CMAKE_SOURCE_DIR}/external/arena/include +CPMAddPackage( + NAME arraylist + GIT_REPOSITORY https://laentropia-homelab.tail7368da.ts.net/laentropia/ArrayList.git + GIT_TAG main ) add_library(calculator_lib @@ -43,18 +38,13 @@ target_include_directories(calculator_lib PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/include ) +# 🔥 aquí está la magia target_link_libraries(calculator_lib PUBLIC arena ) add_executable(calculator src/main.c) - target_link_libraries(calculator calculator_lib) -# ------------------------ -# Testing -# ------------------------ - enable_testing() add_subdirectory(test) - diff --git a/external/arena b/external/arena deleted file mode 160000 index 3d3b859..0000000 --- a/external/arena +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 3d3b8596ccf2e31983c0c83eb36572a1e4399ec4 diff --git a/src/parser.c b/src/parser.c index 2e417c5..9f454ef 100644 --- a/src/parser.c +++ b/src/parser.c @@ -4,8 +4,6 @@ #include #include #include -#include - uint8_t node_lbp(ASTNode node) { if (node.type == NODE_INTEGER) {