summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormadmaxoft <github@xoft.cz>2013-10-19 22:21:38 +0200
committermadmaxoft <github@xoft.cz>2013-10-19 22:21:38 +0200
commit3f2813d6fffa98bc7b4b61164b6feca2e5b07d3c (patch)
treece849fa9dfde899ef8c98690074f2d269aa8ee61
parentAPIDump: Member variables are read from the API. (diff)
downloadcuberite-3f2813d6fffa98bc7b4b61164b6feca2e5b07d3c.tar
cuberite-3f2813d6fffa98bc7b4b61164b6feca2e5b07d3c.tar.gz
cuberite-3f2813d6fffa98bc7b4b61164b6feca2e5b07d3c.tar.bz2
cuberite-3f2813d6fffa98bc7b4b61164b6feca2e5b07d3c.tar.lz
cuberite-3f2813d6fffa98bc7b4b61164b6feca2e5b07d3c.tar.xz
cuberite-3f2813d6fffa98bc7b4b61164b6feca2e5b07d3c.tar.zst
cuberite-3f2813d6fffa98bc7b4b61164b6feca2e5b07d3c.zip
-rw-r--r--MCServer/Plugins/APIDump/APIDesc.lua5
-rw-r--r--MCServer/Plugins/APIDump/main.lua9
2 files changed, 14 insertions, 0 deletions
diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index a57a7a342..1c8edfb3f 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -3610,6 +3610,11 @@ end
"WriteHtmlHook",
},
+ IgnoreVariables =
+ {
+ "__.*__", -- tolua exports multiple inheritance this way
+ } ,
+
ExtraPages =
{
-- No sorting is provided for these, they will be output in the same order as defined here
diff --git a/MCServer/Plugins/APIDump/main.lua b/MCServer/Plugins/APIDump/main.lua
index 74ae94b15..abc0f9293 100644
--- a/MCServer/Plugins/APIDump/main.lua
+++ b/MCServer/Plugins/APIDump/main.lua
@@ -555,6 +555,15 @@ function ReadDescriptions(a_API)
end
);
+ -- Remove ignored functions:
+ local NewVariables = {};
+ for j, var in ipairs(cls.Variables) do
+ if (not(IsVariableIgnored(cls.Name .. "." .. var.Name))) then
+ table.insert(NewVariables, var);
+ end
+ end -- for j, var
+ cls.Variables = NewVariables;
+
-- Sort the member variables:
table.sort(cls.Variables,
function(v1, v2)