summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2017-01-20 15:15:50 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2017-01-20 15:15:50 +0100
commit8207fd9cc588fb02d7636b60fd1853dd434e088e (patch)
tree5407c82fdb7e314cb2c0e410e9566d2d218ec469
parentab7b6815e0f069ca2c44213618dae139684fc1e5 (diff)
docs: remove some duplicate doctree methods
-rw-r--r--src/scripts/elua/apps/docgen/doctree.lua12
-rw-r--r--src/scripts/elua/apps/gendoc.lua11
2 files changed, 8 insertions, 15 deletions
diff --git a/src/scripts/elua/apps/docgen/doctree.lua b/src/scripts/elua/apps/docgen/doctree.lua
index 80d23b9206..ad3b9f65db 100644
--- a/src/scripts/elua/apps/docgen/doctree.lua
+++ b/src/scripts/elua/apps/docgen/doctree.lua
@@ -334,18 +334,6 @@ M.Function = Node:clone {
334 return nil 334 return nil
335 end, 335 end,
336 336
337 is_pure_virtual = function(self, ft)
338 return self.func:implement_get():is_pure_virtual(ft)
339 end,
340
341 is_auto = function(self, ft)
342 return self.func:implement_get():is_auto(ft)
343 end,
344
345 is_empty = function(self, ft)
346 return self.func:implement_get():is_empty(ft)
347 end,
348
349 is_legacy_only = function(self, ft) 337 is_legacy_only = function(self, ft)
350 return self.func:is_legacy_only(ft) 338 return self.func:is_legacy_only(ft)
351 end, 339 end,
diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua
index f878442eab..ef3800db09 100644
--- a/src/scripts/elua/apps/gendoc.lua
+++ b/src/scripts/elua/apps/gendoc.lua
@@ -173,7 +173,10 @@ end
173local gen_method_sig = function(fn, cl) 173local gen_method_sig = function(fn, cl)
174 local buf = {} 174 local buf = {}
175 gen_func_namesig(fn, cl, buf, false, false, false) 175 gen_func_namesig(fn, cl, buf, false, false, false)
176 if fn:is_pure_virtual(fn.METHOD) then 176
177 local pimp = fn:implement_get()
178
179 if pimp:is_pure_virtual(fn.METHOD) then
177 buf[#buf + 1] = "@pure_virtual " 180 buf[#buf + 1] = "@pure_virtual "
178 end 181 end
179 buf[#buf + 1] = "{" 182 buf[#buf + 1] = "{"
@@ -227,8 +230,10 @@ local gen_prop_sig = function(fn, cl)
227 local isset = (fnt == fn.PROPERTY or fnt == fn.PROP_SET) 230 local isset = (fnt == fn.PROPERTY or fnt == fn.PROP_SET)
228 gen_func_namesig(fn, cl, buf, true, isget, isset) 231 gen_func_namesig(fn, cl, buf, true, isget, isset)
229 232
230 local gvirt = fn:is_pure_virtual(fn.PROP_GET) 233 local pimp = fn:implement_get()
231 local svirt = fn:is_pure_virtual(fn.PROP_SET) 234
235 local gvirt = pimp:is_pure_virtual(fn.PROP_GET)
236 local svirt = pimp:is_pure_virtual(fn.PROP_SET)
232 237
233 if (not isget or gvirt) and (not isset or svirt) then 238 if (not isget or gvirt) and (not isset or svirt) then
234 buf[#buf + 1] = "@pure_virtual " 239 buf[#buf + 1] = "@pure_virtual "