Commit f07352369efda57b4276eef8bcd40a47db052eae
2023-06-16T20:50:52
wip buf_parse_array
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
diff --git a/libc3/buf_parse.c b/libc3/buf_parse.c
index bdb318b..eb6bfb1 100644
--- a/libc3/buf_parse.c
+++ b/libc3/buf_parse.c
@@ -341,7 +341,7 @@ sw buf_parse_array (s_buf *buf, s_array *dest)
{
uw *address;
uw i = 0;
- void *item;
+ u8 *item;
sw item_size;
f_buf_parse parse = 0;
sw r;
@@ -375,20 +375,42 @@ sw buf_parse_array (s_buf *buf, s_array *dest)
}
if (r < 0)
goto restore;
- i = tmp.dimension;
- tmp.dimension++;
+ printf("\narray dimension: %lu\n", tmp.dimension);
if (! (address = calloc(tmp.dimension, sizeof(uw))))
err(1, "buf_parse_array: address");
if (! (tmp.dimensions = calloc(tmp.dimension, sizeof(s_array_dimension))))
err(1, "buf_parse_array: tmp.dimensions");
parse = tag_type_to_buf_parse(tmp.type);
- while (i == tmp.dimension - 1) {
- if ((r = parse(buf, item)) <= 0)
- goto restore;
- address[i]++;
+ i = tmp.dimension - 1;
+ buf_save_init(buf, &save_data);
+ /* read dimensions */
+ while (i > 0) {
+ while (i < tmp.dimension - 1 &&
+ (r = buf_read_1(buf, "[")) > 0) {
+ if ((r = buf_ignore_spaces(buf)) < 0)
+ goto restore_data;
+ i++;
+ }
+ if (r < 0)
+ goto restore_data;
+ while (i == tmp.dimension - 1) {
+ if ((r = parse(buf, item)) <= 0) {
+ warnx("buf_parse_array: invalid item");
+ r = -1;
+ goto clean;
+ }
+ if ((r = buf_ignore_spaces(buf)) < 0)
+ goto restore_data;
+ if ((r = buf_read_1(buf, ",")) < 0)
+ goto restore_data;
+ if ((r = buf_ignore_spaces(buf)) < 0)
+ goto restore_data;
+ address[i]++;
+ }
while ((r = buf_read_1(buf, "]")) > 0) {
if (! tmp.dimensions[i].count) {
tmp.dimensions[i].count = address[i];
+ printf("\ndimension %lu = %lu\n", i, address[i]);
if (i == tmp.dimension - 1)
tmp.dimensions[i].item_size = item_size;
else
@@ -401,26 +423,13 @@ sw buf_parse_array (s_buf *buf, s_array *dest)
errx(1, "buf_parse_array: dimension size mismatch");
return -1;
}
- if (! i)
- goto parse_data;
i--;
}
- if ((r = buf_ignore_spaces(buf)) < 0)
- goto restore;
- if ((r = buf_read_1(buf, ",")) <= 0)
- goto restore;
- if ((r = buf_ignore_spaces(buf)) < 0)
- goto restore;
- while (i < (tmp.dimension - 1) && (r = buf_read_1(buf, "[")) > 0) {
- if ((r = buf_ignore_spaces(buf)) < 0)
- goto restore;
- i++;
- }
if (r < 0)
- goto restore;
+ goto restore_data;
}
- parse_data:
- i = 0;
+ i = tmp.dimension - 1;
+ buf_save_restore_rpos(buf, &save_data);
tmp.size = tmp.dimensions[0].count * tmp.dimensions[0].item_size;
if (! (tmp.data = calloc(1, tmp.size))) {
buf_save_clean(buf, &save_data);
@@ -428,32 +437,38 @@ sw buf_parse_array (s_buf *buf, s_array *dest)
err(1, "buf_parse_array: tmp.data");
return -1;
}
- buf_save_restore_rpos(buf, &save);
- i = 0;
- while ((r = buf_read_1(buf, "[")) > 0) {
- result += r;
- i++;
- if ((r = buf_ignore_spaces(buf)) < 0)
- goto restore;
- result += r;
- }
- if (r < 0)
- goto restore;
- if (i != tmp.dimension - 1) {
- buf_save_clean(buf, &save);
- buf_save_clean(buf, &save_data);
- assert(! "buf_parse_array: parse_data: dimension mismatch");
- errx(1, "buf_parse_array: parse_data: dimension mismatch");
- return -1;
- }
- while (i == tmp.dimension - 1 &&
- address[i] < tmp.dimensions[i].count) {
- if ((r = parse(buf, item)) <= 0)
- goto restore;
- result += r;
- address[i]++;
- if ((r = buf_ignore_spaces(buf)) < 0)
- goto restore;
+ /* read data */
+ item = tmp.data;
+ while (i > 0) {
+ while (i < tmp.dimension - 1 &&
+ (r = buf_read_1(buf, "[")) > 0) {
+ result += r;
+ if ((r = buf_ignore_spaces(buf)) < 0)
+ goto restore_data;
+ result += r;
+ i++;
+ }
+ if (r < 0)
+ goto restore_data;
+ while (i == tmp.dimension - 1) {
+ if ((r = parse(buf, item)) <= 0) {
+ warnx("buf_parse_array: invalid item");
+ r = -1;
+ goto clean;
+ }
+ result += r;
+ item += item_size;
+ if ((r = buf_ignore_spaces(buf)) < 0)
+ goto restore_data;
+ result += r;
+ if ((r = buf_read_1(buf, ",")) < 0)
+ goto restore_data;
+ result += r;
+ if ((r = buf_ignore_spaces(buf)) < 0)
+ goto restore_data;
+ result += r;
+ address[i]++;
+ }
while ((r = buf_read_1(buf, "]")) > 0) {
result += r;
if (tmp.dimensions[i].count != address[i]) {
@@ -461,36 +476,18 @@ sw buf_parse_array (s_buf *buf, s_array *dest)
errx(1, "buf_parse_array: dimension size mismatch");
return -1;
}
- if (! i) {
- *dest = tmp;
- r = result;
- goto clean;
- }
- if ((r = buf_ignore_spaces(buf)) < 0)
- goto restore;
i--;
}
- if ((r = buf_ignore_spaces(buf)) < 0)
- goto restore;
- result += r;
- if ((r = buf_read_1(buf, ",")) <= 0)
- goto restore;
- result += r;
- if ((r = buf_ignore_spaces(buf)) < 0)
- goto restore;
- result += r;
- while (i < (tmp.dimension - 1) && (r = buf_read_1(buf, "[")) > 0) {
- result += r;
- if ((r = buf_ignore_spaces(buf)) < 0)
- goto restore;
- result += r;
- i++;
- }
if (r < 0)
- goto restore;
+ goto restore_data;
}
+ buf_save_clean(buf, &save_data);
+ *dest = tmp;
+ r = result;
+ goto clean;
+ restore_data:
+ buf_save_clean(buf, &save_data);
restore:
- r = 0;
buf_save_restore_rpos(buf, &save);
clean:
buf_save_clean(buf, &save);
diff --git a/test/buf_parse_test.c b/test/buf_parse_test.c
index 8e018c1..f130441 100644
--- a/test/buf_parse_test.c
+++ b/test/buf_parse_test.c
@@ -760,6 +760,8 @@ TEST_CASE(buf_parse_array)
BUF_PARSE_TEST_ARRAY("(u8)[0]", "(u8) [0]");
BUF_PARSE_TEST_ARRAY("(u8) [0]", "(u8) [0]");
BUF_PARSE_TEST_ARRAY("(u8) [[0], [0]]", "(u8) [[0], [0]]");
+ BUF_PARSE_TEST_ARRAY("(u8) [[[0, 1], [2, 3]], [[4, 5], [6, 7]]]",
+ "(u8) [[[0, 1], [2, 3]], [[4, 5], [6, 7]]]");
BUF_PARSE_TEST_ARRAY("(u8)[ [ 0 ],[ 0 ] ]", "(u8) [[0], [0]]");
}
TEST_CASE_END(buf_parse_array)