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

Compare commits

base: Timerix:a0e280d77b6d8967239b14915609eef422f6ba0b
Branches Tags
Timerix:main
..
compare: Timerix:bdcc838bb8cf55aa22d772340077266c23b83864
Branches Tags
Timerix:main

No commits in common. "a0e280d77b6d8967239b14915609eef422f6ba0b" and "bdcc838bb8cf55aa22d772340077266c23b83864" have entirely different histories.
a0e280d77b ... bdcc838bb8

9 changed files with 50 additions and 64 deletions
Show Stats Expand all files Collapse all files

13
README.md
View File

@ -8,9 +8,7 @@ A fork of [libtoml](https://github.com/brglng/libtoml) rewritten to use [tlibc](
git clone https://timerix.ddns.net/git/Timerix/tlibtoml.git git clone https://timerix.ddns.net/git/Timerix/tlibtoml.git
``` ```
2. Install [cbuild](https://timerix.ddns.net/git/Timerix/cbuild/releases). 2. Install [cbuild](https://timerix.ddns.net/git/Timerix/cbuild) version specified in `project.config`.
Select latest version compatible with the one in `project.config`.
Example: For `2.3.0` download latest `2.3.x`.
3. Clone [tlibc](https://timerix.ddns.net/git/Timerix/tlibc). 3. Clone [tlibc](https://timerix.ddns.net/git/Timerix/tlibc).
By default `dependencies/tlibc.config` expects that `tlibc/` is present in the same directory as `tlibtoml/`. By default `dependencies/tlibc.config` expects that `tlibc/` is present in the same directory as `tlibtoml/`.
@ -34,20 +32,11 @@ A fork of [libtoml](https://github.com/brglng/libtoml) rewritten to use [tlibc](
int main(){ int main(){
Deferral(32); // reserve memory for 32 defers Deferral(32); // reserve memory for 32 defers
// init tlibc global variables
try_fatal_void(tlibc_init()); try_fatal_void(tlibc_init());
// init tlibtoml global variables
try_fatal_void(tlibtoml_init()); try_fatal_void(tlibtoml_init());
Defer(tlibc_deinit()); Defer(tlibc_deinit());
Defer(tlibtoml_deinit()); Defer(tlibtoml_deinit());
// load whole file to memory and parse it as toml
try_fatal(TomlTable* t, p, toml_load_filename("example.toml"));
// get value by key and ensure it's a string
try_fatal(str* s, p, TomlTable_get_str(t, STR("some_key")));
// print this string value
printf("some_key = '"FMT_str"'\n", str_expand(*s));
Return 0; // call defers Return 0; // call defers
} }
``` ```

2
include/tlibtoml.h
View File

@ -102,7 +102,7 @@ typedef struct TomlValue {
TomlArray* array; TomlArray* array;
TomlTable* table; TomlTable* table;
TomlDateTime* dt; TomlDateTime* dt;
}; } value;
} TomlValue; } TomlValue;
List_declare(TomlValue); List_declare(TomlValue);

14
src/TomlTable.c
View File

@ -44,7 +44,7 @@ Result(TomlTable*) TomlTable_get_table(const TomlTable* self, str key)
TomlValue* v = TomlTable_get(self, key); TomlValue* v = TomlTable_get(self, key);
try_assert_value_found(v, key); try_assert_value_found(v, key);
try_assert_value_type(v, key, TLIBTOML_TABLE); try_assert_value_type(v, key, TLIBTOML_TABLE);
Return RESULT_VALUE(p, v->table); Return RESULT_VALUE(p, v->value.table);
} }
Result(TomlArray*) TomlTable_get_array(const TomlTable* self, str key) Result(TomlArray*) TomlTable_get_array(const TomlTable* self, str key)
@ -53,7 +53,7 @@ Result(TomlArray*) TomlTable_get_array(const TomlTable* self, str key)
TomlValue* v = TomlTable_get(self, key); TomlValue* v = TomlTable_get(self, key);
try_assert_value_found(v, key); try_assert_value_found(v, key);
try_assert_value_type(v, key, TLIBTOML_ARRAY); try_assert_value_type(v, key, TLIBTOML_ARRAY);
Return RESULT_VALUE(p, v->array); Return RESULT_VALUE(p, v->value.array);
} }
Result(str*) TomlTable_get_str(const TomlTable* self, str key) Result(str*) TomlTable_get_str(const TomlTable* self, str key)
@ -62,7 +62,7 @@ Result(str*) TomlTable_get_str(const TomlTable* self, str key)
TomlValue* v = TomlTable_get(self, key); TomlValue* v = TomlTable_get(self, key);
try_assert_value_found(v, key); try_assert_value_found(v, key);
try_assert_value_type(v, key, TLIBTOML_STRING); try_assert_value_type(v, key, TLIBTOML_STRING);
Return RESULT_VALUE(p, v->s); Return RESULT_VALUE(p, v->value.s);
} }
Result(i64) TomlTable_get_integer(const TomlTable* self, str key) Result(i64) TomlTable_get_integer(const TomlTable* self, str key)
@ -71,7 +71,7 @@ Result(i64) TomlTable_get_integer(const TomlTable* self, str key)
TomlValue* v = TomlTable_get(self, key); TomlValue* v = TomlTable_get(self, key);
try_assert_value_found(v, key); try_assert_value_found(v, key);
try_assert_value_type(v, key, TLIBTOML_INTEGER); try_assert_value_type(v, key, TLIBTOML_INTEGER);
Return RESULT_VALUE(i, v->i); Return RESULT_VALUE(i, v->value.i);
} }
Result(f64) TomlTable_get_float(const TomlTable* self, str key) Result(f64) TomlTable_get_float(const TomlTable* self, str key)
@ -80,7 +80,7 @@ Result(f64) TomlTable_get_float(const TomlTable* self, str key)
TomlValue* v = TomlTable_get(self, key); TomlValue* v = TomlTable_get(self, key);
try_assert_value_found(v, key); try_assert_value_found(v, key);
try_assert_value_type(v, key, TLIBTOML_FLOAT); try_assert_value_type(v, key, TLIBTOML_FLOAT);
Return RESULT_VALUE(f, v->f); Return RESULT_VALUE(f, v->value.f);
} }
Result(TomlDateTime*) TomlTable_get_datetime(const TomlTable* self, str key) Result(TomlDateTime*) TomlTable_get_datetime(const TomlTable* self, str key)
@ -89,7 +89,7 @@ Result(TomlDateTime*) TomlTable_get_datetime(const TomlTable* self, str key)
TomlValue* v = TomlTable_get(self, key); TomlValue* v = TomlTable_get(self, key);
try_assert_value_found(v, key); try_assert_value_found(v, key);
try_assert_value_type(v, key, TLIBTOML_DATETIME); try_assert_value_type(v, key, TLIBTOML_DATETIME);
Return RESULT_VALUE(p, v->dt); Return RESULT_VALUE(p, v->value.dt);
} }
Result(bool) TomlTable_get_bool(const TomlTable* self, str key) Result(bool) TomlTable_get_bool(const TomlTable* self, str key)
@ -98,5 +98,5 @@ Result(bool) TomlTable_get_bool(const TomlTable* self, str key)
TomlValue* v = TomlTable_get(self, key); TomlValue* v = TomlTable_get(self, key);
try_assert_value_found(v, key); try_assert_value_found(v, key);
try_assert_value_type(v, key, TLIBTOML_BOOLEAN); try_assert_value_type(v, key, TLIBTOML_BOOLEAN);
Return RESULT_VALUE(i, v->b); Return RESULT_VALUE(i, v->value.b);
} }

