From 0b10f5f79523686a61ccd42deb0e008004565a82 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Sat, 14 Sep 2013 16:27:12 +0200
Subject: APIDump: Do not dump the g_APIDesc and APIDump's functions.

---
 MCServer/Plugins/APIDump/APIDesc.lua | 14 +++++++++++---
 MCServer/Plugins/APIDump/main.lua    |  3 ++-
 2 files changed, 13 insertions(+), 4 deletions(-)

(limited to 'MCServer/Plugins/APIDump')

diff --git a/MCServer/Plugins/APIDump/APIDesc.lua b/MCServer/Plugins/APIDump/APIDesc.lua
index 1ee9e9a8d..7e033f2af 100644
--- a/MCServer/Plugins/APIDump/APIDesc.lua
+++ b/MCServer/Plugins/APIDump/APIDesc.lua
@@ -1308,14 +1308,22 @@ A list of items regarding WebPlugins that have been documented
 	
 	IgnoreFunctions =
 	{
-		"globals.assert",
-		"globals.collectgarbage",
-		"globals.xpcall",
+		"Globals.assert",
+		"Globals.collectgarbage",
+		"Globals.xpcall",
 		"%a+\.__%a+",        -- AnyClass.__Anything
 		"%a+\.\.collector",  -- AnyClass..collector
 		"%a+\.new",          -- AnyClass.new
 		"%a+.new_local",     -- AnyClass.new_local
 		"%a+.delete",        -- AnyClass.delete
+		
+		-- Functions global in the APIDump plugin:
+		"Initialize",
+		"DumpAPITxt",
+		"CreateAPITables",
+		"DumpAPIHtml",
+		"ReadDescriptions",
+		"WriteHtmlClass",
 	},
 } ;
 
diff --git a/MCServer/Plugins/APIDump/main.lua b/MCServer/Plugins/APIDump/main.lua
index 0c9d683fb..35b99eb8b 100644
--- a/MCServer/Plugins/APIDump/main.lua
+++ b/MCServer/Plugins/APIDump/main.lua
@@ -140,7 +140,8 @@ function CreateAPITables()
 		if (
 			(v ~= _G) and           -- don't want the global namespace
 			(v ~= _G.packages) and  -- don't want any packages
-			(v ~= _G[".get"])
+			(v ~= _G[".get"]) and
+			(v ~= g_APIDesc)
 		) then
 			if (type(v) == "table") then
 				table.insert(API, ParseClass(i, v));
-- 
cgit v1.2.3