Commit 30c80ee7141ca800175b9bdec08f376a6447c9aa
2023-12-11T23:36:46
buf_inspect_list: plist
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
diff --git a/libc3/buf_inspect.c b/libc3/buf_inspect.c
index 353a4aa..688f060 100644
--- a/libc3/buf_inspect.c
+++ b/libc3/buf_inspect.c
@@ -1122,7 +1122,7 @@ sw buf_inspect_list (s_buf *buf, const s_list **x)
result++;
i = *x;
while (i) {
- if ((r = buf_inspect_tag(buf, &i->tag)) < 0)
+ if ((r = buf_inspect_list_tag(buf, &i->tag)) < 0)
return r;
result += r;
switch (i->next.type) {
@@ -1197,7 +1197,7 @@ sw buf_inspect_list_size (const s_list **list)
result += strlen("[");
i = *list;
while (i) {
- if ((r = buf_inspect_tag_size(&i->tag)) < 0)
+ if ((r = buf_inspect_list_tag_size(&i->tag)) < 0)
return r;
result += r;
switch (i->next.type) {
@@ -1218,6 +1218,62 @@ sw buf_inspect_list_size (const s_list **list)
return result;
}
+sw buf_inspect_list_tag (s_buf *buf, const s_tag *tag)
+{
+ sw r;
+ sw result = 0;
+ const s_sym *sym;
+ assert(buf);
+ assert(tag);
+ if (tag->type == TAG_TUPLE &&
+ tag->data.tuple.count == 2 &&
+ tag->data.tuple.tag[0].type == TAG_SYM) {
+ sym = tag->data.tuple.tag[0].data.sym;
+ if (sym_has_reserved_characters(sym)) {
+ if ((r = buf_inspect_str(buf, &sym->str)) < 0)
+ return r;
+ }
+ else
+ if ((r = buf_write_str(buf, &sym->str)) < 0)
+ return r;
+ result += r;
+ if ((r = buf_write_1(buf, ": ")) < 0)
+ return r;
+ result += r;
+ if ((r = buf_inspect_tag(buf, tag->data.tuple.tag + 1)) < 0)
+ return r;
+ result += r;
+ return result;
+ }
+ return buf_inspect_tag(buf, tag);
+}
+
+sw buf_inspect_list_tag_size (const s_tag *tag)
+{
+ sw r;
+ sw result = 0;
+ const s_sym *sym;
+ assert(tag);
+ if (tag->type == TAG_TUPLE &&
+ tag->data.tuple.count == 2 &&
+ tag->data.tuple.tag[0].type == TAG_SYM) {
+ sym = tag->data.tuple.tag[0].data.sym;
+ if (sym_has_reserved_characters(sym)) {
+ if ((r = buf_inspect_str_size(&sym->str)) < 0)
+ return r;
+ }
+ else
+ r = sym->str.size;
+ result += r;
+ result += strlen(": ");
+ if ((r = buf_inspect_tag_size(tag->data.tuple.tag + 1)) < 0)
+ return r;
+ result += r;
+ return result;
+ }
+ return buf_inspect_tag_size(tag);
+}
+
sw buf_inspect_map (s_buf *buf, const s_map *map)
{
uw i = 0;
@@ -1637,30 +1693,28 @@ sw buf_inspect_sym_size (const s_sym *x)
return x->str.size + colon_size;
}
-/* XXX keep in sync with buf_inspect_sym_reserved_size */
sw buf_inspect_sym_reserved (s_buf *buf, const s_sym *x)
{
sw r;
- sw size;
- size = buf_inspect_sym_reserved_size(x);
- if (size <= 0)
- return size;
- if ((r = buf_write_u8(buf, ':')) < 0 ||
- (r = buf_inspect_str(buf, &x->str)) < 0)
+ sw result = 0;
+ if ((r = buf_write_1(buf, ":")) < 0)
return r;
- return size;
+ result += r;
+ if ((r = buf_inspect_str(buf, &x->str)) < 0)
+ return r;
+ result += r;
+ return result;
}
-/* XXX keep in sync with buf_inspect_sym_reserved */
sw buf_inspect_sym_reserved_size (const s_sym *x)
{
- const sw colon_size = 1;
- sw size;
- size = buf_inspect_str_size(&x->str);
- if (size < 0)
- return size;
- size += colon_size;
- return size;
+ sw r;
+ sw result;
+ result = strlen(":");
+ if ((r = buf_inspect_str_size(&x->str)) < 0)
+ return r;
+ result += r;
+ return result;
}
sw buf_inspect_tag (s_buf *buf, const s_tag *tag)
diff --git a/libc3/buf_inspect.h b/libc3/buf_inspect.h
index 72f297a..bd17036 100644
--- a/libc3/buf_inspect.h
+++ b/libc3/buf_inspect.h
@@ -96,6 +96,8 @@ sw buf_inspect_integer_size (const s_integer *x);
sw buf_inspect_list (s_buf *buf, const s_list **list);
sw buf_inspect_list_paren (s_buf *buf, const s_list **list);
sw buf_inspect_list_size (const s_list **list);
+sw buf_inspect_list_tag (s_buf *buf, const s_tag *tag);
+sw buf_inspect_list_tag_size (const s_tag *tag);
sw buf_inspect_map (s_buf *buf, const s_map *map);
sw buf_inspect_map_size (const s_map *map);
sw buf_inspect_paren_sym (s_buf *buf, const s_sym *sym);