From 3f2813d6fffa98bc7b4b61164b6feca2e5b07d3c Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Sat, 19 Oct 2013 22:21:38 +0200
Subject: APIDump: Added member-variable filtering.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 5 +++++
 MCServer/Plugins/APIDump/main.lua    | 9 +++++++++
 2 files changed, 14 insertions(+)

(limited to 'MCServer')

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)
-- 
cgit v1.2.3