monkee.ch/snac2
1
0
Fork 0
mirror of https://codeberg.org/grunfink/snac2.git synced 2024-11-22 05:15:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Backport from xs.

Browse source
This commit is contained in:
default 2024-02-20 05:18:03 +01:00
parent d1ad6640ea
commit 75e1f939d0
2 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
xs.h
View file

@ -86,7 +86,8 @@ xs_str *xs_tolower_i(xs_str *str);
xs_list *xs_list_new(void); xs_list *xs_list_new(void);
xs_list *xs_list_append_m(xs_list *list, const char *mem, int dsz); xs_list *xs_list_append_m(xs_list *list, const char *mem, int dsz);
#define xs_list_append(list, data) xs_list_append_m(list, data, xs_size(data)) xs_list *_xs_list_append(xs_list *list, const xs_val *vals[]);
#define xs_list_append(list, ...) _xs_list_append(list, (const xs_val *[]){ __VA_ARGS__, NULL })
int xs_list_iter(xs_list **list, xs_val **value); int xs_list_iter(xs_list **list, xs_val **value);
int xs_list_len(const xs_list *list); int xs_list_len(const xs_list *list);
xs_val *xs_list_get(const xs_list *list, int num); xs_val *xs_list_get(const xs_list *list, int num);
@ -108,7 +109,8 @@ xs_dict *xs_dict_append_m(xs_dict *dict, const xs_str *key, const xs_val *mem, i
xs_dict *xs_dict_prepend_m(xs_dict *dict, const xs_str *key, const xs_val *mem, int dsz); xs_dict *xs_dict_prepend_m(xs_dict *dict, const xs_str *key, const xs_val *mem, int dsz);
#define xs_dict_prepend(dict, key, data) xs_dict_prepend_m(dict, key, data, xs_size(data)) #define xs_dict_prepend(dict, key, data) xs_dict_prepend_m(dict, key, data, xs_size(data))
int xs_dict_iter(xs_dict **dict, xs_str **key, xs_val **value); int xs_dict_iter(xs_dict **dict, xs_str **key, xs_val **value);
xs_val *xs_dict_get(const xs_dict *dict, const xs_str *key); xs_val *xs_dict_get_def(const xs_dict *dict, const xs_str *key, const xs_val *def);
#define xs_dict_get(dict, key) xs_dict_get_def(dict, key, NULL)
xs_dict *xs_dict_del(xs_dict *dict, const xs_str *key); xs_dict *xs_dict_del(xs_dict *dict, const xs_str *key);
xs_dict *xs_dict_set(xs_dict *dict, const xs_str *key, const xs_val *data); xs_dict *xs_dict_set(xs_dict *dict, const xs_str *key, const xs_val *data);
@ -677,6 +679,22 @@ xs_list *xs_list_append_m(xs_list *list, const char *mem, int dsz)
} }
xs_list *_xs_list_append(xs_list *list, const xs_val *vals[])
/* adds several values to the list */
{
/* special case: if the first argument is NULL, just insert it */
if (*vals == NULL)
return xs_list_append_m(list, NULL, 0);
while (*vals) {
list = xs_list_append_m(list, *vals, xs_size(*vals));
vals++;
}
return list;
}
int xs_list_iter(xs_list **list, xs_val **value) int xs_list_iter(xs_list **list, xs_val **value)
/* iterates a list value */ /* iterates a list value */
{ {
@ -1004,8 +1022,8 @@ int xs_dict_iter(xs_dict **dict, xs_str **key, xs_val **value)
} }
xs_val *xs_dict_get(const xs_dict *dict, const xs_str *key) xs_val *xs_dict_get_def(const xs_dict *dict, const xs_str *key, const xs_val *def)
/* returns the value directed by key */ /* returns the value directed by key, or the default value */
{ {
XS_ASSERT_TYPE(dict, XSTYPE_DICT); XS_ASSERT_TYPE(dict, XSTYPE_DICT);
XS_ASSERT_TYPE(key, XSTYPE_STRING); XS_ASSERT_TYPE(key, XSTYPE_STRING);
@ -1019,7 +1037,7 @@ xs_val *xs_dict_get(const xs_dict *dict, const xs_str *key)
return v; return v;
} }
return NULL; return (xs_val *)def;
} }

2
xs_version.h
View file

@ -1 +1 @@
/* e277e59e0ccbe2111aaf884c85ccadeebabd5281 2024-01-30T13:56:36+01:00 */ /* 98305e8badd7ed505bb6e667c202bad63e4e79ef 2024-02-20T05:16:49+01:00 */