Commit b48bfb7efa9d4c7ae6435c38e0ef09befe5363eb
2023-07-15T16:51:09
wip buf_parse_array_data
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
diff --git a/libc3/buf_parse.c b/libc3/buf_parse.c
index 137441e..d29717d 100644
--- a/libc3/buf_parse.c
+++ b/libc3/buf_parse.c
@@ -68,42 +68,33 @@ sw buf_parse_array_data (s_buf *buf, s_array *dest)
u8 *data;
f_buf_parse parse;
sw r;
- sw result = 0;
- s_buf_save save;
+ uw size;
s_array tmp;
assert(buf);
assert(dest);
tmp = *dest;
- if (! (address = calloc(tmp.dimension, sizeof(sw)))) {
- err(1, "buf_parse_array_data: address: %lu %lu",
- tmp.dimension, sizeof(sw));
- return -1;
- }
+ address = calloc(tmp.dimension, sizeof(sw));
+ size = tag_type_size(tmp.type);
parse = tag_type_to_buf_parse(tmp.type);
- if (! (tmp.data = calloc(tmp.dimensions[0].count,
- tmp.dimensions[0].item_size))) {
- err(1, "buf_parse_array_data: data");
- return -1;
- }
- data = tmp.data;
- if ((r = buf_parse_array_data_rec(buf, &tmp,
- tmp.dimension - 1,
- address, parse, &data)) <= 0)
+ tmp.data = calloc(tmp.dimensions[0].count * tmp.dimensions[0].item_size;
+ if ((r = buf_parse_array_data_rec(buf, &tmp, 0, address,
+ parse, data)) <= 0) {
+ warnx("buf_parse_array_data: buf_parse_array_data_rec:"
+ " %ld", r);
goto clean;
+ }
*dest = tmp;
- r = result;
- goto clean;
clean:
- buf_save_clean(buf, &save);
+ free(data);
+ free(address);
return r;
}
sw buf_parse_array_data_rec (s_buf *buf, s_array *dest,
- uw dimension, uw *address,
- f_buf_parse parse, u8 **data)
+ uw dimension, uw *address,
+ f_buf_parse parse, void *data)
{
- uw item_size;
- sw r = 0;
+ sw r;
sw result = 0;
s_buf_save save;
s_array tmp;
@@ -111,52 +102,72 @@ sw buf_parse_array_data_rec (s_buf *buf, s_array *dest,
assert(dest);
assert(address);
tmp = *dest;
- item_size = tag_type_size(tmp.type);
buf_save_init(buf, &save);
- start:
- if (dimension == dest->dimension - 1) {
- if ((r = parse(buf, *data)) < 0)
- goto clean;
- result += r;
- *data += item_size;
- goto ok;
- }
- if ((r = buf_read_1(buf, "[")) < 0)
+ if ((r = buf_read_1(buf, "{")) <= 0) {
+ warnx("buf_parse_array_data_rec: {");
goto clean;
- if (r) {
- result += r;
- dimension++;
- address[dimension] = 0;
- if ((r = buf_parse_array_data_rec(buf, &tmp, dimension,
- address, parse,
- data)) <= 0)
- goto clean;
- result += r;
- goto ok;
}
- if ((r = buf_read_1(buf, "]")) < 0)
- goto clean;
- if (r) {
+ result += r;
+ if ((r = buf_ignore_spaces(buf)) < 0) {
+ warnx("buf_parse_array_data_rec: 1");
+ goto restore;
+ }
+ result += r;
+ address[dimension] = 0;
+ while (1) {
+ if (dimension == dest->dimension - 1) {
+ if ((r = parse(buf, data)) < 0) {
+ warnx("buf_parse_array_data_rec: parse");
+ goto clean;
+ }
+ result += r;
+ data += tmp.dimensions[tmp.dimension - 1].item_size;
+ }
+ else {
+ if ((r = buf_parse_array_data_rec(buf, &tmp, dimension + 1,
+ address, parse,
+ data)) <= 0) {
+ warnx("buf_parse_array_data_rec: buf_parse_array_data_rec");
+ goto restore;
+ }
+ result += r;
+ }
+ address[dimension]++;
+ if ((r = buf_ignore_spaces(buf)) < 0) {
+ warnx("buf_parse_array_data_rec: 2");
+ goto restore;
+ }
result += r;
- dimension--;
- if (tmp.dimensions[dimension].count != address[dimension]) {
- assert(! "buf_parse_array_dimensions_rec: dimension mismatch");
- errx(1, "buf_parse_array_dimensions_rec: dimension mismatch"
- ": %lu", dimension);
- r = -1;
- goto clean;
+ if ((r = buf_read_1(buf, ",")) < 0) {
+ warnx("buf_parse_array_data_rec: 3");
+ goto restore;
}
- goto ok;
+ result += r;
+ if (! r)
+ break;
+ if ((r = buf_ignore_spaces(buf)) < 0) {
+ warnx("buf_parse_array_data_rec: 4");
+ goto restore;
+ }
+ result += r;
+ }
+ if ((r = buf_read_1(buf, "}")) <= 0) {
+ warnx("buf_parse_array_data_rec: }");
+ goto restore;
}
- if ((r = buf_read_1(buf, ",")) <= 0)
- goto clean;
result += r;
- address[dimension]++;
- if (dimension)
- goto start;
- ok:
+ if (tmp.dimensions[dimension].count != address[dimension]) {
+ assert(! "buf_parse_array_dimensions_rec: dimension mismatch");
+ errx(1, "buf_parse_array_dimensions_rec: dimension mismatch"
+ ": %lu", dimension);
+ r = -1;
+ goto restore;
+ }
r = result;
goto clean;
+ restore:
+ warnx("buf_parse_array_data_rec: restore");
+ buf_save_restore_rpos(buf, &save);
clean:
buf_save_clean(buf, &save);
return r;
@@ -207,13 +218,10 @@ sw buf_parse_array_dimensions (s_buf *buf, s_array *dest)
u8 *data;
f_buf_parse parse;
sw r;
- sw result = 0;
- s_buf_save save;
uw size;
s_array tmp;
assert(buf);
assert(dest);
- buf_save_init(buf, &save);
tmp = *dest;
address = calloc(tmp.dimension, sizeof(sw));
size = tag_type_size(tmp.type);
@@ -227,11 +235,9 @@ sw buf_parse_array_dimensions (s_buf *buf, s_array *dest)
goto clean;
}
*dest = tmp;
- r = result;
clean:
free(data);
free(address);
- buf_save_clean(buf, &save);
return r;
}