kennethnym/cimgui
1
0
Fork 0
mirror of https://github.com/cimgui/cimgui.git synced 2025-08-11 12:18:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

correct issue #88 (Pair union member)

Browse Source
This commit is contained in:
sonoro1234
2019-02-15 12:24:06 +01:00
parent e125f405e3
commit d331453422
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
generator/generator2.lua
View File

@@ -446,7 +446,7 @@ end
local function cimgui_generation(parser) local function cimgui_generation(parser)
cpp2ffi.prtable(parser.templates) cpp2ffi.prtable(parser.templates)
cpp2ffi.prtable(parser.typenames) cpp2ffi.prtable(parser.typenames)
--clean ImVector:contains() for not applicable types -- clean ImVector:contains() for not applicable types
local clean_f = {} local clean_f = {}
for k,v in pairs(parser.defsT) do for k,v in pairs(parser.defsT) do
if k:match"ImVector" and k:match"contains" then if k:match"ImVector" and k:match"contains" then
@@ -463,6 +463,7 @@ local function cimgui_generation(parser)
end end
end end
end end
-------------------------------------------------- --------------------------------------------------
local hstrfile = read_data"./cimgui_template.h" local hstrfile = read_data"./cimgui_template.h"
@@ -556,6 +557,10 @@ save_data("./output/definitions.lua",serializeTableF(parser1.defsT))
----------save struct and enums lua table in structs_and_enums.lua for using in bindings ----------save struct and enums lua table in structs_and_enums.lua for using in bindings
local structs_and_enums_table = parser1:gen_structs_and_enums_table() local structs_and_enums_table = parser1:gen_structs_and_enums_table()
--correct Pair union member
structs_and_enums_table["structs"]["Pair"][2]["name"] = ""
structs_and_enums_table["structs"]["Pair"][2]["type"] = structs_and_enums_table["structs"]["Pair"][2]["type"] .. "}"
-----------------------
save_data("./output/structs_and_enums.lua",serializeTableF(structs_and_enums_table)) save_data("./output/structs_and_enums.lua",serializeTableF(structs_and_enums_table))
save_data("./output/typedefs_dict.lua",serializeTableF(parser1.typedefs_dict)) save_data("./output/typedefs_dict.lua",serializeTableF(parser1.typedefs_dict))

4
generator/output/structs_and_enums.json
View File

@@ -2745,8 +2745,8 @@
"type": "ImGuiID" "type": "ImGuiID"
}, },
{ {
"name": "}", "name": "",
"type": "union { int val_i; float val_f; void* val_p;" "type": "union { int val_i; float val_f; void* val_p;}"
} }
], ],
"TextRange": [ "TextRange": [

4
generator/output/structs_and_enums.lua
View File

@@ -2125,8 +2125,8 @@ defs["structs"]["Pair"][1] = {}
defs["structs"]["Pair"][1]["name"] = "key" defs["structs"]["Pair"][1]["name"] = "key"
defs["structs"]["Pair"][1]["type"] = "ImGuiID" defs["structs"]["Pair"][1]["type"] = "ImGuiID"
defs["structs"]["Pair"][2] = {} defs["structs"]["Pair"][2] = {}
defs["structs"]["Pair"][2]["name"] = "}" defs["structs"]["Pair"][2]["name"] = ""
defs["structs"]["Pair"][2]["type"] = "union { int val_i; float val_f; void* val_p;" defs["structs"]["Pair"][2]["type"] = "union { int val_i; float val_f; void* val_p;}"
defs["structs"]["TextRange"] = {} defs["structs"]["TextRange"] = {}
defs["structs"]["TextRange"][1] = {} defs["structs"]["TextRange"][1] = {}
defs["structs"]["TextRange"][1]["name"] = "b" defs["structs"]["TextRange"][1]["name"] = "b"