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

typedef_st_re addition

Browse Source
This commit is contained in:
Victor Bombi
2020-04-14 10:02:39 +02:00
parent c0c050ce1e
commit 400b7d76dd
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
generator/cpp2ffi.lua
View File

@@ -256,6 +256,7 @@ local function getRE()
namespace_re = "^([^;{}]-namespace[^;{}]-%b{})", namespace_re = "^([^;{}]-namespace[^;{}]-%b{})",
class_re = "^([^;{}]-class[^;{}]-%b{}%s*;)", class_re = "^([^;{}]-class[^;{}]-%b{}%s*;)",
typedef_re = "^\n*(typedef[^;]+;)", typedef_re = "^\n*(typedef[^;]+;)",
typedef_st_re = "^\n*(typedef%s+struct%s*%b{}.+;)",
functypedef_re = "^\n*%s*(typedef[%w%s%*_]+%(%s*%*%s*[%w_]+%s*%)%s*%b()%s*;)", functypedef_re = "^\n*%s*(typedef[%w%s%*_]+%(%s*%*%s*[%w_]+%s*%)%s*%b()%s*;)",
functypedef_re = "^\n*%s*(typedef[%w%s%*_]+%([^*]*%*%s*[%w_]+%s*%)%s*%b()%s*;)", functypedef_re = "^\n*%s*(typedef[%w%s%*_]+%([^*]*%*%s*[%w_]+%s*%)%s*%b()%s*;)",
--vardef_re = "^\n*([^;{}%(%)]+;)", --vardef_re = "^\n*([^;{}%(%)]+;)",
@@ -267,7 +268,7 @@ local function getRE()
functype_re = "^%s*[%w%s%*]+%(%*[%w_]+%)%([^%(%)]*%)%s*;" functype_re = "^%s*[%w%s%*]+%(%*[%w_]+%)%([^%(%)]*%)%s*;"
} }
local resN = {"functypedef_re","functype_re","function_re","functionD_re","struct_re","enum_re","union_re","namespace_re","class_re","typedef_re","vardef_re"} local resN = {"functypedef_re","functype_re","function_re","functionD_re","typedef_st_re","struct_re","enum_re","union_re","namespace_re","class_re","typedef_re","vardef_re"}
return res,resN return res,resN
end end
@@ -298,7 +299,7 @@ local function parseItems(txt,dumpit)
ini = e + 1 ini = e + 1
if dumpit then if dumpit then
print(item) print(item)
print(ire,"------------------------------------------------------") print(ire,re_name,"------------------------------------------------------")
end end
break break
end end
@@ -944,7 +945,7 @@ function M.Parser()
local namespace = it.item:match("namespace%s+(%S+)") local namespace = it.item:match("namespace%s+(%S+)")
local nspparr,itemsnsp = parseItems(nsp) local nspparr,itemsnsp = parseItems(nsp)
for insp,itnsp in ipairs(nspparr) do for insp,itnsp in ipairs(nspparr) do
if itnsp.re_name == "struct_re" then --or itnsp.re_name == "functionD_re" then if itnsp.re_name == "struct_re" or itnsp.re_name == "typedef_st_re" then
--print("in mamespace",itnsp.item,namespace) --print("in mamespace",itnsp.item,namespace)
table.insert(outtab,itnsp.item) table.insert(outtab,itnsp.item)
end end