From 8207fd9cc588fb02d7636b60fd1853dd434e088e Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Fri, 20 Jan 2017 15:15:50 +0100 Subject: [PATCH] docs: remove some duplicate doctree methods --- src/scripts/elua/apps/docgen/doctree.lua | 12 ------------ src/scripts/elua/apps/gendoc.lua | 11 ++++++++--- 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 80d23b9..ad3b9f6 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 { return nil end, - is_pure_virtual = function(self, ft) - return self.func:implement_get():is_pure_virtual(ft) - end, - - is_auto = function(self, ft) - return self.func:implement_get():is_auto(ft) - end, - - is_empty = function(self, ft) - return self.func:implement_get():is_empty(ft) - end, - is_legacy_only = function(self, ft) return self.func:is_legacy_only(ft) end, diff --git a/src/scripts/elua/apps/gendoc.lua b/src/scripts/elua/apps/gendoc.lua index f878442..ef3800d 100644 --- a/src/scripts/elua/apps/gendoc.lua +++ b/src/scripts/elua/apps/gendoc.lua @@ -173,7 +173,10 @@ end local gen_method_sig = function(fn, cl) local buf = {} gen_func_namesig(fn, cl, buf, false, false, false) - if fn:is_pure_virtual(fn.METHOD) then + + local pimp = fn:implement_get() + + if pimp:is_pure_virtual(fn.METHOD) then buf[#buf + 1] = "@pure_virtual " end buf[#buf + 1] = "{" @@ -227,8 +230,10 @@ local gen_prop_sig = function(fn, cl) local isset = (fnt == fn.PROPERTY or fnt == fn.PROP_SET) gen_func_namesig(fn, cl, buf, true, isget, isset) - local gvirt = fn:is_pure_virtual(fn.PROP_GET) - local svirt = fn:is_pure_virtual(fn.PROP_SET) + local pimp = fn:implement_get() + + local gvirt = pimp:is_pure_virtual(fn.PROP_GET) + local svirt = pimp:is_pure_virtual(fn.PROP_SET) if (not isget or gvirt) and (not isset or svirt) then buf[#buf + 1] = "@pure_virtual " -- 2.7.4