summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2017-02-23 16:41:43 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2017-02-23 17:09:32 +0100
commit96c1c30db43fb2bfbd1899839c9960dc9623c6bc (patch)
tree782056985bbdd263fa98b233958d710ac116fd9e
parent8e65011a4b11451b7fc2f5672ff5c804929cba3b (diff)
downloadefl-96c1c30db43fb2bfbd1899839c9960dc9623c6bc.tar.gz
docgen: merge methods and properties in listing
-rw-r--r--src/scripts/elua/apps/gendoc.lua22
1 files changed, 6 insertions, 16 deletions
diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua
index cb7c1dfc4f..f86bf41718 100644
--- a/src/scripts/elua/apps/gendoc.lua
+++ b/src/scripts/elua/apps/gendoc.lua
@@ -808,27 +808,17 @@ local build_class = function(cl)
f:write_editable(cln, "description")
f:write_nl()
- local meths, props, methos, propos = {}, {}, {}, {}
+ local meths, methos = {}, {}
for i, impl in ipairs(cl:implements_get()) do
- if impl:is_prop_get() or impl:is_prop_set() then
- if impl:is_overridden(cl) then
- propos[#propos + 1] = impl
- else
- props[#props + 1] = impl
- end
+ if impl:is_overridden(cl) then
+ methos[#methos + 1] = impl
else
- if impl:is_overridden(cl) then
- methos[#methos + 1] = impl
- else
- meths[#meths + 1] = impl
- end
+ meths[#meths + 1] = impl
end
end
- build_functable(f, "Methods", cl, meths, false)
- build_functable(f, "Properties", cl, props, false)
- build_functable(f, "Overridden Methods", cl, methos, true)
- build_functable(f, "Overridden Properties", cl, propos, true)
+ build_functable(f, "Members", cl, meths, false)
+ build_functable(f, "Overrides", cl, methos, true)
f:write_h("Events", 2)
local evs = cl:events_get()