enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 1 Projects Releases Wiki Activity

docgen: merge overridden and other categories for methods/properties

This commit is contained in:
Daniel Kolesa 2017-02-24 15:47:25 +01:00
parent 2537cd2cf7
commit 3f92a51b9a
1 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/scripts/elua/apps/gendoc.lua
View File

@ -698,20 +698,19 @@ find_parent_briefdoc = function(fulln, cl)
return pdoc:brief_get(pdocf) return pdoc:brief_get(pdocf)
end end
local build_functable = function(f, title, cl, tbl) local build_functable = function(f, title, tcl, tbl, newm)
if #tbl == 0 then if #tbl == 0 then
return return
end end
f:write_h(title, 2) f:write_h(title, 2)
local nt = {} local nt = {}
local oclass = not cl for i, implt in ipairs(tbl) do
for i, impl in ipairs(tbl) do
local lbuf = writer.Buffer() local lbuf = writer.Buffer()
if oclass then local cl, impl = unpack(implt)
local impt = impl local ocl = impl:class_get()
cl, impl = impt[1], impt[2] if not newm then
lbuf:write_link(cl:nspaces_get(true), cl:full_name_get()) lbuf:write_link(ocl:nspaces_get(true), ocl:full_name_get())
lbuf:write_raw(".") lbuf:write_raw(".")
end end
@ -742,9 +741,13 @@ local build_functable = function(f, title, cl, tbl)
if over then if over then
lbuf:write_raw(" ") lbuf:write_raw(" ")
local llbuf = writer.Buffer() local llbuf = writer.Buffer()
local icl = impl:class_get() llbuf:write_raw("[Overridden")
llbuf:write_raw("[from ") if cl ~= tcl then
llbuf:write_link(icl:nspaces_get(true), icl:full_name_get()) llbuf:write_raw(" in ")
llbuf:write_link(cl:nspaces_get(true), cl:full_name_get())
else
llbuf:write_raw(" here")
end
llbuf:write_raw("]") llbuf:write_raw("]")
lbuf:write_i(llbuf:finish()) lbuf:write_i(llbuf:finish())
end end
@ -869,21 +872,20 @@ local build_class = function(cl)
local written = {} local written = {}
local ievs = {} local ievs = {}
local meths, methos, omeths = {}, {}, {} local meths, omeths = {}, {}
for i, impl in ipairs(cl:implements_get()) do for i, impl in ipairs(cl:implements_get()) do
local func = impl:function_get() local func = impl:function_get()
written[func:id_get()] = true written[func:id_get()] = true
if impl:is_overridden(cl) then if impl:is_overridden(cl) then
methos[#methos + 1] = impl omeths[#omeths + 1] = { cl, impl }
else else
meths[#meths + 1] = impl meths[#meths + 1] = { cl, impl }
end end
end end
find_callables(cl, omeths, ievs, written) find_callables(cl, omeths, ievs, written)
build_functable(f, "Members", cl, meths) build_functable(f, "Members", cl, meths, true)
build_functable(f, "Overrides", cl, methos) build_functable(f, "Inherited", cl, omeths, false)
build_functable(f, "Others", nil, omeths)
build_evtable(f, "Events", cl, cl:events_get()) build_evtable(f, "Events", cl, cl:events_get())
build_evtable(f, "Inherited Events", nil, ievs) build_evtable(f, "Inherited Events", nil, ievs)