38
src/TomlValue.c
View File

@ -32,26 +32,26 @@ TomlValue TomlValue_new(TomlType type)
assert(false && "invalid type"); assert(false && "invalid type");
break; break;
case TLIBTOML_TABLE: case TLIBTOML_TABLE:
value.table = NULL; value.value.table = NULL;
break; break;
case TLIBTOML_ARRAY: case TLIBTOML_ARRAY:
value.array = NULL; value.value.array = NULL;
break; break;
case TLIBTOML_STRING: case TLIBTOML_STRING:
value.s = NULL; value.value.s = NULL;
break; break;
case TLIBTOML_INTEGER: case TLIBTOML_INTEGER:
value.i = 0; value.value.i = 0;
break; break;
case TLIBTOML_FLOAT: case TLIBTOML_FLOAT:
value.f = 0.0; value.value.f = 0.0;
break; break;
case TLIBTOML_BOOLEAN: case TLIBTOML_BOOLEAN:
value.b = false; value.value.b = false;
break; break;
case TLIBTOML_DATETIME: case TLIBTOML_DATETIME:
value.dt = (TomlDateTime*)malloc(sizeof(TomlDateTime)); value.value.dt = (TomlDateTime*)malloc(sizeof(TomlDateTime));
memset(value.dt, 0, sizeof(TomlDateTime)); memset(value.value.dt, 0, sizeof(TomlDateTime));
break; break;
} }
return value; return value;
@ -64,8 +64,8 @@ TomlValue TomlValue_copy_str(str s)
TomlValue TomlValue_move_str(str s){ TomlValue TomlValue_move_str(str s){
TomlValue value = {0}; TomlValue value = {0};
value.s = (str*)malloc(sizeof(str)); value.value.s = (str*)malloc(sizeof(str));
*value.s = s; *value.value.s = s;
value.type = TLIBTOML_STRING; value.type = TLIBTOML_STRING;
return value; return value;
} }
@ -73,7 +73,7 @@ TomlValue TomlValue_move_str(str s){
TomlValue TomlValue_new_table(void) TomlValue TomlValue_new_table(void)
{ {
TomlValue value = {0}; TomlValue value = {0};
value.table = TomlTable_new(); value.value.table = TomlTable_new();
value.type = TLIBTOML_TABLE; value.type = TLIBTOML_TABLE;
return value; return value;
} }
@ -81,7 +81,7 @@ TomlValue TomlValue_new_table(void)
TomlValue TomlValue_new_array(void) TomlValue TomlValue_new_array(void)
{ {
TomlValue value = {0}; TomlValue value = {0};
value.array = TomlArray_new(); value.value.array = TomlArray_new();
value.type = TLIBTOML_ARRAY; value.type = TLIBTOML_ARRAY;
return value; return value;
} }
@ -89,7 +89,7 @@ TomlValue TomlValue_new_array(void)
TomlValue TomlValue_new_integer(i64 integer) TomlValue TomlValue_new_integer(i64 integer)
{ {
TomlValue value = {0}; TomlValue value = {0};
value.i = integer; value.value.i = integer;
value.type = TLIBTOML_INTEGER; value.type = TLIBTOML_INTEGER;
return value; return value;
} }
@ -97,7 +97,7 @@ TomlValue TomlValue_new_integer(i64 integer)
TomlValue TomlValue_new_float(f64 float_) TomlValue TomlValue_new_float(f64 float_)
{ {
TomlValue value = {0}; TomlValue value = {0};
value.f = float_; value.value.f = float_;
value.type = TLIBTOML_FLOAT; value.type = TLIBTOML_FLOAT;
return value; return value;
} }
@ -110,7 +110,7 @@ TomlValue TomlValue_new_datetime(void)
TomlValue TomlValue_new_bool(bool b) TomlValue TomlValue_new_bool(bool b)
{ {
TomlValue value = {0}; TomlValue value = {0};
value.b = b; value.value.b = b;
value.type = TLIBTOML_BOOLEAN; value.type = TLIBTOML_BOOLEAN;
return value; return value;
} }
@ -122,16 +122,16 @@ void TomlValue_destroy(TomlValue* self)
switch (self->type) { switch (self->type) {
case TLIBTOML_STRING: case TLIBTOML_STRING:
str_free(self->s); str_free(self->value.s);
break; break;
case TLIBTOML_TABLE: case TLIBTOML_TABLE:
TomlTable_free(self->table); TomlTable_free(self->value.table);
break; break;
case TLIBTOML_ARRAY: case TLIBTOML_ARRAY:
TomlArray_free(self->array); TomlArray_free(self->value.array);
break; break;
case TLIBTOML_DATETIME: case TLIBTOML_DATETIME:
free(self->dt); free(self->value.dt);
break; break;
default: default:
break; break;

2
src/toml_parse/toml_parse_array.c
View File

@ -30,7 +30,7 @@ Result(void) toml_parse_array(TomlParser* self, TomlValue* out_value)
TomlValue value; TomlValue value;
try_void(toml_parse_value(self, &value)); try_void(toml_parse_value(self, &value));
TomlArray_append(array_value.array, value); TomlArray_append(array_value.value.array, value);
while (self->ptr < self->end) { while (self->ptr < self->end) {
if (isspace(*self->ptr)) { if (isspace(*self->ptr)) {

2
src/toml_parse/toml_parse_inline_table.c
View File

@ -71,7 +71,7 @@ Result(void) toml_parse_inline_table(TomlParser* self, TomlValue* out_value)
TomlValue value; TomlValue value;
try_void(toml_parse_value(self, &value)); try_void(toml_parse_value(self, &value));
TomlTable_set(table_value.table, key, value); TomlTable_set(table_value.value.table, key, value);
str_destroy(key); str_destroy(key);
while (self->ptr < self->end && (*self->ptr == ' ' ||* self->ptr == '\t')) { while (self->ptr < self->end && (*self->ptr == ' ' ||* self->ptr == '\t')) {

24
src/toml_parse/toml_walk_table_path.c
View File

@ -14,32 +14,32 @@ Result(Table*) toml_walk_table_path(TomlParser* parser, TomlTable* table,
if (is_array) { if (is_array) {
u64 i = 0; u64 i = 0;
for (; i < key_path->len - 1; i++) { for (; i < key_path->len - 1; i++) {
str part = *key_path->data[i].s; str part = *key_path->data[i].value.s;
TomlValue* t = TomlTable_get(real_table, part); TomlValue* t = TomlTable_get(real_table, part);
if (t == NULL) { if (t == NULL) {
if (create_if_not_exist) { if (create_if_not_exist) {
TomlValue new_table_value = TomlValue_new_table(); TomlValue new_table_value = TomlValue_new_table();
TomlTable_set(real_table, part, new_table_value); TomlTable_set(real_table, part, new_table_value);
real_table = new_table_value.table; real_table = new_table_value.value.table;
} else { } else {
Return RESULT_ERROR_CODE_FMT(TLIBTOML, TLIBTOML_ERR_SYNTAX, Return RESULT_ERROR_CODE_FMT(TLIBTOML, TLIBTOML_ERR_SYNTAX,
"%s:%d:%d: not found key '" FMT_str "'", "%s:%d:%d: not found key '" FMT_str "'",
parser->filename, parser->lineno, parser->colno, part.len, part.data); parser->filename, parser->lineno, parser->colno, part.len, part.data);
} }
} else { } else {
real_table = t->table; real_table = t->value.table;
} }
} }
str part = *key_path->data[i].s; str part = *key_path->data[i].value.s;
TomlValue* t = TomlTable_get(real_table, part); TomlValue* t = TomlTable_get(real_table, part);
if (t == NULL) { if (t == NULL) {
if (create_if_not_exist) { if (create_if_not_exist) {
TomlValue array_value = TomlValue_new_array(); TomlValue array_value = TomlValue_new_array();
TomlValue new_table_value = TomlValue_new_table(); TomlValue new_table_value = TomlValue_new_table();
TomlArray_append(array_value.array, new_table_value); TomlArray_append(array_value.value.array, new_table_value);
TomlTable_set(real_table, part, array_value); TomlTable_set(real_table, part, array_value);
real_table = new_table_value.table; real_table = new_table_value.value.table;
} else { } else {
Return RESULT_ERROR_CODE_FMT(TLIBTOML, TLIBTOML_ERR_SYNTAX, Return RESULT_ERROR_CODE_FMT(TLIBTOML, TLIBTOML_ERR_SYNTAX,
"%s:%d:%d: not found key '" FMT_str "'", "%s:%d:%d: not found key '" FMT_str "'",
@ -53,18 +53,18 @@ Result(Table*) toml_walk_table_path(TomlParser* parser, TomlTable* table,
} }
TomlValue new_table_value = TomlValue_new_table(); TomlValue new_table_value = TomlValue_new_table();
TomlArray_append(t->array, new_table_value); TomlArray_append(t->value.array, new_table_value);
real_table = new_table_value.table; real_table = new_table_value.value.table;
} }
} else { } else {
for (u64 i = 0; i < key_path->len; i++) { for (u64 i = 0; i < key_path->len; i++) {
str part = *key_path->data[i].s; str part = *key_path->data[i].value.s;
TomlValue* t = TomlTable_get(real_table, part); TomlValue* t = TomlTable_get(real_table, part);
if (t == NULL) { if (t == NULL) {
if (create_if_not_exist) { if (create_if_not_exist) {
TomlValue new_table_value = TomlValue_new_table(); TomlValue new_table_value = TomlValue_new_table();
TomlTable_set(real_table, part, new_table_value); TomlTable_set(real_table, part, new_table_value);
real_table = new_table_value.table; real_table = new_table_value.value.table;
} else { } else {
Return RESULT_ERROR_CODE_FMT(TLIBTOML, TLIBTOML_ERR_SYNTAX, Return RESULT_ERROR_CODE_FMT(TLIBTOML, TLIBTOML_ERR_SYNTAX,
"%s:%d:%d: not found key '" FMT_str "'", "%s:%d:%d: not found key '" FMT_str "'",
@ -72,9 +72,9 @@ Result(Table*) toml_walk_table_path(TomlParser* parser, TomlTable* table,
} }
} else { } else {
if (t->type == TLIBTOML_ARRAY) { if (t->type == TLIBTOML_ARRAY) {
real_table = t->array->data[t->array->len - 1].table; real_table = t->value.array->data[t->value.array->len - 1].value.table;
} else if (t->type == TLIBTOML_TABLE) { } else if (t->type == TLIBTOML_TABLE) {
real_table = t->table; real_table = t->value.table;
} }
} }
} }

12
tests/main.c
View File

@ -32,25 +32,25 @@ void print_value(const TomlValue* value)
assert(false && "invalid type"); assert(false && "invalid type");
break; break;
case TLIBTOML_TABLE: case TLIBTOML_TABLE:
print_table(value->table); print_table(value->value.table);
break; break;
case TLIBTOML_ARRAY: case TLIBTOML_ARRAY:
print_array(value->array); print_array(value->value.array);
break; break;
case TLIBTOML_STRING: case TLIBTOML_STRING:
printf("'" FMT_str "'", value->s->len, value->s->data); printf("'" FMT_str "'", value->value.s->len, value->value.s->data);
break; break;
case TLIBTOML_INTEGER: case TLIBTOML_INTEGER:
printf("%" PRId64, value->i); printf("%" PRId64, value->value.i);
break; break;
case TLIBTOML_FLOAT: case TLIBTOML_FLOAT:
printf("%f", value->f); printf("%f", value->value.f);
break; break;
case TLIBTOML_DATETIME: case TLIBTOML_DATETIME:
printf("(datetime)"); printf("(datetime)");
break; break;
case TLIBTOML_BOOLEAN: case TLIBTOML_BOOLEAN:
printf("%s", value->b ? "true" : "false"); printf("%s", value->value.b ? "true" : "false");
break; break;
} }
} }

7
tlibtoml.config
View File

@ -5,12 +5,9 @@
DEP_WORKING_DIR="$DEPENDENCIES_DIR/tlibtoml" DEP_WORKING_DIR="$DEPENDENCIES_DIR/tlibtoml"
user_config_path="project.config.user"
absolute_dep_dir=$(realpath "$DEPENDENCIES_DIR")
function setup_user_config(){ function setup_user_config(){
# Set variable `DEPENDENCIES_DIR`` in `tlibtoml/project.config.user` local user_config_path="project.config.user"
# to the directory where `tlibc`` is installed local absolute_dep_dir=$(realpath "$DEPENDENCIES_DIR")
file_copy_default_if_not_present "$user_config_path" "$user_config_path.default" file_copy_default_if_not_present "$user_config_path" "$user_config_path.default"
replace_var_value_in_script "$user_config_path" "DEPENDENCIES_DIR" "$absolute_dep_dir" replace_var_value_in_script "$user_config_path" "DEPENDENCIES_DIR" "$absolute_dep_dir"
} }