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

cpp2ffi: correct embeded_structs for untagged structs (ImNodes needs that)

Browse Source
This commit is contained in:
sonoro1234
2023-09-12 10:02:06 +02:00
parent 935ca882ec
commit 5140ea5c81
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
generator/cpp2ffi.lua
View File

@@ -1669,9 +1669,10 @@ function M.Parser()
end end
end end
if it.parent then --and (it.parent.re_name == "struct_re" or it.parent.re_name == "typedef_st_re" then if it.parent then --and (it.parent.re_name == "struct_re" or it.parent.re_name == "typedef_st_re" then
local embededst = (it.re_name == "struct_re" and it.item:match("struct%s+(%S+)")) local embededst = (it.re_name == "struct_re" and it.item:match("struct%s+([^%s{]+)"))
or (it.re_name == "typedef_st_re" and it.item:match("%b{}%s*(%S+)%s*;")) or (it.re_name == "typedef_st_re" and it.item:match("%b{}%s*(%S+)%s*;"))
--TODO nesting namespace and class --TODO nesting namespace and class
if embededst then --discards false which can happen with untagged structs
local parname = get_parents_name(it) local parname = get_parents_name(it)
if it.parent.re_name == "struct_re" then if it.parent.re_name == "struct_re" then
--needed by cimnodes with struct tag name equals member name --needed by cimnodes with struct tag name equals member name
@@ -1680,6 +1681,7 @@ function M.Parser()
self.embeded_structs[embededst] = parname..embededst self.embeded_structs[embededst] = parname..embededst
end end
end end
end
elseif it.re_name == "namespace_re" or it.re_name == "union_re" or it.re_name == "functype_re" then elseif it.re_name == "namespace_re" or it.re_name == "union_re" or it.re_name == "functype_re" then
--nop --nop
elseif it.re_name == "functionD_re" or it.re_name == "function_re" then elseif it.re_name == "functionD_re" or it.re_name == "function_re" then