Commit 8d8c89988a15b84caa6829581081b98b91457711
2023-12-21T03:27:57
fix tests
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
diff --git a/ic3/.ic3_history b/ic3/.ic3_history
index f7b7c47..1582c71 100644
--- a/ic3/.ic3_history
+++ b/ic3/.ic3_history
@@ -13,3 +13,6 @@ a = (U8) { 1, 2 }
a[0]
a = (U8) { 1, 2 }
a[0]
+quote (GL.Vertex) {}
+(GL.Vertex) {}
+
diff --git a/libc3/array.c b/libc3/array.c
index b70d9c9..4c789ac 100644
--- a/libc3/array.c
+++ b/libc3/array.c
@@ -294,69 +294,57 @@ s_array * array_init_copy (s_array *a, const s_array *src)
s_array tmp = {0};
assert(a);
assert(src);
- assert(src->dimension);
- assert(src->dimensions);
- (void) i;
- if (! src->dimension) {
- err_puts("array_init_copy: zero dimension");
- assert(! "array_init_copy: zero dimension");
- return NULL;
- }
-#ifdef DEBUG
- while (i < src->dimension) {
- assert(src->dimensions[i].count);
- i++;
- }
-#endif
+ tmp.count = src->count;
tmp.dimension = src->dimension;
- if (! (tmp.dimensions = calloc(tmp.dimension,
- sizeof(s_array_dimension)))) {
- assert(! "array_init_copy: out of memory: dimensions");
- warnx("array_init_copy: out of memory: dimensions");
- return NULL;
- }
- memcpy(tmp.dimensions, src->dimensions,
- src->dimension * sizeof(s_array_dimension));
- tmp.count = src->count;
- tmp.size = src->size;
- tmp.type = src->type;
- if (src->data) {
- tmp.data = tmp.data_free = calloc(1, src->size);
- if (! tmp.data) {
- warnx("array_init_copy: failed to allocate memory");
- assert(! "array_init_copy: failed to allocate memory");
- free(tmp.dimensions);
- return NULL;
- }
- if (! sym_to_init_copy(src->type, &init_copy)) {
- free(tmp.dimensions);
+ tmp.size = src->size;
+ tmp.type = src->type;
+ if (tmp.dimension) {
+ if (! (tmp.dimensions = calloc(tmp.dimension,
+ sizeof(s_array_dimension)))) {
+ assert(! "array_init_copy: out of memory: dimensions");
+ warnx("array_init_copy: out of memory: dimensions");
return NULL;
}
- data_tmp = tmp.data;
- data_src = src->data;
- i = 0;
- item_size = src->dimensions[src->dimension - 1].item_size;
- while (i < src->count) {
- if (! init_copy(data_tmp, data_src))
- goto ko_data;
- data_tmp += item_size;
- data_src += item_size;
- i++;
- }
- }
- else if (src->tags) {
- tmp.tags = calloc(src->count, sizeof(s_tag));
- if (! tmp.tags) {
- warn("array_init_copy: failed to allocate memory");
- assert(! "array_init_copy: failed to allocate memory");
- free(tmp.dimensions);
- return NULL;
+ memcpy(tmp.dimensions, src->dimensions,
+ src->dimension * sizeof(s_array_dimension));
+ if (src->data) {
+ tmp.data = tmp.data_free = calloc(1, src->size);
+ if (! tmp.data) {
+ warnx("array_init_copy: failed to allocate memory");
+ assert(! "array_init_copy: failed to allocate memory");
+ free(tmp.dimensions);
+ return NULL;
+ }
+ if (! sym_to_init_copy(src->type, &init_copy)) {
+ free(tmp.dimensions);
+ return NULL;
+ }
+ data_tmp = tmp.data;
+ data_src = src->data;
+ i = 0;
+ item_size = src->dimensions[src->dimension - 1].item_size;
+ while (i < src->count) {
+ if (! init_copy(data_tmp, data_src))
+ goto ko_data;
+ data_tmp += item_size;
+ data_src += item_size;
+ i++;
+ }
}
- i = 0;
- while (i < src->count) {
- if (! tag_init_copy(tmp.tags + i, src->tags + i))
- goto ko_tags;
- i++;
+ else if (src->tags) {
+ tmp.tags = calloc(src->count, sizeof(s_tag));
+ if (! tmp.tags) {
+ warn("array_init_copy: failed to allocate memory");
+ assert(! "array_init_copy: failed to allocate memory");
+ free(tmp.dimensions);
+ return NULL;
+ }
+ i = 0;
+ while (i < src->count) {
+ if (! tag_init_copy(tmp.tags + i, src->tags + i))
+ goto ko_tags;
+ i++;
+ }
}
}
*a = tmp;
diff --git a/libc3/buf_inspect.c b/libc3/buf_inspect.c
index 77a6cbe..e97f180 100644
--- a/libc3/buf_inspect.c
+++ b/libc3/buf_inspect.c
@@ -52,6 +52,13 @@ sw buf_inspect_array (s_buf *buf, const s_array *array)
if ((r = buf_write_1(buf, " ")) < 0)
goto clean;
result += r;
+ if (! array->dimension) {
+ if ((r = buf_write_1(buf, "{}")) < 0)
+ goto clean;
+ result += r;
+ r = result;
+ goto clean;
+ }
if ((r = buf_inspect_array_data(buf, array)) < 0) {
err_puts("buf_inspect_array: buf_inspect_array_data");
goto clean;
diff --git a/libc3/buf_parse.c b/libc3/buf_parse.c
index ec5047a..f7e6ffc 100644
--- a/libc3/buf_parse.c
+++ b/libc3/buf_parse.c
@@ -58,15 +58,11 @@ sw buf_parse_array (s_buf *buf, s_array *dest)
if ((r = buf_ignore_spaces(buf)) < 0)
goto restore;
result += r;
- if ((r = buf_peek_array_dimension_count(buf, &tmp)) <= 0) {
+ if ((r = buf_peek_array_dimension_count(buf, &tmp)) <= 0 ||
+ (tmp.dimension &&
+ (r = buf_peek_array_dimensions(buf, &tmp)) <= 0) ||
+ (r = buf_parse_array_data(buf, &tmp)) <= 0)
goto restore;
- }
- if ((r = buf_peek_array_dimensions(buf, &tmp)) <= 0) {
- goto restore;
- }
- if ((r = buf_parse_array_data(buf, &tmp)) < 0) {
- goto restore;
- }
result += r;
*dest = tmp;
r = result;
@@ -231,16 +227,28 @@ sw buf_parse_array_dimension_count (s_buf *buf, s_array *dest)
s_array tmp;
assert(buf);
assert(dest);
- tmp = *dest;
buf_save_init(buf, &save);
if ((r = buf_read_1(buf, "{")) <= 0)
goto clean;
result += r;
- tmp.dimension = 1;
if ((r = buf_ignore_spaces(buf)) < 0)
goto restore;
result += r;
- while ((r = buf_read_1(buf, "{")) > 0) {
+ if ((r = buf_read_1(buf, "}")) < 0)
+ goto restore;
+ if (r > 0) {
+ result += r;
+ dest->dimension = 0;
+ r = result;
+ goto clean;
+ }
+ tmp = *dest;
+ tmp.dimension = 1;
+ while (1) {
+ if ((r = buf_read_1(buf, "{")) < 0)
+ goto restore;
+ if (! r)
+ break;
result += r;
tmp.dimension++;
if ((r = buf_ignore_spaces(buf)) < 0)
diff --git a/libc3/env.c b/libc3/env.c
index 5f4db79..baa7edf 100644
--- a/libc3/env.c
+++ b/libc3/env.c
@@ -116,35 +116,37 @@ bool env_eval_array (s_env *env, const s_array *array, s_array *dest)
assert(array);
assert(dest);
array_init_copy(&tmp, array);
- item_size = tmp.dimensions[tmp.dimension - 1].item_size;
- if (! tmp.data && array->tags) {
- if (! sym_to_init_cast(tmp.type, &init_cast))
- return false;
- tmp.data = tmp.data_free = calloc(tmp.dimensions[0].count,
- tmp.dimensions[0].item_size);
- if (! tmp.data) {
- warn("env_eval_array: failed to allocate memory");
- assert(! "env_eval_array: failed to allocate memory");
- return false;
- }
- data = tmp.data;
- tag = tmp.tags;
- i = 0;
- while (i < tmp.count) {
- if (! env_eval_tag(env, tag, &tag_eval))
- goto ko;
- if (! init_cast(data, &tag_eval)) {
- err_write_1("env_eval_array: cannot cast ");
- err_inspect_tag(&tag_eval);
- err_write_1(" to ");
- err_inspect_sym(&tmp.type);
- err_puts(".");
- goto ko;
+ if (tmp.dimension) {
+ item_size = tmp.dimensions[tmp.dimension - 1].item_size;
+ if (! tmp.data && array->tags) {
+ if (! sym_to_init_cast(tmp.type, &init_cast))
+ return false;
+ tmp.data = tmp.data_free = calloc(tmp.dimensions[0].count,
+ tmp.dimensions[0].item_size);
+ if (! tmp.data) {
+ warn("env_eval_array: failed to allocate memory");
+ assert(! "env_eval_array: failed to allocate memory");
+ return false;
+ }
+ data = tmp.data;
+ tag = tmp.tags;
+ i = 0;
+ while (i < tmp.count) {
+ if (! env_eval_tag(env, tag, &tag_eval))
+ goto ko;
+ if (! init_cast(data, &tag_eval)) {
+ err_write_1("env_eval_array: cannot cast ");
+ err_inspect_tag(&tag_eval);
+ err_write_1(" to ");
+ err_inspect_sym(&tmp.type);
+ err_puts(".");
+ goto ko;
+ }
+ tag_clean(&tag_eval);
+ data += item_size;
+ tag++;
+ i++;
}
- tag_clean(&tag_eval);
- data += item_size;
- tag++;
- i++;
}
}
*dest = tmp;