From 7444967ece64540f3854e7967f1c6f2d9fdd6837 Mon Sep 17 00:00:00 2001
From: nakst <>
Date: Sun, 13 Feb 2022 21:00:19 +0000
Subject: [PATCH] header generator: fix bitsets in odin 3
---
util/header_generator.c | 37 ++++++++++++++++++-------------------
1 file changed, 18 insertions(+), 19 deletions(-)
diff --git a/util/header_generator.c b/util/header_generator.c
index a9a5441..0632c18 100644
--- a/util/header_generator.c
+++ b/util/header_generator.c
@@ -922,6 +922,7 @@ void OutputOdinFunction(Entry *entry, Entry *root) {
// FilePrintFormat(stderr, "initial value: %s\n", variable->variable.initialValue);
const char *initialValue = TrimPrefix(variable->variable.initialValue);
+ bool needLeadingDot = false;
if (0 == strcmp(initialValue, "NULL")) {
initialValue = "nil";
@@ -929,29 +930,27 @@ void OutputOdinFunction(Entry *entry, Entry *root) {
initialValue = "\"\"";
} else if (0 == strcmp(initialValue, "FLAGS_DEFAULT")) {
initialValue = "{}";
- }
+ } else {
+ for (int i = 0; i < arrlen(root->children); i++) {
+ Entry *entry = root->children + i;
- bool needLeadingDot = false;
-
- for (int i = 0; i < arrlen(root->children); i++) {
- Entry *entry = root->children + i;
-
- if (entry->type == ENTRY_ENUM && 0 == strcmp(variable->variable.type, entry->name)) {
- needLeadingDot = true;
- break;
- }
- }
-
- for (int i = 0; i < arrlen(root->children); i++) {
- Entry *entry = root->children + i;
-
- if (entry->type == ENTRY_BITSET && 0 == strcmp(variable->variable.type, entry->name)) {
- if (0 == memcmp(initialValue, entry->bitset.definePrefix + 3, strlen(entry->bitset.definePrefix) - 3)) {
+ if (entry->type == ENTRY_ENUM && 0 == strcmp(variable->variable.type, entry->name)) {
needLeadingDot = true;
- initialValue += strlen(entry->bitset.definePrefix) - 3;
+ break;
}
+ }
- break;
+ for (int i = 0; i < arrlen(root->children); i++) {
+ Entry *entry = root->children + i;
+
+ if (entry->type == ENTRY_BITSET && 0 == strcmp(variable->variable.type, entry->name)) {
+ if (0 == memcmp(initialValue, entry->bitset.definePrefix + 3, strlen(entry->bitset.definePrefix) - 3)) {
+ needLeadingDot = true;
+ initialValue += strlen(entry->bitset.definePrefix) - 3;
+ }
+
+ break;
+ }
}
}