From 8f3ab649175049352e3bbd678efec57db6a8b68f Mon Sep 17 00:00:00 2001 From: sonoro1234 Date: Mon, 29 Jul 2019 12:42:50 +0200 Subject: [PATCH] Do with ImGuiStoragePair what was done with Pair (unnamed union correction) --- generator/generator.lua | 5 +++++ generator/output/structs_and_enums.json | 4 ++-- generator/output/structs_and_enums.lua | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/generator/generator.lua b/generator/generator.lua index 9f341fa..bd841e7 100644 --- a/generator/generator.lua +++ b/generator/generator.lua @@ -568,6 +568,11 @@ if structs_and_enums_table["structs"]["Pair"] then structs_and_enums_table["structs"]["Pair"][2]["name"] = "" structs_and_enums_table["structs"]["Pair"][2]["type"] = structs_and_enums_table["structs"]["Pair"][2]["type"] .. "}" end +-- 1.72 and after +if structs_and_enums_table["structs"]["ImGuiStoragePair"] then +structs_and_enums_table["structs"]["ImGuiStoragePair"][2]["name"] = "" +structs_and_enums_table["structs"]["ImGuiStoragePair"][2]["type"] = structs_and_enums_table["structs"]["ImGuiStoragePair"][2]["type"] .. "}" +end ----------------------- save_data("./output/structs_and_enums.lua",serializeTableF(structs_and_enums_table)) save_data("./output/typedefs_dict.lua",serializeTableF(parser1.typedefs_dict)) diff --git a/generator/output/structs_and_enums.json b/generator/output/structs_and_enums.json index 9d56bc4..1448258 100644 --- a/generator/output/structs_and_enums.json +++ b/generator/output/structs_and_enums.json @@ -2652,8 +2652,8 @@ "type": "ImGuiID" }, { - "name": "}", - "type": "union { int val_i; float val_f; void* val_p;" + "name": "", + "type": "union { int val_i; float val_f; void* val_p;}" } ], "ImGuiStyle": [ diff --git a/generator/output/structs_and_enums.lua b/generator/output/structs_and_enums.lua index ad4aac7..fec8d7b 100644 --- a/generator/output/structs_and_enums.lua +++ b/generator/output/structs_and_enums.lua @@ -2060,8 +2060,8 @@ defs["structs"]["ImGuiStoragePair"][1] = {} defs["structs"]["ImGuiStoragePair"][1]["name"] = "key" defs["structs"]["ImGuiStoragePair"][1]["type"] = "ImGuiID" defs["structs"]["ImGuiStoragePair"][2] = {} -defs["structs"]["ImGuiStoragePair"][2]["name"] = "}" -defs["structs"]["ImGuiStoragePair"][2]["type"] = "union { int val_i; float val_f; void* val_p;" +defs["structs"]["ImGuiStoragePair"][2]["name"] = "" +defs["structs"]["ImGuiStoragePair"][2]["type"] = "union { int val_i; float val_f; void* val_p;}" defs["structs"]["ImGuiStyle"] = {} defs["structs"]["ImGuiStyle"][1] = {} defs["structs"]["ImGuiStyle"][1]["name"] = "Alpha"