laentropia/Calculator
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Merge pull request 'refactor: xmake in use, allocator sintaxis' (#13) from refactor-xmake into main

Browse Source 
Reviewed-on: #13
This commit was merged in pull request #13.
This commit is contained in:
Alonso Adrian Martinez Hernandez
2026-06-10 16:05:00 -06:00
parent 21853362a4 9a2e084143
commit 14c115bdbc
9 changed files with 444 additions and 578 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@@ -7,6 +7,12 @@ out/
out/Debug/
out/Release/
# xmake
.xmake
xmake
xmake/
.xmake/
# Cmake files
CMakeCache.txt
cmake

100
CMakeLists.txt
View File

@@ -1,100 +0,0 @@
cmake_minimum_required(VERSION 3.20)
project(
calculator
VERSION 1.0
LANGUAGES C)
# ------------------------------------------------
# C standard — no compiler extensions
# ------------------------------------------------
set(CMAKE_C_STANDARD 11)
set(CMAKE_C_STANDARD_REQUIRED ON)
set(CMAKE_C_EXTENSIONS OFF)
# Export compile_commands.json (clangd / IDEs)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
# ------------------------------------------------
# Options
# ------------------------------------------------
option(CALCULATOR_BUILD_TESTS "Build calculator tests" ON)
option(CALCULATOR_ENABLE_SANITIZERS "Enable Address Sanitizer in tests" ON)
# ------------------------------------------------
# Portable warning flags
# ------------------------------------------------
if(MSVC)
add_compile_options(/W4)
else()
add_compile_options(-Wall -Wextra -Wpedantic)
endif()
# ================================================================
# CPM.cmake bootstrap Descarga CPM solo si no existe; usa caché para builds
# offline.
# ================================================================
set(CPM_DOWNLOAD_VERSION 0.40.2)
set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM.cmake")
if(NOT EXISTS "${CPM_DOWNLOAD_LOCATION}")
message(
STATUS "[calculator] Downloading CPM.cmake v${CPM_DOWNLOAD_VERSION}...")
file(
DOWNLOAD
"https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake"
"${CPM_DOWNLOAD_LOCATION}"
STATUS download_status
TLS_VERIFY ON)
list(GET download_status 0 status_code)
list(GET download_status 1 status_msg)
if(NOT status_code EQUAL 0)
message(
FATAL_ERROR "[calculator] Failed to download CPM.cmake: ${status_msg}")
endif()
endif()
include("${CPM_DOWNLOAD_LOCATION}")
# ================================================================
# Dependencies via CPM
# ================================================================
cpmaddpackage(
NAME arena GIT_REPOSITORY
https://laentropia-homelab.tail7368da.ts.net/laentropia/Arena.git GIT_TAG
main)
cpmaddpackage(
NAME arraylist GIT_REPOSITORY
https://laentropia-homelab.tail7368da.ts.net/laentropia/ArrayList.git GIT_TAG
main)
# ================================================================
# LIBRARY (lógica reutilizable, separada del ejecutable)
# ================================================================
add_library(calculator_lib src/lexer.c src/parser.c src/evaluator.c)
target_include_directories(
calculator_lib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:include>)
target_compile_features(calculator_lib PUBLIC c_std_11)
target_link_libraries(
calculator_lib
PUBLIC arena
PUBLIC arraylist
PRIVATE m) # libm — solo en el linker interno, no se propaga
# ================================================================
# EXECUTABLE
# ================================================================
add_executable(calculator src/main.c)
target_link_libraries(calculator PRIVATE calculator_lib)
# ================================================================
# TESTS
# ================================================================
if(CALCULATOR_BUILD_TESTS)
enable_testing()
add_subdirectory(test)
endif()

4
include/lexer.h
View File

@@ -1,9 +1,9 @@
#ifndef LEXER_H
#define LEXER_H
#include "arraylist.h"
#include <stddef.h>
#include "lae_arraylist.h"
#include <stdbool.h>
#include <stddef.h>
#include <stdint.h>
// For identifing

10
include/parser.h
View File

@@ -1,9 +1,9 @@
#ifndef PARSER_H
#define PARSER_H
#include "lae_arena.h"
#include "lae_arraylist.h"
#include "lexer.h"
#include "arena.h"
#include "arraylist.h"
#include <stdbool.h>
#include <stdint.h>
@@ -76,7 +76,11 @@ typedef struct {
} ParserU8Result;
TreeResult nud(ArraySlice *slice, Arena *arena, Token token); // Null denotation
TreeResult led(ArraySlice *slice, Arena *arena, Node *left, Token token); // Left denotation
TreeResult
led(ArraySlice *slice,
Arena *arena,
Node *left,
Token token); // Left denotation
ParserU8Result prefix_rbp(Token token);
ParserU8Result postfix_lbp(Token token);

5
src/evaluator.c
View File

@@ -1,11 +1,10 @@
#include "evaluator.h"
#include "arena.h"
#include "lae_arena.h"
#include "lexer.h"
#include "parser.h"
#include <math.h>
#include <stdbool.h>
#include <stdint.h>
#include <math.h>
EvaluatorResult evaluate_tree(Node *tree) {
if (tree->type == NODE_BINARY_OP) {

27
src/lexer.c
View File

@@ -1,22 +1,19 @@
#include "lexer.h"
#include "arraylist.h"
#include "lae_allocator.h"
#include "lae_arraylist.h"
#include <ctype.h>
#include <limits.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <limits.h>
typedef enum {
WAIT_FOR_NUMBER,
WAIT_FOR_OPERATOR
} LexerState;
typedef enum { WAIT_FOR_NUMBER, WAIT_FOR_OPERATOR } LexerState;
TokenizeResult tokenize(const char *input) {
ArrayList *arr;
arraylist_init(&arr, 64, sizeof(Token));
arraylist_init(&arr, allocator_default(), 64, sizeof(Token));
size_t offset = 0;
while (input[offset] != '\0') {
@@ -41,8 +38,7 @@ TokenizeResult tokenize(const char *input) {
// Nothing...
} else {
arraylist_destroy(&arr);
return (TokenizeResult) {
.is_valid = false,
return (TokenizeResult){.is_valid = false,
.err = LEXER_NOT_RECOGNIZED_SYMBOL};
}
@@ -68,9 +64,7 @@ TokenResult tokenize_number(const char *input, size_t *offset) {
size_t current = *offset;
while (isdigit(input[current])) {
if (buf_pos >= sizeof(buf) - 1) {
return (TokenResult) {
.is_valid = false,
.err = LEXER_BUF_OVERFLOW};
return (TokenResult){.is_valid = false, .err = LEXER_BUF_OVERFLOW};
}
buf[buf_pos] = input[current];
@@ -84,7 +78,6 @@ TokenResult tokenize_number(const char *input, size_t *offset) {
new_token.type = TOKEN_INTEGER;
LexerI64Result result = string_to_integer(buf);
if (!result.is_valid) {
return (TokenResult){.is_valid = false, .err = result.err};
}
@@ -95,8 +88,7 @@ TokenResult tokenize_number(const char *input, size_t *offset) {
return (TokenResult){.is_valid = true, .token = new_token};
}
return (TokenResult) {
.is_valid = false,
return (TokenResult){.is_valid = false,
.err = LEXER_FAILED_NUMBER_CONVERSION};
}
@@ -110,8 +102,7 @@ LexerI64Result string_to_integer(const char *buf) {
int digit = buf[c] - '0';
if (count > (INT64_MAX - digit) / 10) {
return (LexerI64Result) {
.is_valid = false,
return (LexerI64Result){.is_valid = false,
.err = LEXER_INT_OVERFLOW};
}

77
src/parser.c
View File

@@ -1,7 +1,8 @@
#include "parser.h"
#include "arraylist.h"
#include "lae_allocator.h"
#include "lae_arena.h"
#include "lae_arraylist.h"
#include "lexer.h"
#include "arena.h"
#include <cmocka.h>
#include <stdalign.h>
#include <stdbool.h>
@@ -119,25 +120,11 @@ ParserU8Result infix_rbp(Token token) {
}
}
TreeResult led(
ArraySlice *slice,
Arena *arena,
Node *left,
Token token
) {
arena_ensure_capacity(
arena,
sizeof(Node),
alignof(Node)
);
TreeResult led(ArraySlice *slice, Arena *arena, Node *left, Token token) {
arena_ensure_capacity(arena, sizeof(Node), alignof(Node));
Node *node = arena_unwrap_pointer(
arena_alloc(
arena,
sizeof(Node),
alignof(Node)
)
);
Node *node =
arena_unwrap_pointer(arena_alloc(arena, sizeof(Node), alignof(Node)));
switch (token.op) {
@@ -158,11 +145,7 @@ TreeResult led(
};
}
TreeResult right = parse_expr(
slice,
arena,
rbp_result.num
);
TreeResult right = parse_expr(slice, arena, rbp_result.num);
if (!right.is_valid) {
return right;
@@ -198,19 +181,10 @@ TreeResult led(
}
TreeResult nud(ArraySlice *slice, Arena *arena, Token token) {
arena_ensure_capacity(
arena,
sizeof(Node),
alignof(Node)
);
arena_ensure_capacity(arena, sizeof(Node), alignof(Node));
Node *node = arena_unwrap_pointer(
arena_alloc(
arena,
sizeof(Node),
alignof(Node)
)
);
Node *node =
arena_unwrap_pointer(arena_alloc(arena, sizeof(Node), alignof(Node)));
if (token.type == TOKEN_INTEGER) {
node->type = NODE_INT;
@@ -237,8 +211,7 @@ TreeResult nud(ArraySlice *slice, Arena *arena, Token token) {
};
}
if (end_par.type != TOKEN_OPERATOR ||
end_par.op != OP_END_PAR) {
if (end_par.type != TOKEN_OPERATOR || end_par.op != OP_END_PAR) {
return (TreeResult){
.is_valid = false,
.err = PARSER_UNMATCHED_PAREN,
@@ -261,11 +234,7 @@ TreeResult nud(ArraySlice *slice, Arena *arena, Token token) {
};
}
TreeResult right = parse_expr(
slice,
arena,
rbp_result.num
);
TreeResult right = parse_expr(slice, arena, rbp_result.num);
if (!right.is_valid) {
return right;
@@ -286,8 +255,6 @@ TreeResult nud(ArraySlice *slice, Arena *arena, Token token) {
}
}
ParserResult parse(TokenizeResult tokens) {
if (!tokens.is_valid) {
return (ParserResult){
@@ -297,9 +264,17 @@ ParserResult parse(TokenizeResult tokens) {
}
ArraySlice *context;
arraylist_slice(&context, tokens.arr, 0, arraylist_size(tokens.arr));
arraylist_slice(
&context,
allocator_default(),
tokens.arr,
0,
arraylist_size(tokens.arr));
Arena *arena;
arena_init(&arena, sizeof(Node) * arraylist_size(tokens.arr));
arena_init(
&arena,
allocator_default(),
sizeof(Node) * arraylist_size(tokens.arr));
TreeResult result = parse_expr(context, arena, 0);
if (!result.is_valid) {
@@ -312,10 +287,8 @@ ParserResult parse(TokenizeResult tokens) {
}
arraylist_destroy(&tokens.arr);
return (ParserResult) {
.is_valid = true,
.arena = arena,
.tree = result.node};
return (
ParserResult){.is_valid = true, .arena = arena, .tree = result.node};
}
TreeResult parse_expr(ArraySlice *slice, Arena *arena, uint8_t min_bp) {

114
test/CMakeLists.txt
View File

@@ -1,114 +0,0 @@
# ================================================================
# FIND CMOCKA (system → FetchContent as fallback)
# ================================================================
find_package(cmocka QUIET)
if(NOT cmocka_FOUND)
message(
STATUS
"[calculator] cmocka not found on system — fetching with FetchContent...")
include(FetchContent)
FetchContent_Declare(
cmocka
GIT_REPOSITORY https://git.cryptomilk.org/projects/cmocka.git
GIT_TAG cmocka-1.1.7
GIT_SHALLOW TRUE)
# Static lib only, no cmocka examples or self-tests
set(WITH_STATIC_LIB
ON
CACHE BOOL "" FORCE)
set(WITH_SHARED_LIB
OFF
CACHE BOOL "" FORCE)
set(WITH_CMOCKERY_SUPPORT
OFF
CACHE BOOL "" FORCE)
set(WITH_EXAMPLES
OFF
CACHE BOOL "" FORCE)
set(UNIT_TESTING
OFF
CACHE BOOL "" FORCE)
set(PICKY_DEVELOPER
OFF
CACHE BOOL "" FORCE)
FetchContent_MakeAvailable(cmocka)
# Normalize the target name (varies across cmocka versions)
if(NOT TARGET cmocka::cmocka)
if(TARGET cmocka-static)
add_library(cmocka::cmocka ALIAS cmocka-static)
elseif(TARGET cmocka)
add_library(cmocka::cmocka ALIAS cmocka)
else()
message(
WARNING "[calculator] Could not create cmocka::cmocka — skipping tests."
)
return()
endif()
endif()
endif()
# ================================================================
# DETECT ADDRESS SANITIZER SUPPORT
# ================================================================
set(CALCULATOR_USE_ASAN OFF)
if(CALCULATOR_ENABLE_SANITIZERS)
if(MSVC)
if(MSVC_VERSION GREATER_EQUAL 1928)
set(CALCULATOR_USE_ASAN ON)
else()
message(STATUS "[calculator] MSVC < 16.9: ASAN not available.")
endif()
elseif(CMAKE_C_COMPILER_ID MATCHES "GNU|Clang" AND NOT WIN32)
include(CheckCCompilerFlag)
check_c_compiler_flag(-fsanitize=address CALCULATOR_COMPILER_HAS_ASAN)
if(CALCULATOR_COMPILER_HAS_ASAN)
set(CALCULATOR_USE_ASAN ON)
else()
message(
STATUS "[calculator] Compiler does not support -fsanitize=address.")
endif()
else()
message(STATUS "[calculator] Unknown platform/compiler — ASAN skipped.")
endif()
if(CALCULATOR_USE_ASAN)
message(STATUS "[calculator] Address Sanitizer enabled.")
endif()
endif()
# ================================================================
# Helper: apply common settings to every test target
# ================================================================
function(calculator_add_test target source)
add_executable(${target} ${source})
target_link_libraries(${target} PRIVATE calculator_lib cmocka::cmocka)
target_compile_features(${target} PRIVATE c_std_11)
if(CALCULATOR_USE_ASAN)
if(MSVC)
target_compile_options(${target} PRIVATE /fsanitize=address)
else()
target_compile_options(${target} PRIVATE -fsanitize=address
-fno-omit-frame-pointer)
target_link_options(${target} PRIVATE -fsanitize=address)
endif()
endif()
add_test(NAME ${target} COMMAND ${target})
set_tests_properties(${target} PROPERTIES TIMEOUT 30)
endfunction()
# ================================================================
# TEST TARGETS
# ================================================================
calculator_add_test(test_lexer test_lexer.c)
calculator_add_test(test_parser test_parser.c)
calculator_add_test(test_evaluator test_evaluator.c)

107
xmake.lua Normal file
View File

@@ -0,0 +1,107 @@
set_project("calculator")
set_version("1.0.0")
set_languages("c11")
add_rules("mode.debug", "mode.release")
-- clang compile commands
add_rules("plugin.compile_commands.autoupdate")
-- =========================================================
-- Options
-- =========================================================
option("tests")
set_default(false)
set_showmenu(true)
option_end()
option("asan")
set_default(false)
set_showmenu(true)
option_end()
-- =========================================================
-- Packages
-- =========================================================
-- Run xmake repo --add lae-repo https://laentropia-homelab.tail7368da.ts.net/laentropia/xmake-repo.git
-- to add my repo :)
add_requires("lae_arena")
add_requires("lae_arraylist")
add_requires("cmocka", { optional = true })
-- =========================================================
-- Library
-- =========================================================
target("calculator_lib")
set_kind("static")
add_packages("lae_arena", "lae_arraylist", {
public = true,
})
add_files("src/lexer.c", "src/parser.c", "src/evaluator.c")
add_headerfiles("include/*.h")
add_includedirs("include", {
public = true,
})
if is_mode("debug") then
add_cflags("-Wall", "-Wextra", "-Wpedantic")
end
if not is_plat("windows") then
add_syslinks("m")
end
-- =========================================================
-- Executable
-- =========================================================
target("calculator")
set_kind("binary")
add_deps("calculator_lib")
add_files("src/main.c")
-- =========================================================
-- Tests
-- =========================================================
if has_config("tests") then
local test_files = {
"test_lexer",
"test_parser",
"test_evaluator",
}
for _, name in ipairs(test_files) do
target(name)
set_kind("binary")
add_files("test/" .. name .. ".c")
add_deps("calculator_lib")
add_packages("cmocka")
add_tests("default")
if has_config("asan") then
add_cflags("-fsanitize=address", "-fno-omit-frame-pointer", {
force = true,
})
add_ldflags("-fsanitize=address", {
force = true,
})
end
end
end