Timerix/tlibtoml
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replaced numeric types to those from tlibc

Browse Source
This commit is contained in:
Timerix 2025-11-10 00:11:41 +05:00
parent a5aff56fb1
commit f889990728
3 changed files with 347 additions and 385 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
include/tlibtoml/toml.h
View File

@ -11,18 +11,8 @@ extern "C" {
#include "tlibc/std.h" #include "tlibc/std.h"
#include <time.h> #include <time.h>
#if defined(__cplusplus) && __cplusplus >= 201103L #define false 0
#define ATTRIBUTE_THREAD_LOCAL thread_local #define true 1
#elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
#define ATTRIBUTE_THREAD_LOCAL _Thread_local
#elif defined(_MSC_VER)
#define ATTRIBUTE_THREAD_LOCAL __declspec(thread)
#else
#define ATTRIBUTE_THREAD_LOCAL __thread
#endif
#define TOML_FALSE 0
#define TOML_TRUE 1
typedef enum { typedef enum {
TOML_OK, TOML_OK,
@ -36,28 +26,28 @@ typedef enum {
typedef struct { typedef struct {
TomlErrCode code; TomlErrCode code;
char* message; char* message;
int _is_literal; i32 _is_literal;
} TomlErr; } TomlErr;
typedef struct { typedef struct {
char* str; char* str;
size_t len; u64 len;
size_t _capacity; u64 _capacity;
} TomlString; } TomlString;
typedef struct _TomlValue TomlValue; typedef struct _TomlValue TomlValue;
typedef struct { typedef struct {
TomlValue** elements; TomlValue** elements;
size_t len; u64 len;
size_t _capacity; u64 _capacity;
} TomlArray; } TomlArray;
typedef struct _TomlKeyValue TomlKeyValue; typedef struct _TomlKeyValue TomlKeyValue;
typedef struct { typedef struct {
size_t _capacity; u64 _capacity;
size_t len; u64 len;
TomlKeyValue* _keyvals; TomlKeyValue* _keyvals;
} TomlTable; } TomlTable;
@ -82,14 +72,10 @@ struct _TomlValue {
TomlTable* table; TomlTable* table;
TomlArray* array; TomlArray* array;
TomlString* string; TomlString* string;
#if defined(_MSC_VER) || defined(__APPLE__) i64 integer;
long long integer; f64 float_;
#else
long integer;
#endif
double float_;
struct tm datetime; struct tm datetime;
int boolean; bool boolean;
} value; } value;
}; };
@ -99,90 +85,82 @@ struct _TomlKeyValue {
}; };
typedef struct { typedef struct {
void* (*malloc)(void *context, size_t size); void* (*malloc)(void* context, u64 size);
void* (*realloc)(void *context, void *p, size_t size); void* (*realloc)(void* context, void* p, u64 size);
void (*free)(void *context, void *p); void (*free)(void* context, void* p);
} TomlAllocFuncs; } TomlAllocFuncs;
void toml_set_allocator(void *context, const TomlAllocFuncs *funcs); void toml_set_allocator(void* context, const TomlAllocFuncs *funcs);
void* toml_malloc(size_t size); void* toml_malloc(u64 size);
void* toml_realloc(void *p, size_t size); void* toml_realloc(void* p, u64 size);
void toml_free(void *p); void toml_free(void* p);
char* toml_strdup(const char *str); char* toml_strdup(cstr str);
char* toml_strndup(const char *str, size_t n); char* toml_strndup(cstr str, u64 n);
int toml_vasprintf(char **str, const char *format, va_list args); i32 toml_vasprintf(char** str, cstr format, va_list args);
int toml_asprintf(char **str, const char *format, ...); i32 toml_asprintf(char** str, cstr format, ...);
const TomlErr* toml_err(void); const TomlErr* toml_err(void);
void toml_err_clear(void); void toml_err_clear(void);
TomlString* toml_string_new(void); TomlString* toml_string_new(void);
TomlString* toml_string_from_str(const char *str); TomlString* toml_string_from_str(cstr str);
TomlString* toml_string_from_nstr(const char *str, size_t len); TomlString* toml_string_from_nstr(cstr str, u64 len);
void toml_string_append_char(TomlString *self, char ch); void toml_string_append_char(TomlString* self, char ch);
void toml_string_append_str(TomlString *self, const char *str); void toml_string_append_str(TomlString* self, cstr str);
void toml_string_append_nstr(TomlString *self, const char *str, size_t len); void toml_string_append_nstr(TomlString* self, cstr str, u64 len);
TomlString* toml_string_clone(const TomlString *self); TomlString* toml_string_clone(const TomlString* self);
void toml_string_free(TomlString *self); void toml_string_free(TomlString* self);
int toml_string_equals(const TomlString *self, const TomlString *other); i32 toml_string_equals(const TomlString* self, const TomlString* other);
TomlTable* toml_table_new(void); TomlTable* toml_table_new(void);
void toml_table_free(TomlTable *self); void toml_table_free(TomlTable* self);
void toml_table_set_by_string(TomlTable *self, TomlString *key, TomlValue *value); void toml_table_set_by_string(TomlTable* self, TomlString* key, TomlValue* value);
TomlValue *toml_table_get_by_string(const TomlTable *self, const TomlString *key); TomlValue* toml_table_get_by_string(const TomlTable* self, const TomlString* key);
void toml_table_set(TomlTable *self, const char *key, TomlValue *value); void toml_table_set(TomlTable* self, cstr key, TomlValue* value);
void toml_table_setn(TomlTable *self, const char *key, size_t key_len, TomlValue *value); void toml_table_setn(TomlTable* self, cstr key, u64 key_len, TomlValue* value);
TomlValue* toml_table_get(const TomlTable *self, const char *key); TomlValue* toml_table_get(const TomlTable* self, cstr key);
TomlTable* toml_table_get_as_table(const TomlTable *self, const char *key); TomlTable* toml_table_get_as_table(const TomlTable* self, cstr key);
TomlArray* toml_table_get_as_array(const TomlTable *self, const char *key); TomlArray* toml_table_get_as_array(const TomlTable* self, cstr key);
TomlString* toml_table_get_as_string(const TomlTable *self, const char *key); TomlString* toml_table_get_as_string(const TomlTable* self, cstr key);
#if defined(_MSC_VER) || defined(__APPLE__) i64 toml_table_get_as_integer(const TomlTable* self, cstr key);
long long toml_table_get_as_integer(const TomlTable *self, const char *key); f64 toml_table_get_as_float(const TomlTable* self, cstr key);
#else const struct tm* toml_table_get_as_datetime(const TomlTable* self, cstr key);
long toml_table_get_as_integer(const TomlTable *self, const char *key); i32 toml_table_get_as_boolean(const TomlTable* self, cstr key);
#endif TomlValue* toml_table_getn(const TomlTable* self, cstr key, u64 key_len);
double toml_table_get_as_float(const TomlTable *self, const char *key);
const struct tm* toml_table_get_as_datetime(const TomlTable *self, const char *key);
int toml_table_get_as_boolean(const TomlTable *self, const char *key);
TomlValue* toml_table_getn(const TomlTable *self, const char *key, size_t key_len);
TomlTableIter toml_table_iter_new(TomlTable *table); TomlTableIter toml_table_iter_new(TomlTable* table);
TomlKeyValue* toml_table_iter_get(TomlTableIter *self); TomlKeyValue* toml_table_iter_get(TomlTableIter* self);
int toml_table_iter_has_next(TomlTableIter *self); i32 toml_table_iter_has_next(TomlTableIter* self);
void toml_table_iter_next(TomlTableIter *self); void toml_table_iter_next(TomlTableIter* self);
TomlArray* toml_array_new(void); TomlArray* toml_array_new(void);
void toml_array_free(TomlArray *self); void toml_array_free(TomlArray* self);
void toml_array_append(TomlArray *self, TomlValue *value); void toml_array_append(TomlArray* self, TomlValue* value);
TomlValue* toml_value_new(TomlType type); TomlValue* toml_value_new(TomlType type);
TomlValue* toml_value_new_string(TomlType type); TomlValue* toml_value_new_string(TomlType type);
TomlValue* toml_value_new_table(void); TomlValue* toml_value_new_table(void);
TomlValue* toml_value_new_array(void); TomlValue* toml_value_new_array(void);
#if defined(_MSC_VER) || defined(__APPLE__) TomlValue* toml_value_new_integer(i64 integer);
TomlValue *toml_value_new_integer(long long integer); TomlValue* toml_value_new_float(f64 flt);
#else
TomlValue *toml_value_new_integer(long integer);
#endif
TomlValue* toml_value_new_float(double flt);
TomlValue* toml_value_new_datetime(void); TomlValue* toml_value_new_datetime(void);
TomlValue* toml_value_new_boolean(int boolean); TomlValue* toml_value_new_boolean(i32 boolean);
TomlValue* toml_value_from_str(const char *str); TomlValue* toml_value_from_str(cstr str);
TomlValue* toml_value_from_nstr(const char *str, size_t len); TomlValue* toml_value_from_nstr(cstr str, u64 len);
void toml_value_free(TomlValue *self); void toml_value_free(TomlValue* self);
TomlTable* toml_load_str(const char *str); TomlTable* toml_load_str(cstr str);
TomlTable* toml_load_nstr(const char *str, size_t len); TomlTable* toml_load_nstr(cstr str, u64 len);
TomlTable* toml_load_file(FILE *file); TomlTable* toml_load_file(FILE* file);
TomlTable* toml_load_filename(const char *filename); TomlTable* toml_load_filename(cstr filename);
/* TODO: implement dump functions /* TODO: implement dump functions
char *toml_dump_str(const TomlTable *self, TomlErr *err); char* toml_dump_str(const TomlTable* self, TomlErr *err);
TomlString *toml_dump_nstr(const TomlTable *self, TomlErr *err); TomlString* toml_dump_nstr(const TomlTable* self, TomlErr *err);
void toml_dump_file(const TomlTable *self, FILE *file, TomlErr *err); void toml_dump_file(const TomlTable* self, FILE* file, TomlErr *err);
*/ */
#ifdef __cplusplus #ifdef __cplusplus

