summaryrefslogtreecommitdiff
path: root/src
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 /src
parent8e65011a4b11451b7fc2f5672ff5c804929cba3b (diff)
docgen: merge methods and properties in listing
Diffstat (limited to 'src')
-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)
808 f:write_editable(cln, "description") 808 f:write_editable(cln, "description")
809 f:write_nl() 809 f:write_nl()
810 810
811 local meths, props, methos, propos = {}, {}, {}, {} 811 local meths, methos = {}, {}
812 for i, impl in ipairs(cl:implements_get()) do 812 for i, impl in ipairs(cl:implements_get()) do
813 if impl:is_prop_get() or impl:is_prop_set() then 813 if impl:is_overridden(cl) then
814 if impl:is_overridden(cl) then 814 methos[#methos + 1] = impl
815 propos[#propos + 1] = impl
816 else
817 props[#props + 1] = impl
818 end
819 else 815 else
820 if impl:is_overridden(cl) then 816 meths[#meths + 1] = impl
821 methos[#methos + 1] = impl
822 else
823 meths[#meths + 1] = impl
824 end
825 end 817 end
826 end 818 end
827 819
828 build_functable(f, "Methods", cl, meths, false) 820 build_functable(f, "Members", cl, meths, false)
829 build_functable(f, "Properties", cl, props, false) 821 build_functable(f, "Overrides", cl, methos, true)
830 build_functable(f, "Overridden Methods", cl, methos, true)
831 build_functable(f, "Overridden Properties", cl, propos, true)
832 822
833 f:write_h("Events", 2) 823 f:write_h("Events", 2)
834 local evs = cl:events_get() 824 local evs = cl:events_get()