Commit 47e30f02d18bd31628eff11448d2b7e140f80c57
2024-07-31T17:04:39
str_init_cast: cast from [Map, Struct, Tuple] to Str
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153
diff --git a/libkc3/str.c b/libkc3/str.c
index 79a4885..7df45b6 100644
--- a/libkc3/str.c
+++ b/libkc3/str.c
@@ -37,16 +37,19 @@
#include "tag.h"
#include "tag_type.h"
-#define DEF_STR_INIT(type) \
- s_str * str_init_ ## type (s_str *str, type x) \
+#define DEF_STR_INIT(name, type) \
+ s_str * str_init_ ## name (s_str *str, type x) \
{ \
s_buf buf; \
sw size; \
- size = buf_inspect_ ## type ## _size(&x); \
+ size = buf_inspect_ ## name ## _size(&x); \
if (size <= 0) \
return NULL; \
buf_init_alloc(&buf, size); \
- buf_inspect_ ## type(&buf, &x); \
+ if (buf_inspect_ ## name(&buf, &x) < 0) { \
+ buf_clean(&buf); \
+ return NULL; \
+ } \
assert(buf.wpos == (uw) size); \
return buf_to_str(&buf, str); \
}
@@ -65,6 +68,25 @@
return buf_to_str(&buf, str); \
}
+#define DEF_STR_INIT_STRUCT(name) \
+ s_str * str_init_ ## name (s_str *str, const s_ ## name *x) \
+ { \
+ s_buf buf; \
+ sw size; \
+ size = buf_inspect_ ## name ## _size(x); \
+ if (! size) \
+ return str_init_empty(str); \
+ if (size < 0) \
+ return NULL; \
+ buf_init_alloc(&buf, size); \
+ if (buf_inspect_ ## name(&buf, x) < 0) { \
+ buf_clean(&buf); \
+ return NULL; \
+ } \
+ assert(buf.wpos == (uw) size); \
+ return buf_to_str(&buf, str); \
+ }
+
sw str_character (const s_str *str, uw position, character *dest)
{
character c;
@@ -181,6 +203,8 @@ s_str * str_init_cast (s_str *str, const s_sym * const *type,
switch (tag->type) {
case TAG_CHARACTER:
return str_init_character(str, tag->data.character);
+ case TAG_MAP:
+ return str_init_map(str, &tag->data.map);
case TAG_S8:
return str_init_s8(str, tag->data.s8);
case TAG_S16:
@@ -191,10 +215,14 @@ s_str * str_init_cast (s_str *str, const s_sym * const *type,
return str_init_s64(str, tag->data.s64);
case TAG_STR:
return str_init_copy(str, &tag->data.str);
+ case TAG_STRUCT:
+ return str_init_struct(str, &tag->data.struct_);
case TAG_SYM:
return str_init_copy(str, &tag->data.sym->str);
case TAG_SW:
return str_init_sw(str, tag->data.sw);
+ case TAG_TUPLE:
+ return str_init_tuple(str, &tag->data.tuple);
case TAG_U8:
return str_init_u8(str, tag->data.u8);
case TAG_U16:
@@ -306,10 +334,12 @@ s_str * str_init_f (s_str *str, const char *fmt, ...)
return str;
}
+DEF_STR_INIT_STRUCT(map)
DEF_STR_INIT_INT(s8)
DEF_STR_INIT_INT(s16)
DEF_STR_INIT_INT(s32)
DEF_STR_INIT_INT(s64)
+DEF_STR_INIT_STRUCT(struct)
DEF_STR_INIT_INT(sw)
s_str * str_init_slice (s_str *str, const s_str *src, sw start, sw end)
@@ -347,6 +377,7 @@ s_str * str_init_slice (s_str *str, const s_str *src, sw start, sw end)
return str;
}
+DEF_STR_INIT_STRUCT(tuple)
DEF_STR_INIT_INT(u8)
DEF_STR_INIT_INT(u16)
DEF_STR_INIT_INT(u32)
diff --git a/libkc3/str.h b/libkc3/str.h
index 7e911dc..371318c 100644
--- a/libkc3/str.h
+++ b/libkc3/str.h
@@ -26,9 +26,15 @@
#define STR_MAX (16 * 1024 * 1024)
-#define PROTOTYPE_STR_INIT(type) \
+#define PROTOTYPE_STR_INIT(name, type) \
+ s_str * str_init_ ## name (s_str *str, type x)
+
+#define PROTOTYPE_STR_INIT_INT(type) \
s_str * str_init_ ## type (s_str *str, type x)
+#define PROTOTYPE_STR_INIT_STRUCT(type) \
+ s_str * str_init_ ## type (s_str *str, const s_ ## type *x)
+
/* Stack allocation compatible functions */
void str_clean (s_str *str);
s_str * str_init (s_str *str, char *free, uw size, const char *p);
@@ -42,19 +48,22 @@ s_str * str_init_copy (s_str *str, const s_str *src);
s_str * str_init_copy_1 (s_str *str, const char *p);
s_str * str_init_empty (s_str *str);
s_str * str_init_f (s_str *str, const char *fmt, ...);
-PROTOTYPE_STR_INIT(s8);
-PROTOTYPE_STR_INIT(s16);
-PROTOTYPE_STR_INIT(s32);
-PROTOTYPE_STR_INIT(s64);
+PROTOTYPE_STR_INIT_STRUCT(map);
+PROTOTYPE_STR_INIT_INT(s8);
+PROTOTYPE_STR_INIT_INT(s16);
+PROTOTYPE_STR_INIT_INT(s32);
+PROTOTYPE_STR_INIT_INT(s64);
s_str * str_init_slice (s_str *str, const s_str *src, sw start, sw end);
s_str * str_init_slice_utf8 (s_str *str, const s_str *src, sw start,
sw end);
-PROTOTYPE_STR_INIT(sw);
-PROTOTYPE_STR_INIT(u8);
-PROTOTYPE_STR_INIT(u16);
-PROTOTYPE_STR_INIT(u32);
-PROTOTYPE_STR_INIT(u64);
-PROTOTYPE_STR_INIT(uw);
+PROTOTYPE_STR_INIT_STRUCT(struct);
+PROTOTYPE_STR_INIT_INT(sw);
+PROTOTYPE_STR_INIT_STRUCT(tuple);
+PROTOTYPE_STR_INIT_INT(u8);
+PROTOTYPE_STR_INIT_INT(u16);
+PROTOTYPE_STR_INIT_INT(u32);
+PROTOTYPE_STR_INIT_INT(u64);
+PROTOTYPE_STR_INIT_INT(uw);
s_str * str_init_vf (s_str *str, const char *fmt, va_list ap);
/* Constructors, call str_delete after use */