Commit 792bcf57520c883d2f5a106f428fef3edd1a04b6
2023-07-15T09:41:57
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
diff --git a/libc3/buf_parse.c b/libc3/buf_parse.c
index 4206cdf..2060663 100644
--- a/libc3/buf_parse.c
+++ b/libc3/buf_parse.c
@@ -220,9 +220,10 @@ sw buf_parse_array_dimensions (s_buf *buf, s_array *dest)
parse = tag_type_to_buf_parse(tmp.type);
data = calloc(1, size);
tmp.dimensions[tmp.dimension - 1].item_size = size;
- if ((r = buf_parse_array_dimensions_rec(buf, dest, 0,
- address, parse, data)) <= 0) {
- warnx("buf_parse_array_dimensions: buf_parse_array_dimensions_rec");
+ if ((r = buf_parse_array_dimensions_rec(buf, &tmp, 0, address,
+ parse, data)) <= 0) {
+ warnx("buf_parse_array_dimensions: buf_parse_array_dimensions_rec:"
+ " %ld", r);
goto clean;
}
*dest = tmp;
@@ -230,6 +231,8 @@ sw buf_parse_array_dimensions (s_buf *buf, s_array *dest)
goto clean;
buf_save_restore_rpos(buf, &save);
clean:
+ free(data);
+ free(address);
buf_save_clean(buf, &save);
return r;
}
@@ -238,7 +241,7 @@ sw buf_parse_array_dimensions_rec (s_buf *buf, s_array *dest,
uw dimension, uw *address,
f_buf_parse parse, void *data)
{
- sw r = 0;
+ sw r;
sw result = 0;
s_buf_save save;
s_array tmp;
@@ -247,81 +250,79 @@ sw buf_parse_array_dimensions_rec (s_buf *buf, s_array *dest,
assert(address);
tmp = *dest;
buf_save_init(buf, &save);
- if (dimension == dest->dimension - 1) {
- if ((r = parse(buf, data)) < 0) {
- warnx("buf_parse_array_dimensions_rec: parse");
- goto clean;
- }
- result += r;
- goto ok;
+ if ((r = buf_read_1(buf, "{")) <= 0) {
+ warnx("buf_parse_array_dimensions_rec: {");
+ goto clean;
}
- else {
- if ((r = buf_read_1(buf, "{")) <= 0) {
- warnx("buf_parse_array_dimensions_rec: {");
- goto clean;
- }
- result += r;
- if ((r = buf_ignore_spaces(buf)) < 0) {
- warnx("buf_parse_array_dimensions_rec: 1");
- goto restore;
+ result += r;
+ if ((r = buf_ignore_spaces(buf)) < 0) {
+ warnx("buf_parse_array_dimensions_rec: 1");
+ goto restore;
+ }
+ result += r;
+ dimension++;
+ address[dimension] = 0;
+ while (1) {
+ if (dimension == dest->dimension - 1) {
+ if ((r = parse(buf, data)) < 0) {
+ warnx("buf_parse_array_dimensions_rec: parse");
+ goto clean;
+ }
+ result += r;
}
- result += r;
- dimension++;
- address[dimension] = 0;
- while (1) {
+ else {
if ((r = buf_parse_array_dimensions_rec(buf, &tmp, dimension,
address, parse,
data)) <= 0) {
warnx("buf_parse_array_dimensions_rec: buf_parse_array_dimensions_rec");
goto restore;
}
- address[dimension]++;
- result += r;
- if ((r = buf_ignore_spaces(buf)) < 0) {
- warnx("buf_parse_array_dimensions_rec: 2");
- goto restore;
- }
- result += r;
- if ((r = buf_read_1(buf, ",")) < 0) {
- warnx("buf_parse_array_dimensions_rec: 3");
- goto restore;
- }
- result += r;
- if (! r)
- break;
- if ((r = buf_ignore_spaces(buf)) < 0) {
- warnx("buf_parse_array_dimensions_rec: 4");
- goto restore;
- }
result += r;
}
- if ((r = buf_read_1(buf, "}")) <= 0) {
- warnx("buf_parse_array_dimensions_rec: }");
+ address[dimension]++;
+ if ((r = buf_ignore_spaces(buf)) < 0) {
+ warnx("buf_parse_array_dimensions_rec: 2");
goto restore;
}
result += r;
- if (! tmp.dimensions[dimension].count) {
- tmp.dimensions[dimension].count = address[dimension];
- tmp.dimensions[dimension].item_size = tmp.dimensions[dimension + 1].count * tmp.dimensions[dimension + 1].item_size;
- }
- else 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;
+ if ((r = buf_read_1(buf, ",")) < 0) {
+ warnx("buf_parse_array_dimensions_rec: 3");
goto restore;
}
+ result += r;
+ if (! r)
+ break;
if ((r = buf_ignore_spaces(buf)) < 0) {
- warnx("buf_parse_array_dimensions_rec: 5");
+ warnx("buf_parse_array_dimensions_rec: 4");
goto restore;
}
result += r;
- goto ok;
}
- ok:
+ if ((r = buf_read_1(buf, "}")) <= 0) {
+ warnx("buf_parse_array_dimensions_rec: }");
+ goto restore;
+ }
+ result += r;
+ if (! tmp.dimensions[dimension].count) {
+ tmp.dimensions[dimension].count = address[dimension];
+ tmp.dimensions[dimension].item_size = tmp.dimensions[dimension + 1].count * tmp.dimensions[dimension + 1].item_size;
+ }
+ else 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;
+ }
+ if ((r = buf_ignore_spaces(buf)) < 0) {
+ warnx("buf_parse_array_dimensions_rec: 5");
+ goto restore;
+ }
+ result += r;
r = result;
goto clean;
restore:
+ warnx("buf_parse_array_dimensions_rec: restore");
buf_save_restore_rpos(buf, &save);
clean:
buf_save_clean(buf, &save);