Lucas/bt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use an anonymous union in struct bcode

Browse Source
This commit is contained in:
Lucas 2025-01-28 18:18:08 +00:00
parent 7d77ac987d
commit 64dcb3a584
1 changed files with 28 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
bcode.c
View File

@ -58,11 +58,11 @@ struct bcode_dictionary {
struct bcode { struct bcode {
enum bcode_type type; enum bcode_type type;
union { union {
struct bcode_string s; struct bcode_string string;
int64_t i; int64_t integer;
struct bcode_list l; struct bcode_list list;
struct bcode_dictionary d; struct bcode_dictionary dictionary;
} value; };
}; };
/* /*
@ -361,26 +361,25 @@ parse_internal(struct bcode *bcode, const uint8_t *dp, size_t sz)
switch (*dp) { switch (*dp) {
case 'i': case 'i':
n = parse_integer(&bcode->value.i, dp, sz); n = parse_integer(&bcode->integer, dp, sz);
if (n > 0) if (n > 0)
bcode->type = BCODE_INTEGER; bcode->type = BCODE_INTEGER;
break; break;
case 'l': case 'l':
n = parse_list(&bcode->value.l, dp, sz); n = parse_list(&bcode->list, dp, sz);
if (n > 0) if (n > 0)
bcode->type = BCODE_LIST; bcode->type = BCODE_LIST;
break; break;
case 'd': case 'd':
n = parse_dictionary(&bcode->value.d, dp, sz); n = parse_dictionary(&bcode->dictionary, dp, sz);
if (n > 0) { if (n > 0) {
struct bcode_dictionary d = bcode->value.d; qsort(bcode->dictionary.elems, bcode->dictionary.sz,
sizeof(*bcode->dictionary.elems), &kv_cmp);
qsort(d.elems, d.sz, sizeof(*d.elems), &kv_cmp);
bcode->type = BCODE_DICTIONARY; bcode->type = BCODE_DICTIONARY;
} }
break; break;
default: default:
n = parse_string(&bcode->value.s, dp, sz); n = parse_string(&bcode->string, dp, sz);
if (n > 0) if (n > 0)
bcode->type = BCODE_STRING; bcode->type = BCODE_STRING;
break; break;
@ -416,21 +415,21 @@ free_internal(struct bcode *bcode)
switch (bcode->type) { switch (bcode->type) {
case BCODE_STRING: case BCODE_STRING:
free(bcode->value.s.data); free(bcode->string.data);
break; break;
case BCODE_INTEGER: case BCODE_INTEGER:
break; break;
case BCODE_LIST: case BCODE_LIST:
for (i = 0; i < bcode->value.l.sz; i++) for (i = 0; i < bcode->list.sz; i++)
free_internal(&bcode->value.l.elems[i]); free_internal(&bcode->list.elems[i]);
free(bcode->value.l.elems); free(bcode->list.elems);
break; break;
case BCODE_DICTIONARY: case BCODE_DICTIONARY:
for (i = 0; i < bcode->value.d.sz; i++) { for (i = 0; i < bcode->dictionary.sz; i++) {
free(bcode->value.d.elems[i].k.data); free(bcode->dictionary.elems[i].k.data);
free_internal(&bcode->value.d.elems[i].v); free_internal(&bcode->dictionary.elems[i].v);
} }
free(bcode->value.d.elems); free(bcode->dictionary.elems);
break; break;
default: default:
/* Do nothing. */ /* Do nothing. */
@ -472,20 +471,18 @@ print_internal(const struct bcode *bcode, FILE *fp, size_t lvl)
switch (bcode->type) { switch (bcode->type) {
case BCODE_STRING: case BCODE_STRING:
print_string(&bcode->value.s, fp); print_string(&bcode->string, fp);
break; break;
case BCODE_INTEGER: case BCODE_INTEGER:
fprintf(fp, "%" PRIi64, bcode->value.i); fprintf(fp, "%" PRIi64, bcode->integer);
break; break;
case BCODE_LIST: { case BCODE_LIST:
struct bcode_list l = bcode->value.l;
fputs("[\n", fp); fputs("[\n", fp);
lvl++; lvl++;
for (i = 0; i < l.sz; i++) { for (i = 0; i < bcode->list.sz; i++) {
for (k = 0; k < lvl; k++) for (k = 0; k < lvl; k++)
fputs(" ", fp); fputs(" ", fp);
print_internal(&l.elems[i], fp, lvl); print_internal(&bcode->list.elems[i], fp, lvl);
fputs(",\n", fp); fputs(",\n", fp);
} }
lvl--; lvl--;
@ -494,18 +491,15 @@ print_internal(const struct bcode *bcode, FILE *fp, size_t lvl)
fputc(']', fp); fputc(']', fp);
break; break;
} case BCODE_DICTIONARY:
case BCODE_DICTIONARY: {
struct bcode_dictionary d = bcode->value.d;
fputs("{\n", fp); fputs("{\n", fp);
lvl++; lvl++;
for (i = 0; i < d.sz; i++) { for (i = 0; i < bcode->dictionary.sz; i++) {
for (k = 0; k < lvl; k++) for (k = 0; k < lvl; k++)
fputs(" ", fp); fputs(" ", fp);
print_string(&d.elems[i].k, fp); print_string(&bcode->dictionary.elems[i].k, fp);
fputs(": ", fp); fputs(": ", fp);
print_internal(&d.elems[i].v, fp, lvl); print_internal(&bcode->dictionary.elems[i].v, fp, lvl);
fputs(",\n", fp); fputs(",\n", fp);
} }
lvl--; lvl--;
@ -514,7 +508,6 @@ print_internal(const struct bcode *bcode, FILE *fp, size_t lvl)
fputc('}', fp); fputc('}', fp);
break; break;
}
default: default:
/* Do nothing. */ /* Do nothing. */
break; break;