Commit 500914db7b43fde224c4784cf761420f09c9582e
2024-08-12T11:01:47
fix tests for pretty printer
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 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384
diff --git a/libkc3/buf.c b/libkc3/buf.c
index 568138e..48883d4 100644
--- a/libkc3/buf.c
+++ b/libkc3/buf.c
@@ -1083,17 +1083,17 @@ sw buf_u8_to_hex (s_buf *buf, const u8 *x)
buf_save_init(buf, &save);
digit = *x >> 4;
if (digit < 10)
- r = buf_write_u8(buf, digit + '0');
+ r = buf_write_character_utf8(buf, digit + '0');
else
- r = buf_write_u8(buf, digit - 10 + 'A');
+ r = buf_write_character_utf8(buf, digit - 10 + 'A');
if (r <= 0)
goto clean;
result += r;
digit = *x & 0xF;
if (digit < 10)
- r = buf_write_u8(buf, digit + '0');
+ r = buf_write_character_utf8(buf, digit + '0');
else
- r = buf_write_u8(buf, digit - 10 + 'A');
+ r = buf_write_character_utf8(buf, digit - 10 + 'A');
if (r <= 0)
goto restore;
result += r;
diff --git a/libkc3/buf_inspect.c b/libkc3/buf_inspect.c
index 87c6f82..fd7cc20 100644
--- a/libkc3/buf_inspect.c
+++ b/libkc3/buf_inspect.c
@@ -1457,7 +1457,7 @@ sw buf_inspect_f32 (s_buf *buf, const f32 *f)
i = (u8) x;
x -= i;
i += '0';
- if ((r = buf_write_u8(buf, i)) <= 0)
+ if ((r = buf_write_character_utf8(buf, i)) <= 0)
return r;
result += r;
if ((r = buf_write_1(buf, ".")) <= 0)
@@ -1469,7 +1469,7 @@ sw buf_inspect_f32 (s_buf *buf, const f32 *f)
i = (u8) x;
x -= i;
i += '0';
- if ((r = buf_write_u8(buf, i)) <= 0)
+ if ((r = buf_write_character_utf8(buf, i)) <= 0)
return r;
result += r;
j--;
@@ -1591,7 +1591,7 @@ sw buf_inspect_f64 (s_buf *buf, const f64 *f)
i = (u8) x;
x -= i;
i += '0';
- if ((r = buf_write_u8(buf, i)) <= 0)
+ if ((r = buf_write_character_utf8(buf, i)) <= 0)
return r;
result += r;
if ((r = buf_write_1(buf, ".")) <= 0)
@@ -1603,7 +1603,7 @@ sw buf_inspect_f64 (s_buf *buf, const f64 *f)
i = (u8) x;
x -= i;
i += '0';
- if ((r = buf_write_u8(buf, i)) <= 0)
+ if ((r = buf_write_character_utf8(buf, i)) <= 0)
return r;
result += r;
j--;
@@ -1719,7 +1719,7 @@ sw buf_inspect_f128 (s_buf *buf, const f128 *x)
i = (u8) y;
y -= i;
i += '0';
- if ((r = buf_write_u8(buf, i)) <= 0)
+ if ((r = buf_write_character_utf8(buf, i)) <= 0)
return r;
result += r;
if ((r = buf_write_1(buf, ".")) <= 0)
@@ -1731,7 +1731,7 @@ sw buf_inspect_f128 (s_buf *buf, const f128 *x)
i = (u8) y;
y -= i;
i += '0';
- if ((r = buf_write_u8(buf, i)) <= 0)
+ if ((r = buf_write_character_utf8(buf, i)) <= 0)
return r;
result += r;
j--;
@@ -1997,7 +1997,7 @@ sw buf_inspect_fn_pattern (s_buf *buf, const s_list *pattern)
sw r;
sw result = 0;
assert(buf);
- if ((r = buf_write_u8(buf, '(')) <= 0)
+ if ((r = buf_write_character_utf8(buf, '(')) <= 0)
return r;
result += r;
while (pattern) {
@@ -2011,7 +2011,7 @@ sw buf_inspect_fn_pattern (s_buf *buf, const s_list *pattern)
result += r;
}
}
- if ((r = buf_write_u8(buf, ')')) < 0)
+ if ((r = buf_write_character_utf8(buf, ')')) < 0)
return r;
result += r;
return result;
@@ -2178,7 +2178,7 @@ sw buf_inspect_integer (s_buf *buf, const s_integer *x)
s32 size = 0;
mp_int t;
if (MP_IS_ZERO(&x->mp_int))
- return buf_write_u8(buf, '0');
+ return buf_write_character_utf8(buf, '0');
if (mp_radix_size(&x->mp_int, radix, &size) != MP_OKAY)
return -1;
maxlen = size;
@@ -2187,7 +2187,7 @@ sw buf_inspect_integer (s_buf *buf, const s_integer *x)
if (t.sign == MP_NEG) {
t.sign = MP_ZPOS;
maxlen--;
- buf_write_u8(buf, '-');
+ buf_write_character_utf8(buf, '-');
result++;
}
buf_init_alloc(&buf_tmp, maxlen);
@@ -2197,7 +2197,7 @@ sw buf_inspect_integer (s_buf *buf, const s_integer *x)
p = '0' + d;
if (p > '9')
goto error;
- buf_write_u8(&buf_tmp, p);
+ buf_write_character_utf8(&buf_tmp, p);
result++;
}
buf_xfer_reverse(&buf_tmp, buf);
@@ -2749,13 +2749,13 @@ sw buf_inspect_str (s_buf *buf, const s_str *str)
if (b)
return buf_inspect_str_reserved(buf, str);
buf_save_init(buf, &save);
- if ((r = buf_write_u8(buf, '"')) <= 0)
+ if ((r = buf_write_character_utf8(buf, '"')) <= 0)
goto clean;
result += r;
if ((r = buf_write_str_without_indent(buf, str)) < 0)
goto restore;
result += r;
- if ((r = buf_write_u8(buf, '"')) <= 0)
+ if ((r = buf_write_character_utf8(buf, '"')) <= 0)
goto restore;
result += r;
r = result;
@@ -2828,21 +2828,45 @@ sw buf_inspect_str_character (s_buf *buf, const character *c)
goto restore;
result += r;
switch (*c) {
- case '\0': if ((r = buf_write_u8(buf, '0')) <= 0) goto restore; break;
- case '\n': if ((r = buf_write_u8(buf, 'n')) <= 0) goto restore; break;
- case '\r': if ((r = buf_write_u8(buf, 'r')) <= 0) goto restore; break;
- case '\t': if ((r = buf_write_u8(buf, 't')) <= 0) goto restore; break;
- case '\v': if ((r = buf_write_u8(buf, 'v')) <= 0) goto restore; break;
- case '\"': if ((r = buf_write_u8(buf, '"')) <= 0) goto restore; break;
- case '\'': if ((r = buf_write_u8(buf, '\'')) <= 0) goto restore; break;
- case '\\': if ((r = buf_write_u8(buf, '\\')) <= 0) goto restore; break;
+ case '\0':
+ if ((r = buf_write_character_utf8(buf, '0')) <= 0)
+ goto restore;
+ break;
+ case '\n':
+ if ((r = buf_write_character_utf8(buf, 'n')) <= 0)
+ goto restore;
+ break;
+ case '\r':
+ if ((r = buf_write_character_utf8(buf, 'r')) <= 0)
+ goto restore;
+ break;
+ case '\t':
+ if ((r = buf_write_character_utf8(buf, 't')) <= 0)
+ goto restore;
+ break;
+ case '\v':
+ if ((r = buf_write_character_utf8(buf, 'v')) <= 0)
+ goto restore;
+ break;
+ case '\"':
+ if ((r = buf_write_character_utf8(buf, '"')) <= 0)
+ goto restore;
+ break;
+ case '\'':
+ if ((r = buf_write_character_utf8(buf, '\'')) <= 0)
+ goto restore;
+ break;
+ case '\\':
+ if ((r = buf_write_character_utf8(buf, '\\')) <= 0)
+ goto restore;
+ break;
default:
buf_init(&char_buf, false, sizeof(b), b);
if ((r = buf_write_character_utf8(&char_buf, *c)) <= 0)
goto restore;
i = r - 1;
j = 0;
- if ((r = buf_write_u8(buf, 'x')) != 1)
+ if ((r = buf_write_character_utf8(buf, 'x')) != 1)
goto restore;
result1 += r;
if ((r = buf_u8_to_hex(buf, &char_buf.ptr.pu8[j++])) != 2)
@@ -2996,7 +3020,7 @@ sw buf_inspect_str_reserved (s_buf *buf, const s_str *str)
result += r;
}
}
- if ((r = buf_write_u8(buf, '"')) <= 0)
+ if ((r = buf_write_character_utf8(buf, '"')) <= 0)
goto restore;
result += r;
r = result;
@@ -3101,38 +3125,39 @@ sw buf_inspect_struct (s_buf *buf, const s_struct *s)
err_write_1(tag_type_to_string(k->type));
err_puts(")");
assert(k->type == TAG_SYM);
- return -1;
+ r = -1;
+ goto clean;
}
if (sym_has_reserved_characters(k->data.sym)) {
if ((r = buf_inspect_str(buf, &k->data.sym->str)) < 0)
- return r;
+ goto clean;
}
else
if ((r = buf_write_str_without_indent(buf,
&k->data.sym->str)) < 0)
- return r;
+ goto clean;
result += r;
if ((r = buf_write_1(buf, ": ")) < 0)
- return r;
+ goto clean;
result += r;
if (s->data) {
if (! tag_type(s->type->map.value + i, &type))
- return -1;
+ goto clean;
assert(s->type->offset[i] < s->type->size);
if ((r = data_buf_inspect(type, buf, (char *) s->data +
s->type->offset[i])) < 0)
- return r;
+ goto clean;
result += r;
}
else if (s->tag) {
if ((r = buf_inspect_tag(buf, s->tag + i)) < 0)
- return r;
+ goto clean;
result += r;
}
i++;
if (i < s->type->map.count) {
if ((r = buf_write_1(buf, ",\n")) < 0)
- return r;
+ goto clean;
result += r;
}
}
@@ -3142,6 +3167,9 @@ sw buf_inspect_struct (s_buf *buf, const s_struct *s)
return r;
result += r;
return result;
+ clean:
+ pretty_save_clean(&pretty_save, &buf->pretty);
+ return -1;
}
sw buf_inspect_struct_size (s_pretty *pretty, const s_struct *s)
@@ -3152,15 +3180,18 @@ sw buf_inspect_struct_size (s_pretty *pretty, const s_struct *s)
sw r;
sw result = 0;
const s_sym *type;
+ assert(pretty);
assert(s);
assert(sym_is_module(s->type->module));
if ((r = buf_write_1_size(pretty, "%")) < 0)
return r;
result += r;
- if (! sym_is_module(s->type->module))
+ if (! sym_is_module(s->type->module)) {
+ err_puts("buf_inspect_struct: sym_is_module(s->type->module)");
+ assert(! "buf_inspect_struct: sym_is_module(s->type->module)");
return -1;
- if ((r = buf_write_str_without_indent_size
- (pretty, &s->type->module->str)) < 0)
+ }
+ if ((r = buf_write_str_without_indent_size(pretty, &s->type->module->str)) < 0)
return r;
result += r;
if ((r = buf_write_1_size(pretty, "{")) < 0)
@@ -3172,43 +3203,46 @@ sw buf_inspect_struct_size (s_pretty *pretty, const s_struct *s)
while (i < s->type->map.count) {
k = s->type->map.key + i;
if (k->type != TAG_SYM) {
- err_write_1("buf_inspect_struct_size: key type is not a symbol: ");
+ err_write_1("buf_inspect_struct: key type is not a symbol: ");
err_inspect_tag(k);
err_write_1(" (");
err_write_1(tag_type_to_string(k->type));
err_puts(")");
assert(k->type == TAG_SYM);
- return -1;
+ r = -1;
+ goto clean;
}
if (sym_has_reserved_characters(k->data.sym)) {
if ((r = buf_inspect_str_size(pretty, &k->data.sym->str)) < 0)
- return r;
+ goto clean;
}
else
- r = k->data.sym->str.size;
+ if ((r = buf_write_str_without_indent_size(pretty,
+ &k->data.sym->str)) < 0)
+ goto clean;
result += r;
if ((r = buf_write_1_size(pretty, ": ")) < 0)
- return r;
+ goto clean;
result += r;
if (s->data) {
if (! tag_type(s->type->map.value + i, &type))
- return -1;
+ goto clean;
assert(s->type->offset[i] < s->type->size);
if ((r = data_buf_inspect_size(type, pretty,
(char *) s->data +
s->type->offset[i])) < 0)
- return r;
+ goto clean;
result += r;
}
else if (s->tag) {
if ((r = buf_inspect_tag_size(pretty, s->tag + i)) < 0)
- return r;
+ goto clean;
result += r;
}
i++;
if (i < s->type->map.count) {
if ((r = buf_write_1_size(pretty, ",\n")) < 0)
- return r;
+ goto clean;
result += r;
}
}
@@ -3218,6 +3252,9 @@ sw buf_inspect_struct_size (s_pretty *pretty, const s_struct *s)
return r;
result += r;
return result;
+ clean:
+ pretty_save_clean(&pretty_save, pretty);
+ return -1;
}
sw buf_inspect_struct_type (s_buf *buf, const s_struct_type *st)
diff --git a/libkc3/str.c b/libkc3/str.c
index 1f80a82..ddbfe24 100644
--- a/libkc3/str.c
+++ b/libkc3/str.c
@@ -137,7 +137,7 @@
#define DEF_STR_INIT_STRUCT(name) \
s_str * str_init_ ## name (s_str *str, const s_ ## name *x) \
{ \
- s_buf buf; \
+ s_buf buf = {0}; \
s_pretty pretty = {0}; \
sw r; \
sw size; \
diff --git a/test/ikc3/str.out.expected b/test/ikc3/str.out.expected
index 0327d79..a72e855 100644
--- a/test/ikc3/str.out.expected
+++ b/test/ikc3/str.out.expected
@@ -62,8 +62,10 @@
"#{%Buf{}}"
"%Buf{column: (Sw) 0,\n flush: (Ptr) 0x0,\n free: false,\n line: (Sw) 0,\n ptr: (Ptr) 0x0,\n read_only: false,\n refill: (Ptr) 0x0,\n rpos: (Uw) 0,\n save: (Ptr) 0x0,\n seek: (Ptr) 0x0,\n size: (Uw) 0,\n user_ptr: (Ptr) 0x0,\n wpos: (Uw) 0}"
"#{%BufRW{}}"
-"%BufRW{r: (Ptr) 0x0,\n w: (Ptr) 0x0}"
+"%BufRW{r: (Ptr) 0x0,\n w: (Ptr) 0x0}"
"#{(U8[]) {{0, 0},
{0, 0},
{0, 0}}}"
"(U8[]) {{0, 0},\n {0, 0},\n {0, 0}}"
+"#{%Socket.Buf{}}"
+"%Socket.Buf{addr: (Ptr) 0x0,\n addr_len: (U32) 0,\n sockfd: (S32) -1,\n buf_rw: %BufRW{r: (Ptr) 0x0,\n w: (Ptr) 0x0}}"