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

generator: cpp2ffi rule out template typename (ex. T) so avoid correction in generator.lua

Browse Source
This commit is contained in:
Victor Bombi
2020-09-04 15:44:40 +02:00
parent f635eb28c5
commit 670965cbe5
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
generator/cpp2ffi.lua
View File

@@ -444,7 +444,10 @@ local function parseFunction(self,stname,lineorig,namespace,locat)
--skip operator --skip operator
if line:match("operator") then return end if line:match("operator") then return end
--skip template --skip template
if line:match("template") then return end if line:match("template") then
--print("template",lineorig)
return
end
local ret = line:match("([^%(%):,]+[%*%s])%s?~?[_%w]+%b()") local ret = line:match("([^%(%):,]+[%*%s])%s?~?[_%w]+%b()")
--local funcname, args = line:match("(~?[_%w]+)%s*(%b())") --local funcname, args = line:match("(~?[_%w]+)%s*(%b())")
@@ -475,7 +478,9 @@ local function parseFunction(self,stname,lineorig,namespace,locat)
--print("ttype,template",ttype,template) --print("ttype,template",ttype,template)
local te="" local te=""
if template then if template then
--print("--",stname,self.typenames[stname] , ttype,template)
if self.typenames[stname] ~= template then --rule out template typename if self.typenames[stname] ~= template then --rule out template typename
--print("--in")
te = template:gsub("%s","_") te = template:gsub("%s","_")
te = te:gsub("%*","Ptr") te = te:gsub("%*","Ptr")
@@ -985,13 +990,14 @@ function M.Parser()
--local ttype,template = it.item:match("([^%s,%(%)]+)%s*<(.+)>") --local ttype,template = it.item:match("([^%s,%(%)]+)%s*<(.+)>")
local ttype,template = it.item:match"([^%s,%(%)]+)%s*<(.+)>" local ttype,template = it.item:match"([^%s,%(%)]+)%s*<(.+)>"
if template then if template then
--if template=="T" then print("T found in---------");print(stru) end if self.typenames[ttype] ~= template then --rule out T (template typename)
local te = template:gsub("%s","_") local te = template:gsub("%s","_")
te = te:gsub("%*","Ptr") te = te:gsub("%*","Ptr")
self.templates[ttype] = self.templates[ttype] or {} self.templates[ttype] = self.templates[ttype] or {}
self.templates[ttype][template] = te self.templates[ttype][template] = te
it2 = it2:gsub("(<[%w_%*%s]+>)([^%s])","%1 %2") --add if not present space after <> it2 = it2:gsub("(<[%w_%*%s]+>)([^%s])","%1 %2") --add if not present space after <>
it2 = it2:gsub("<([%w_%*%s]+)>","_"..te) it2 = it2:gsub("<([%w_%*%s]+)>","_"..te)
end
end end
--clean mutable --clean mutable
it2 = it2:gsub("mutable","") it2 = it2:gsub("mutable","")
@@ -1656,10 +1662,17 @@ local function func_header_generate(FP)
end end
for ttype,v in pairs(FP.templates) do for ttype,v in pairs(FP.templates) do
--output sorted
local sorted = {}
for ttypein,_ in pairs(v) do for ttypein,_ in pairs(v) do
table.insert(sorted,ttypein)
end
table.sort(sorted)
--for ttypein,_ in pairs(v) do
for ii,ttypein in ipairs(sorted) do
local te = ttypein:gsub("%s","_") local te = ttypein:gsub("%s","_")
te = te:gsub("%*","Ptr") te = te:gsub("%*","Ptr")
table.insert(outtab,"typedef "..ttype.."<"..ttypein.."> "..ttype.."_"..te..";\n") table.insert(outtab,"typedef "..ttype.."<"..ttypein.."> "..ttype.."_"..te..";\n")
end end
end end

1
generator/generator.lua
View File

@@ -227,7 +227,6 @@ local function cimgui_generation(parser)
local hstrfile = read_data"./cimgui_template.h" local hstrfile = read_data"./cimgui_template.h"
local outpre,outpost = parser.structs_and_enums[1],parser.structs_and_enums[2] local outpre,outpost = parser.structs_and_enums[1],parser.structs_and_enums[2]
parser.templates.ImVector.T = nil
cpp2ffi.prtable(parser.templates) cpp2ffi.prtable(parser.templates)
cpp2ffi.prtable(parser.typenames) cpp2ffi.prtable(parser.typenames)