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

cpp2ffi: linenumdict allows several repeated items

Browse Source
This commit is contained in:
Victor Bombi
2020-09-25 17:47:42 +02:00
parent c64cef9b8c
commit 2bb45e2d77
1 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
generator/cpp2ffi.lua
View File

@@ -297,7 +297,7 @@ local function isLeaf(re)
end end
M.getRE = getRE M.getRE = getRE
--takes preprocesed file in table cdefsor and returns items --takes preprocesed file in table cdefsor and returns items
local function parseItems(txt,linenumdict,dumpit) local function parseItems(txt,linenumdict, itparent, dumpit)
--assert(loca) --assert(loca)
--dumpit = true --dumpit = true
local res,resN = getRE() local res,resN = getRE()
@@ -354,6 +354,16 @@ local function parseItems(txt,linenumdict,dumpit)
if linenumdict then if linenumdict then
local itemfirstline = itemold:match("[^\n]+") local itemfirstline = itemold:match("[^\n]+")
loca = linenumdict[itemfirstline] loca = linenumdict[itemfirstline]
if type(loca)=="table" then
--local prevloca = itemarr[#itemarr] and itemarr[#itemarr].locat
--print("loca is table for",itemfirstline)
--print("prevloca is",prevloca)
--print("parent loca is",itparent and itparent.locat)
-- for ii,ss in ipairs(loca) do
-- print(ii,ss)
-- end
loca = table.remove(loca,1)
end
if not loca then if not loca then
print(itemold) print(itemold)
error"no entry in linenumdict" error"no entry in linenumdict"
@@ -990,12 +1000,12 @@ function M.Parser()
end end
end end
--recursive item parsing --recursive item parsing
function par:parseItemsR2(txt) function par:parseItemsR2(txt, itparent)
local itsarr,its = parseItems(txt,self.linenumdict) local itsarr,its = parseItems(txt,self.linenumdict,itparent)
for i,it in ipairs(itsarr) do for i,it in ipairs(itsarr) do
if not isLeaf(it.re_name) then if not isLeaf(it.re_name) then
local inner = strip_end(it.item:match("%b{}"):sub(2,-2)) local inner = strip_end(it.item:match("%b{}"):sub(2,-2))
it.childs = par:parseItemsR2(inner) it.childs = par:parseItemsR2(inner, it)
for j,child in ipairs(it.childs) do for j,child in ipairs(it.childs) do
child.parent = it child.parent = it
end end
@@ -1020,7 +1030,16 @@ function M.Parser()
self.linenumdict = {} self.linenumdict = {}
local cdefs2 = {} local cdefs2 = {}
for i,cdef in ipairs(cdefs) do for i,cdef in ipairs(cdefs) do
self.linenumdict[cdef[1]]=cdef[2] if self.linenumdict[cdef[1]] then
--print("linenumdict alredy defined for", cdef[1],type(self.linenumdict[cdef[1]]))
if type(self.linenumdict[cdef[1]])=="string" then
self.linenumdict[cdef[1]] = {self.linenumdict[cdef[1]], cdef[2]}
else -- must be table already
table.insert(self.linenumdict[cdef[1]],cdef[2])
end
else
self.linenumdict[cdef[1]]=cdef[2]
end
table.insert(cdefs2,cdef[1]) table.insert(cdefs2,cdef[1])
end end
local txt = table.concat(cdefs2,"\n") local txt = table.concat(cdefs2,"\n")