Commit 829cb3e459b0ecf7c4e354d2eb64f8214168b3da

Thomas de Grivel 2024-07-27T19:14:10

libkc3: buf_inspect_s, buf_inspect_u: print cast

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
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
diff --git a/libkc3/buf_inspect_s.c.in b/libkc3/buf_inspect_s.c.in
index 3f2a017..775079e 100644
--- a/libkc3/buf_inspect_s.c.in
+++ b/libkc3/buf_inspect_s.c.in
@@ -13,13 +13,21 @@
 /* Gen from buf_inspect_s.c.in BITS=_BITS$ bits=_bits$ */
 #include <string.h>
 #include "buf.h"
+#include "buf_inspect.h"
 #include "buf_inspect_u_bits$.h"
+#include "sym.h"
 
 sw buf_inspect_s_bits$ (s_buf *buf, const s_bits$ *s)
 {
   sw r;
   sw result = 0;
   u_bits$ u;
+  if ((r = buf_inspect_paren_sym(buf, &g_sym_S_bits$)) < 0)
+    return r;
+  result += r;
+  if ((r = buf_write_1(buf, " ")) < 0)
+    return r;
+  result += r;
   u = *s;
   if (*s < 0) {
     if ((r = buf_write_1(buf, "-")) < 0)
@@ -27,7 +35,7 @@ sw buf_inspect_s_bits$ (s_buf *buf, const s_bits$ *s)
     result += r;
     u = -*s;
   }
-  if ((r = buf_inspect_u_bits$ (buf, &u)) < 0)
+  if ((r = buf_inspect_u_bits$(buf, &u)) < 0)
     return r;
   result += r;
   return result;
@@ -35,8 +43,13 @@ sw buf_inspect_s_bits$ (s_buf *buf, const s_bits$ *s)
 
 sw buf_inspect_s_bits$_size (const s_bits$ *s)
 {
+  sw r;
   sw result = 0;
   u_bits$ u;
+  if ((r = buf_inspect_paren_sym_size(&g_sym_S_bits$)) < 0)
+    return r;
+  result += r;
+  result += strlen(" ");
   u = *s;
   if (*s < 0) {
     result += strlen("-");
diff --git a/libkc3/buf_inspect_s16.c b/libkc3/buf_inspect_s16.c
index 289a111..8bd9fa7 100644
--- a/libkc3/buf_inspect_s16.c
+++ b/libkc3/buf_inspect_s16.c
@@ -13,13 +13,21 @@
 /* Gen from buf_inspect_s.c.in BITS=16 bits=16 */
 #include <string.h>
 #include "buf.h"
+#include "buf_inspect.h"
 #include "buf_inspect_u16.h"
+#include "sym.h"
 
 sw buf_inspect_s16 (s_buf *buf, const s16 *s)
 {
   sw r;
   sw result = 0;
   u16 u;
+  if ((r = buf_inspect_paren_sym(buf, &g_sym_S16)) < 0)
+    return r;
+  result += r;
+  if ((r = buf_write_1(buf, " ")) < 0)
+    return r;
+  result += r;
   u = *s;
   if (*s < 0) {
     if ((r = buf_write_1(buf, "-")) < 0)
@@ -27,7 +35,7 @@ sw buf_inspect_s16 (s_buf *buf, const s16 *s)
     result += r;
     u = -*s;
   }
-  if ((r = buf_inspect_u16 (buf, &u)) < 0)
+  if ((r = buf_inspect_u16(buf, &u)) < 0)
     return r;
   result += r;
   return result;
@@ -35,8 +43,13 @@ sw buf_inspect_s16 (s_buf *buf, const s16 *s)
 
 sw buf_inspect_s16_size (const s16 *s)
 {
+  sw r;
   sw result = 0;
   u16 u;
+  if ((r = buf_inspect_paren_sym_size(&g_sym_S16)) < 0)
+    return r;
+  result += r;
+  result += strlen(" ");
   u = *s;
   if (*s < 0) {
     result += strlen("-");
diff --git a/libkc3/buf_inspect_s32.c b/libkc3/buf_inspect_s32.c
index f4debc5..4855de1 100644
--- a/libkc3/buf_inspect_s32.c
+++ b/libkc3/buf_inspect_s32.c
@@ -13,13 +13,21 @@
 /* Gen from buf_inspect_s.c.in BITS=32 bits=32 */
 #include <string.h>
 #include "buf.h"
+#include "buf_inspect.h"
 #include "buf_inspect_u32.h"
+#include "sym.h"
 
 sw buf_inspect_s32 (s_buf *buf, const s32 *s)
 {
   sw r;
   sw result = 0;
   u32 u;
+  if ((r = buf_inspect_paren_sym(buf, &g_sym_S32)) < 0)
+    return r;
+  result += r;
+  if ((r = buf_write_1(buf, " ")) < 0)
+    return r;
+  result += r;
   u = *s;
   if (*s < 0) {
     if ((r = buf_write_1(buf, "-")) < 0)
@@ -27,7 +35,7 @@ sw buf_inspect_s32 (s_buf *buf, const s32 *s)
     result += r;
     u = -*s;
   }
-  if ((r = buf_inspect_u32 (buf, &u)) < 0)
+  if ((r = buf_inspect_u32(buf, &u)) < 0)
     return r;
   result += r;
   return result;
@@ -35,8 +43,13 @@ sw buf_inspect_s32 (s_buf *buf, const s32 *s)
 
 sw buf_inspect_s32_size (const s32 *s)
 {
+  sw r;
   sw result = 0;
   u32 u;
+  if ((r = buf_inspect_paren_sym_size(&g_sym_S32)) < 0)
+    return r;
+  result += r;
+  result += strlen(" ");
   u = *s;
   if (*s < 0) {
     result += strlen("-");
diff --git a/libkc3/buf_inspect_s64.c b/libkc3/buf_inspect_s64.c
index 39639ea..2c1d07f 100644
--- a/libkc3/buf_inspect_s64.c
+++ b/libkc3/buf_inspect_s64.c
@@ -13,13 +13,21 @@
 /* Gen from buf_inspect_s.c.in BITS=64 bits=64 */
 #include <string.h>
 #include "buf.h"
+#include "buf_inspect.h"
 #include "buf_inspect_u64.h"
+#include "sym.h"
 
 sw buf_inspect_s64 (s_buf *buf, const s64 *s)
 {
   sw r;
   sw result = 0;
   u64 u;
+  if ((r = buf_inspect_paren_sym(buf, &g_sym_S64)) < 0)
+    return r;
+  result += r;
+  if ((r = buf_write_1(buf, " ")) < 0)
+    return r;
+  result += r;
   u = *s;
   if (*s < 0) {
     if ((r = buf_write_1(buf, "-")) < 0)
@@ -27,7 +35,7 @@ sw buf_inspect_s64 (s_buf *buf, const s64 *s)
     result += r;
     u = -*s;
   }
-  if ((r = buf_inspect_u64 (buf, &u)) < 0)
+  if ((r = buf_inspect_u64(buf, &u)) < 0)
     return r;
   result += r;
   return result;
@@ -35,8 +43,13 @@ sw buf_inspect_s64 (s_buf *buf, const s64 *s)
 
 sw buf_inspect_s64_size (const s64 *s)
 {
+  sw r;
   sw result = 0;
   u64 u;
+  if ((r = buf_inspect_paren_sym_size(&g_sym_S64)) < 0)
+    return r;
+  result += r;
+  result += strlen(" ");
   u = *s;
   if (*s < 0) {
     result += strlen("-");
diff --git a/libkc3/buf_inspect_s8.c b/libkc3/buf_inspect_s8.c
index 4ca0118..53c823e 100644
--- a/libkc3/buf_inspect_s8.c
+++ b/libkc3/buf_inspect_s8.c
@@ -13,13 +13,21 @@
 /* Gen from buf_inspect_s.c.in BITS=8 bits=8 */
 #include <string.h>
 #include "buf.h"
+#include "buf_inspect.h"
 #include "buf_inspect_u8.h"
+#include "sym.h"
 
 sw buf_inspect_s8 (s_buf *buf, const s8 *s)
 {
   sw r;
   sw result = 0;
   u8 u;
+  if ((r = buf_inspect_paren_sym(buf, &g_sym_S8)) < 0)
+    return r;
+  result += r;
+  if ((r = buf_write_1(buf, " ")) < 0)
+    return r;
+  result += r;
   u = *s;
   if (*s < 0) {
     if ((r = buf_write_1(buf, "-")) < 0)
@@ -27,7 +35,7 @@ sw buf_inspect_s8 (s_buf *buf, const s8 *s)
     result += r;
     u = -*s;
   }
-  if ((r = buf_inspect_u8 (buf, &u)) < 0)
+  if ((r = buf_inspect_u8(buf, &u)) < 0)
     return r;
   result += r;
   return result;
@@ -35,8 +43,13 @@ sw buf_inspect_s8 (s_buf *buf, const s8 *s)
 
 sw buf_inspect_s8_size (const s8 *s)
 {
+  sw r;
   sw result = 0;
   u8 u;
+  if ((r = buf_inspect_paren_sym_size(&g_sym_S8)) < 0)
+    return r;
+  result += r;
+  result += strlen(" ");
   u = *s;
   if (*s < 0) {
     result += strlen("-");
diff --git a/libkc3/buf_inspect_sw.c b/libkc3/buf_inspect_sw.c
index 0037667..bba1a4d 100644
--- a/libkc3/buf_inspect_sw.c
+++ b/libkc3/buf_inspect_sw.c
@@ -13,13 +13,21 @@
 /* Gen from buf_inspect_s.c.in BITS=W bits=w */
 #include <string.h>
 #include "buf.h"
+#include "buf_inspect.h"
 #include "buf_inspect_uw.h"
+#include "sym.h"
 
 sw buf_inspect_sw (s_buf *buf, const sw *s)
 {
   sw r;
   sw result = 0;
   uw u;
+  if ((r = buf_inspect_paren_sym(buf, &g_sym_Sw)) < 0)
+    return r;
+  result += r;
+  if ((r = buf_write_1(buf, " ")) < 0)
+    return r;
+  result += r;
   u = *s;
   if (*s < 0) {
     if ((r = buf_write_1(buf, "-")) < 0)
@@ -27,7 +35,7 @@ sw buf_inspect_sw (s_buf *buf, const sw *s)
     result += r;
     u = -*s;
   }
-  if ((r = buf_inspect_uw (buf, &u)) < 0)
+  if ((r = buf_inspect_uw(buf, &u)) < 0)
     return r;
   result += r;
   return result;
@@ -35,8 +43,13 @@ sw buf_inspect_sw (s_buf *buf, const sw *s)
 
 sw buf_inspect_sw_size (const sw *s)
 {
+  sw r;
   sw result = 0;
   uw u;
+  if ((r = buf_inspect_paren_sym_size(&g_sym_Sw)) < 0)
+    return r;
+  result += r;
+  result += strlen(" ");
   u = *s;
   if (*s < 0) {
     result += strlen("-");
diff --git a/libkc3/buf_inspect_u.c.in b/libkc3/buf_inspect_u.c.in
index 2a5af22..3c7eaa0 100644
--- a/libkc3/buf_inspect_u.c.in
+++ b/libkc3/buf_inspect_u.c.in
@@ -17,10 +17,22 @@
 #include "buf_save.h"
 #include "kc3_main.h"
 #include "str.h"
+#include "sym.h"
 
 sw buf_inspect_u_bits$ (s_buf *buf, const u_bits$ *u)
 {
-  return buf_inspect_u_bits$_base(buf, &g_kc3_base_decimal, u);
+  sw r;
+  sw result = 0;
+  if ((r = buf_inspect_paren_sym(buf, &g_sym_U_bits$)) < 0)
+    return r;
+  result += r;
+  if ((r = buf_write_1(buf, " ")) < 0)
+    return r;
+  result += r;
+  if ((r = buf_inspect_u_bits$_base(buf, &g_kc3_base_decimal, u)) < 0)
+    return r;
+  result += r;
+  return result;
 }
 
 sw buf_inspect_u_bits$_base (s_buf *buf,
@@ -113,5 +125,14 @@ sw buf_inspect_u_bits$_base_size (const s_str *base,
 
 sw buf_inspect_u_bits$_size (const u_bits$ *u)
 {
-  return buf_inspect_u_bits$_base_size(&g_kc3_base_decimal, u);
+  sw r;
+  sw result = 0;
+  if ((r = buf_inspect_paren_sym_size(&g_sym_U_bits$)) < 0)
+    return r;
+  result += r;
+  result++;
+  if ((r = buf_inspect_u_bits$_base_size(&g_kc3_base_decimal, u)) < 0)
+    return r;
+  result += r;
+  return result;
 }
diff --git a/libkc3/buf_inspect_u16.c b/libkc3/buf_inspect_u16.c
index f78a8e9..0a3beb1 100644
--- a/libkc3/buf_inspect_u16.c
+++ b/libkc3/buf_inspect_u16.c
@@ -17,10 +17,22 @@
 #include "buf_save.h"
 #include "kc3_main.h"
 #include "str.h"
+#include "sym.h"
 
 sw buf_inspect_u16 (s_buf *buf, const u16 *u)
 {
-  return buf_inspect_u16_base(buf, &g_kc3_base_decimal, u);
+  sw r;
+  sw result = 0;
+  if ((r = buf_inspect_paren_sym(buf, &g_sym_U16)) < 0)
+    return r;
+  result += r;
+  if ((r = buf_write_1(buf, " ")) < 0)
+    return r;
+  result += r;
+  if ((r = buf_inspect_u16_base(buf, &g_kc3_base_decimal, u)) < 0)
+    return r;
+  result += r;
+  return result;
 }
 
 sw buf_inspect_u16_base (s_buf *buf,
@@ -113,5 +125,14 @@ sw buf_inspect_u16_base_size (const s_str *base,
 
 sw buf_inspect_u16_size (const u16 *u)
 {
-  return buf_inspect_u16_base_size(&g_kc3_base_decimal, u);
+  sw r;
+  sw result = 0;
+  if ((r = buf_inspect_paren_sym_size(&g_sym_U16)) < 0)
+    return r;
+  result += r;
+  result++;
+  if ((r = buf_inspect_u16_base_size(&g_kc3_base_decimal, u)) < 0)
+    return r;
+  result += r;
+  return result;
 }
diff --git a/libkc3/buf_inspect_u32.c b/libkc3/buf_inspect_u32.c
index 2c9006f..5d7285a 100644
--- a/libkc3/buf_inspect_u32.c
+++ b/libkc3/buf_inspect_u32.c
@@ -17,10 +17,22 @@
 #include "buf_save.h"
 #include "kc3_main.h"
 #include "str.h"
+#include "sym.h"
 
 sw buf_inspect_u32 (s_buf *buf, const u32 *u)
 {
-  return buf_inspect_u32_base(buf, &g_kc3_base_decimal, u);
+  sw r;
+  sw result = 0;
+  if ((r = buf_inspect_paren_sym(buf, &g_sym_U32)) < 0)
+    return r;
+  result += r;
+  if ((r = buf_write_1(buf, " ")) < 0)
+    return r;
+  result += r;
+  if ((r = buf_inspect_u32_base(buf, &g_kc3_base_decimal, u)) < 0)
+    return r;
+  result += r;
+  return result;
 }
 
 sw buf_inspect_u32_base (s_buf *buf,
@@ -113,5 +125,14 @@ sw buf_inspect_u32_base_size (const s_str *base,
 
 sw buf_inspect_u32_size (const u32 *u)
 {
-  return buf_inspect_u32_base_size(&g_kc3_base_decimal, u);
+  sw r;
+  sw result = 0;
+  if ((r = buf_inspect_paren_sym_size(&g_sym_U32)) < 0)
+    return r;
+  result += r;
+  result++;
+  if ((r = buf_inspect_u32_base_size(&g_kc3_base_decimal, u)) < 0)
+    return r;
+  result += r;
+  return result;
 }
diff --git a/libkc3/buf_inspect_u64.c b/libkc3/buf_inspect_u64.c
index 8332b43..98f6352 100644
--- a/libkc3/buf_inspect_u64.c
+++ b/libkc3/buf_inspect_u64.c
@@ -17,10 +17,22 @@
 #include "buf_save.h"
 #include "kc3_main.h"
 #include "str.h"
+#include "sym.h"
 
 sw buf_inspect_u64 (s_buf *buf, const u64 *u)
 {
-  return buf_inspect_u64_base(buf, &g_kc3_base_decimal, u);
+  sw r;
+  sw result = 0;
+  if ((r = buf_inspect_paren_sym(buf, &g_sym_U64)) < 0)
+    return r;
+  result += r;
+  if ((r = buf_write_1(buf, " ")) < 0)
+    return r;
+  result += r;
+  if ((r = buf_inspect_u64_base(buf, &g_kc3_base_decimal, u)) < 0)
+    return r;
+  result += r;
+  return result;
 }
 
 sw buf_inspect_u64_base (s_buf *buf,
@@ -113,5 +125,14 @@ sw buf_inspect_u64_base_size (const s_str *base,
 
 sw buf_inspect_u64_size (const u64 *u)
 {
-  return buf_inspect_u64_base_size(&g_kc3_base_decimal, u);
+  sw r;
+  sw result = 0;
+  if ((r = buf_inspect_paren_sym_size(&g_sym_U64)) < 0)
+    return r;
+  result += r;
+  result++;
+  if ((r = buf_inspect_u64_base_size(&g_kc3_base_decimal, u)) < 0)
+    return r;
+  result += r;
+  return result;
 }
diff --git a/libkc3/buf_inspect_u8.c b/libkc3/buf_inspect_u8.c
index 6c7bced..570f7d5 100644
--- a/libkc3/buf_inspect_u8.c
+++ b/libkc3/buf_inspect_u8.c
@@ -17,10 +17,22 @@
 #include "buf_save.h"
 #include "kc3_main.h"
 #include "str.h"
+#include "sym.h"
 
 sw buf_inspect_u8 (s_buf *buf, const u8 *u)
 {
-  return buf_inspect_u8_base(buf, &g_kc3_base_decimal, u);
+  sw r;
+  sw result = 0;
+  if ((r = buf_inspect_paren_sym(buf, &g_sym_U8)) < 0)
+    return r;
+  result += r;
+  if ((r = buf_write_1(buf, " ")) < 0)
+    return r;
+  result += r;
+  if ((r = buf_inspect_u8_base(buf, &g_kc3_base_decimal, u)) < 0)
+    return r;
+  result += r;
+  return result;
 }
 
 sw buf_inspect_u8_base (s_buf *buf,
@@ -113,5 +125,14 @@ sw buf_inspect_u8_base_size (const s_str *base,
 
 sw buf_inspect_u8_size (const u8 *u)
 {
-  return buf_inspect_u8_base_size(&g_kc3_base_decimal, u);
+  sw r;
+  sw result = 0;
+  if ((r = buf_inspect_paren_sym_size(&g_sym_U8)) < 0)
+    return r;
+  result += r;
+  result++;
+  if ((r = buf_inspect_u8_base_size(&g_kc3_base_decimal, u)) < 0)
+    return r;
+  result += r;
+  return result;
 }
diff --git a/libkc3/buf_inspect_uw.c b/libkc3/buf_inspect_uw.c
index 2972d4d..67fd7b5 100644
--- a/libkc3/buf_inspect_uw.c
+++ b/libkc3/buf_inspect_uw.c
@@ -17,10 +17,22 @@
 #include "buf_save.h"
 #include "kc3_main.h"
 #include "str.h"
+#include "sym.h"
 
 sw buf_inspect_uw (s_buf *buf, const uw *u)
 {
-  return buf_inspect_uw_base(buf, &g_kc3_base_decimal, u);
+  sw r;
+  sw result = 0;
+  if ((r = buf_inspect_paren_sym(buf, &g_sym_Uw)) < 0)
+    return r;
+  result += r;
+  if ((r = buf_write_1(buf, " ")) < 0)
+    return r;
+  result += r;
+  if ((r = buf_inspect_uw_base(buf, &g_kc3_base_decimal, u)) < 0)
+    return r;
+  result += r;
+  return result;
 }
 
 sw buf_inspect_uw_base (s_buf *buf,
@@ -113,5 +125,14 @@ sw buf_inspect_uw_base_size (const s_str *base,
 
 sw buf_inspect_uw_size (const uw *u)
 {
-  return buf_inspect_uw_base_size(&g_kc3_base_decimal, u);
+  sw r;
+  sw result = 0;
+  if ((r = buf_inspect_paren_sym_size(&g_sym_Uw)) < 0)
+    return r;
+  result += r;
+  result++;
+  if ((r = buf_inspect_uw_base_size(&g_kc3_base_decimal, u)) < 0)
+    return r;
+  result += r;
+  return result;
 }