546
src/toml.c
View File

File diff suppressed because it is too large Load Diff

36
tests/main.c
View File

@ -9,13 +9,13 @@
#define PROJECT_SOURCE_DIR ".." #define PROJECT_SOURCE_DIR ".."
#endif #endif
void print_table(const TomlTable *table); void print_table(const TomlTable* table);
void print_value(const TomlValue *value); void print_value(const TomlValue* value);
void print_array(const TomlArray *array) void print_array(const TomlArray *array)
{ {
printf("["); printf("[");
for (size_t i = 0; i < array->len; i++) { for (u64 i = 0; i < array->len; i++) {
if (i > 0) { if (i > 0) {
printf(", "); printf(", ");
} }
@ -24,7 +24,7 @@ void print_array(const TomlArray *array)
printf("]"); printf("]");
} }
void print_value(const TomlValue *value) void print_value(const TomlValue* value)
{ {
switch (value->type) { switch (value->type) {
case TOML_TABLE: case TOML_TABLE:
@ -57,12 +57,12 @@ void print_keyval(const TomlKeyValue *keyval)
print_value(keyval->value); print_value(keyval->value);
} }
void print_table(const TomlTable *table) void print_table(const TomlTable* table)
{ {
TomlTableIter it = toml_table_iter_new((TomlTable *)table); TomlTableIter it = toml_table_iter_new((TomlTable* )table);
printf("{"); printf("{");
size_t i = 0; u64 i = 0;
while (toml_table_iter_has_next(&it)) { while (toml_table_iter_has_next(&it)) {
TomlKeyValue *keyval = toml_table_iter_get(&it); TomlKeyValue *keyval = toml_table_iter_get(&it);
@ -77,10 +77,10 @@ void print_table(const TomlTable *table)
printf("}"); printf("}");
} }
int test_run(const char *filename) i32 test_run(cstr filename)
{ {
TomlTable *table = NULL; TomlTable* table = NULL;
int rc = 0; i32 rc = 0;
table = toml_load_filename(filename); table = toml_load_filename(filename);
if (table == NULL) if (table == NULL)
@ -94,15 +94,15 @@ cleanup:
if (toml_err()->code != TOML_OK) { if (toml_err()->code != TOML_OK) {
fprintf(stderr, "%s\n", toml_err()->message); fprintf(stderr, "%s\n", toml_err()->message);
rc = (int)toml_err()->code; rc = (i32)toml_err()->code;
} }
toml_err_clear(); toml_err_clear();
return rc; return rc;
} }
int main(void) i32 main(void)
{ {
static const char *const filenames[] = { static cstr const filenames[] = {
/* should parse */ /* should parse */
PROJECT_SOURCE_DIR "/tests/key-values.toml", PROJECT_SOURCE_DIR "/tests/key-values.toml",
PROJECT_SOURCE_DIR "/tests/complex-structure.toml", PROJECT_SOURCE_DIR "/tests/complex-structure.toml",
@ -117,12 +117,12 @@ int main(void)
PROJECT_SOURCE_DIR "/tests/hard_example_unicode.toml" PROJECT_SOURCE_DIR "/tests/hard_example_unicode.toml"
}; };
int total_tests = sizeof(filenames) / sizeof(char *); i32 total_tests = sizeof(filenames) / sizeof(char* );
int num_passed = 0; i32 num_passed = 0;
int num_failed = 0; i32 num_failed = 0;
for (int i = 0; i < total_tests; i++) { for (i32 i = 0; i < total_tests; i++) {
int rc = test_run(filenames[i]); i32 rc = test_run(filenames[i]);
if (rc == 0) { if (rc == 0) {
printf("test %d success\n", i); printf("test %d success\n", i);
num_passed++; num_passed++;