Merge create_lua_library from mcclure branch: inheritInModule as argument, memory/mingw patches, 2D array support, comments and variable name improvements for clarity, segregate __ptr_lookup by class.

Bindings/Scripts/create_lua_library/create_lua_library.py

@@ -5,7 +5,7 @@ import errno
 import re
 from zipfile import *
 import fnmatch
-  
+
 def mkdir_p(path): # Same effect as mkdir -p, create dir and all necessary parent dirs
 	try:
 		os.makedirs(path)
@@ -14,148 +14,169 @@ def mkdir_p(path): # Same effect as mkdir -p, create dir and all necessary paren
 			pass
 		else: raise
 
-def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, apiPath, apiClassPath, includePath, sourcePath):
-	out = ""
-	sout = ""
+def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, apiPath, apiClassPath, includePath, sourcePath, inheritInModuleFiles):
+	wrappersHeaderOut = "" # Def: Global C++ *LUAWrappers.h
+	cppRegisterOut = "" # Def: Global C++ *LUA.cpp
 	
-	lfout = ""
+	luaIndexOut = "" # Def: Global Lua everything-gets-required-from-this-file file
 	
-	sout += "#include \"%sLUA.h\"\n" % (prefix)
-	sout += "#include \"%sLUAWrappers.h\"\n" % (prefix)
-	sout += "#include \"PolyCoreServices.h\"\n\n"
-	sout += "using namespace Polycode;\n\n"
-	sout += "int luaopen_%s(lua_State *L) {\n" % (prefix)
+	# Header boilerplate for wrappersHeaderOut and cppRegisterOut
+	cppRegisterOut += "#include \"%sLUA.h\"\n" % (prefix)
+	cppRegisterOut += "#include \"%sLUAWrappers.h\"\n" % (prefix)
+	cppRegisterOut += "#include \"PolyCoreServices.h\"\n\n"
+	cppRegisterOut += "using namespace Polycode;\n\n"
+	cppRegisterOut += "int luaopen_%s(lua_State *L) {\n" % (prefix)
 	if prefix != "Polycode":
-		sout += "CoreServices *inst = (CoreServices*)lua_topointer(L, 1);\n"
-		sout += "CoreServices::setInstance(inst);\n"
-	sout += "\tstatic const struct luaL_reg %sLib [] = {" % (libSmallName)
+		cppRegisterOut += "CoreServices *inst = (CoreServices*)lua_topointer(L, 1);\n"
+		cppRegisterOut += "CoreServices::setInstance(inst);\n"
+	cppRegisterOut += "\tstatic const struct luaL_reg %sLib [] = {" % (libSmallName)
 	
-	out += "#pragma once\n\n"
+	wrappersHeaderOut += "#pragma once\n\n"
 
-	out += "extern \"C\" {\n\n"
-	out += "#include <stdio.h>\n"
-	out += "#include \"lua.h\"\n"
-	out += "#include \"lualib.h\"\n"
-	out += "#include \"lauxlib.h\"\n"
-	out += "} // extern \"C\" \n\n"
+	wrappersHeaderOut += "extern \"C\" {\n\n"
+	wrappersHeaderOut += "#include <stdio.h>\n"
+	wrappersHeaderOut += "#include \"lua.h\"\n"
+	wrappersHeaderOut += "#include \"lualib.h\"\n"
+	wrappersHeaderOut += "#include \"lauxlib.h\"\n"
+	wrappersHeaderOut += "} // extern \"C\" \n\n"
 
+	# Get list of headers to create bindings from
 	files = os.listdir(inputPath)
 	filteredFiles = []
 	for fileName in files:
-		ignore = ["PolyGLSLProgram", "PolyGLSLShader", "PolyGLSLShaderModule", "PolyWinCore", "PolyCocoaCore", "PolyAGLCore", "PolySDLCore", "Poly_iPhone", "PolyGLES1Renderer", "PolyGLRenderer", "tinyxml", "tinystr", "OpenGLCubemap", "PolyiPhoneCore", "PolyGLES1Texture", "PolyGLTexture", "PolyGLVertexBuffer", "PolyThreaded"]
+		ignore = ["PolyGLSLProgram", "PolyGLSLShader", "PolyGLSLShaderModule", "PolyWinCore", "PolyCocoaCore", "PolyAGLCore", "PolySDLCore", "Poly_iPhone", "PolyGLES1Renderer", "PolyGLRenderer", "tinyxml", "tinystr", "OpenGLCubemap", "PolyiPhoneCore", "PolyGLES1Texture", "PolyGLTexture", "PolyGLVertexBuffer", "PolyThreaded", "PolyGLHeaders", "GLee"]
 		if fileName.split(".")[1] == "h" and fileName.split(".")[0] not in ignore:
 			filteredFiles.append(fileName)
-			out += "#include \"%s\"\n" % (fileName)
+			wrappersHeaderOut += "#include \"%s\"\n" % (fileName)
 
-	out += "\nusing namespace std;\n\n"
-	out += "\nnamespace Polycode {\n\n"
+	wrappersHeaderOut += "\nusing namespace std;\n\n"
+	wrappersHeaderOut += "\nnamespace Polycode {\n\n"
 	
+	# Special case: If we are building the Polycode library itself, inject the LuaEventHandler class
 	if prefix == "Polycode":
-		out += "class LuaEventHandler : public EventHandler {\n"
-		out += "public:\n"
-		out += "	LuaEventHandler() : EventHandler() {}\n"
-		out += "	~LuaEventHandler();\n"
-		out += "	void handleEvent(Event *e) {\n"
-		out += "		lua_rawgeti( L, LUA_REGISTRYINDEX, wrapperIndex );\n"
-		out += "		lua_getfield(L, -1, \"__handleEvent\");\n"
-		out += "		lua_rawgeti( L, LUA_REGISTRYINDEX, wrapperIndex );\n"
-		out += "		lua_pushlightuserdata(L, e);\n"
-		out += "		lua_call(L, 2, 0);\n"
-		out += "	}\n"
-		out += "	int wrapperIndex;\n"
-		out += "	lua_State *L;\n"
-		out += "};\n\n"
+		wrappersHeaderOut += "class LuaEventHandler : public EventHandler {\n"
+		wrappersHeaderOut += "public:\n"
+		wrappersHeaderOut += "	LuaEventHandler() : EventHandler() {}\n"
+		wrappersHeaderOut += "	void handleEvent(Event *e) {\n"
+		wrappersHeaderOut += "		lua_rawgeti( L, LUA_REGISTRYINDEX, wrapperIndex );\n"
+		wrappersHeaderOut += "		lua_getfield(L, -1, \"__handleEvent\");\n"
+		wrappersHeaderOut += "		lua_rawgeti( L, LUA_REGISTRYINDEX, wrapperIndex );\n"
+		wrappersHeaderOut += "		lua_pushlightuserdata(L, e);\n"
+		wrappersHeaderOut += "		lua_call(L, 2, 0);\n"
+		wrappersHeaderOut += "	}\n"
+		wrappersHeaderOut += "	int wrapperIndex;\n"
+		wrappersHeaderOut += "	lua_State *L;\n"
+		wrappersHeaderOut += "};\n\n"
 	
+	# Iterate, process each input file
 	for fileName in filteredFiles:
+		# "Package owned" classes that ship with Polycode
 		inheritInModule = ["PhysicsSceneEntity", "CollisionScene", "CollisionSceneEntity"]
-		headerFile = "%s/%s" % (inputPath, fileName)
+		
+		# A file or comma-separated list of files can be given to specify classes which are "package owned"
+		# and should not be inherited out of Polycode/. The files should contain one class name per line,
+		# and the class name may be prefixed with a path (which will be ignored).
+		if inheritInModuleFiles:
+			for filename in inheritInModuleFiles.split(","):
+				with open(filename) as f:
+					for line in f.readlines():
+						inheritInModule.append(line.strip().split("/",1)[-1]) # Strip whitespace, path/
+					
+		headerFile = "%s/%s" % (inputPath, fileName) # Def: Full path to input file
 		print "Parsing %s" % fileName
-		try:
-			f = open(headerFile)
-			contents = f.read().replace("_PolyExport", "")
-			cppHeader = CppHeaderParser.CppHeader(contents, "string")
-			ignore_classes = ["PolycodeShaderModule", "Object", "Threaded", "OpenGLCubemap"]
-
-			for ckey in cppHeader.classes:
+		try: # One input file parse.
+			f = open(headerFile) # Def: Input file handle
+			contents = f.read().replace("_PolyExport", "") # Def: Input file contents, strip out "_PolyExport"
+			cppHeader = CppHeaderParser.CppHeader(contents, "string") # Def: Input file contents, parsed structure
+			ignore_classes = ["PolycodeShaderModule", "Object", "Threaded", "OpenGLCubemap", "ParticleEmitter"]
+
+			# Iterate, check each class in this file.
+			for ckey in cppHeader.classes: 
 				print ">> Parsing class %s" % ckey
-				c = cppHeader.classes[ckey]
-	#			if ckey == "ParticleEmitter":
-	#				print c
-				lout = ""
+				c = cppHeader.classes[ckey] # Def: The class structure
+
+				luaClassBindingOut = "" # Def: The local lua file to generate for this class.
 				inherits = False
-				if len(c["inherits"]) > 0:
+				if len(c["inherits"]) > 0: # Does this class have parents?
 					if c["inherits"][0]["class"] not in ignore_classes:
-						if c["inherits"][0]["class"] in inheritInModule:
-							lout += "require \"%s/%s\"\n\n" % (prefix, c["inherits"][0]["class"])
-						else:
-							lout += "require \"Polycode/%s\"\n\n" % (c["inherits"][0]["class"])
-						lout += "class \"%s\" (%s)\n\n" % (ckey, c["inherits"][0]["class"])
+						if c["inherits"][0]["class"] in inheritInModule: # Parent class is in this module
+							luaClassBindingOut += "require \"%s/%s\"\n\n" % (prefix, c["inherits"][0]["class"])
+						else: # Parent class is in Polycore
+							luaClassBindingOut += "require \"Polycode/%s\"\n\n" % (c["inherits"][0]["class"])
+						luaClassBindingOut += "class \"%s\" (%s)\n\n" % (ckey, c["inherits"][0]["class"])
 						inherits = True
-				if inherits == False:
-					lout += "class \"%s\"\n\n" % ckey
+				if inherits == False: # Class does not have parents
+					luaClassBindingOut += "class \"%s\"\n\n" % ckey
 
-				if len(c["methods"]["public"]) < 2 or ckey in ignore_classes:
+				if ckey in ignore_classes:
 					continue
 
-				if ckey == "OSFileEntry":
-					print c["methods"]["public"]
-				parsed_methods = []
+				if len(c["methods"]["public"]) < 2: # Used to, this was a continue.
+					print("Warning: Lua-binding class with less than two methods")
+					continue # FIXME: Remove this, move any non-compileable classes into ignore_classes
+
+				parsed_methods = [] # Def: List of discovered methods
 				ignore_methods = ["readByte32", "readByte16", "getCustomEntitiesByType", "Core", "Renderer", "Shader", "Texture", "handleEvent", "secondaryHandler", "getSTLString"]
-				lout += "\n\n"
+				luaClassBindingOut += "\n\n"
 
-				pps = []
+				classProperties = [] # Def: List of found property structures ("properties" meaning "data members")
 				for pp in c["properties"]["public"]:
 					pp["type"] = pp["type"].replace("Polycode::", "")
 					pp["type"] = pp["type"].replace("std::", "")
-					if pp["type"].find("static ") != -1:
-						if "defaltValue" in pp:
-							lout += "%s = %s\n" % (pp["name"], pp["defaltValue"])
-					else:
+					if pp["type"].find("static ") != -1: # If static. FIXME: Static doesn't work?
+						if "defaltValue" in pp: # FIXME: defaltValue is misspelled.
+							luaClassBindingOut += "%s = %s\n" % (pp["name"], pp["defaltValue"])
+					else: # FIXME: Nonstatic method ? variable ?? found.
 						#there are some bugs in the class parser that cause it to return junk
-						if pp["type"].find("*") == -1 and pp["type"].find("vector") == -1 and pp["name"] != "16" and pp["name"] != "setScale" and pp["name"] != "setPosition" and pp["name"] != "BUFFER_CACHE_PRECISION":
-							pps.append(pp)
-						#if pp["type"] == "Number" or  pp["type"] == "String" or pp["type"] == "int" or pp["type"] == "bool":
-						#	pps.append(pp)
-						#else:
-						#	print(">>> Skipping %s[%s %s]" % (ckey, pp["type"], pp["name"]))
-
-				pidx = 0
-
-				# hack to fix the lack of multiple inheritance
-				#if ckey == "ScreenParticleEmitter" or ckey == "SceneParticleEmitter":
-				#		pps.append({"name": "emitter", "type": "ParticleEmitter"})
-
-				if len(pps) > 0:
-					lout += "function %s:__index__(name)\n" % ckey
-					for pp in pps:
+						if pp["type"].find("*") == -1 and pp["type"].find("vector") == -1 and pp["name"] != "setScale" and pp["name"] != "setPosition" and pp["name"] != "BUFFER_CACHE_PRECISION" and not pp["name"].isdigit():
+							classProperties.append(pp)
+
+				# Iterate over properties, creating getters
+				pidx = 0 # Def: Count of properties processed so far
+
+				# TODO: Remove or generalize ParticleEmitter special casing. These lines are marked with #SPEC
+
+				if len(classProperties) > 0: # If there are properties, add index lookup to the metatable
+					luaClassBindingOut += "function %s:__index__(name)\n" % ckey
+					# Iterate over property structures, creating if/else clauses for each.
+					# TODO: Could a table be more appropriate for 
+					for pp in classProperties:
 						pp["type"] = pp["type"].replace("Polycode::", "")
 						pp["type"] = pp["type"].replace("std::", "")
 						if pidx == 0:
-							lout += "\tif name == \"%s\" then\n" % (pp["name"])
+							luaClassBindingOut += "\tif name == \"%s\" then\n" % (pp["name"])
 						else:
-							lout += "\telseif name == \"%s\" then\n" % (pp["name"])
+							luaClassBindingOut += "\telseif name == \"%s\" then\n" % (pp["name"])
+
+						# Generate Lua side of binding:
 
+						# If type is a primitive such as Number/String/int/bool
 						if pp["type"] == "Number" or  pp["type"] == "String" or pp["type"] == "int" or pp["type"] == "bool":
-							lout += "\t\treturn %s.%s_get_%s(self.__ptr)\n" % (libName, ckey, pp["name"])
+							luaClassBindingOut += "\t\treturn %s.%s_get_%s(self.__ptr)\n" % (libName, ckey, pp["name"])
+							
+						# If type is a particle emitter, specifically #SPEC
 						elif (ckey == "ScreenParticleEmitter" or ckey == "SceneParticleEmitter") and pp["name"] == "emitter":
-							lout += "\t\tlocal ret = %s(\"__skip_ptr__\")\n" % (pp["type"])
-							lout += "\t\tret.__ptr = self.__ptr\n"
-							lout += "\t\treturn ret\n"
+							luaClassBindingOut += "\t\tlocal ret = %s(\"__skip_ptr__\")\n" % (pp["type"])
+							luaClassBindingOut += "\t\tret.__ptr = self.__ptr\n"
+							luaClassBindingOut += "\t\treturn ret\n"
+							
+						# If type is a class
 						else:
-							lout += "\t\tretVal = %s.%s_get_%s(self.__ptr)\n" % (libName, ckey, pp["name"])
-							lout += "\t\tif Polycore.__ptr_lookup[retVal] ~= nil then\n"
-							lout += "\t\t\treturn Polycore.__ptr_lookup[retVal]\n"
-							lout += "\t\telse\n"
-							lout += "\t\t\tPolycore.__ptr_lookup[retVal] = %s(\"__skip_ptr__\")\n" % (pp["type"])
-							lout += "\t\t\tPolycore.__ptr_lookup[retVal].__ptr = retVal\n"
-							lout += "\t\t\treturn Polycore.__ptr_lookup[retVal]\n"
-							lout += "\t\tend\n"
-
-						if not ((ckey == "ScreenParticleEmitter" or ckey == "SceneParticleEmitter") and pp["name"] == "emitter"):
-							sout += "\t\t{\"%s_get_%s\", %s_%s_get_%s},\n" % (ckey, pp["name"], libName, ckey, pp["name"])
-							out += "static int %s_%s_get_%s(lua_State *L) {\n" % (libName, ckey, pp["name"])
-							out += "\tluaL_checktype(L, 1, LUA_TLIGHTUSERDATA);\n"
-							out += "\t%s *inst = (%s*)lua_topointer(L, 1);\n" % (ckey, ckey)
+							luaClassBindingOut += "\t\tretVal = %s.%s_get_%s(self.__ptr)\n" % (libName, ckey, pp["name"])
+							luaClassBindingOut += "\t\tif __ptr_lookup.%s[retVal] ~= nil then\n" % (ckey)
+							luaClassBindingOut += "\t\t\treturn __ptr_lookup.%s[retVal]\n" % (ckey)
+							luaClassBindingOut += "\t\telse\n"
+							luaClassBindingOut += "\t\t\t__ptr_lookup.%s[retVal] = %s(\"__skip_ptr__\")\n" % (ckey, pp["type"])
+							luaClassBindingOut += "\t\t\t__ptr_lookup.%s[retVal].__ptr = retVal\n" % (ckey)
+							luaClassBindingOut += "\t\t\treturn __ptr_lookup.%s[retVal]\n" % (ckey)
+							luaClassBindingOut += "\t\tend\n"
+
+						# Generate C++ side of binding:
+						if not ((ckey == "ScreenParticleEmitter" or ckey == "SceneParticleEmitter") and pp["name"] == "emitter"): #SPEC
+							cppRegisterOut += "\t\t{\"%s_get_%s\", %s_%s_get_%s},\n" % (ckey, pp["name"], libName, ckey, pp["name"])
+							wrappersHeaderOut += "static int %s_%s_get_%s(lua_State *L) {\n" % (libName, ckey, pp["name"])
+							wrappersHeaderOut += "\tluaL_checktype(L, 1, LUA_TLIGHTUSERDATA);\n"
+							wrappersHeaderOut += "\t%s *inst = (%s*)lua_topointer(L, 1);\n" % (ckey, ckey)
 
 							outfunc = "lua_pushlightuserdata"
 							retFunc = ""
@@ -170,35 +191,41 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 								outfunc = "lua_pushboolean"
 
 							if pp["type"] == "Number" or  pp["type"] == "String" or pp["type"] == "int" or pp["type"] == "bool":
-								out += "\t%s(L, inst->%s%s);\n" % (outfunc, pp["name"], retFunc)
+								wrappersHeaderOut += "\t%s(L, inst->%s%s);\n" % (outfunc, pp["name"], retFunc)
 							else:
-								out += "\t%s(L, &inst->%s%s);\n" % (outfunc, pp["name"], retFunc)
-							out += "\treturn 1;\n"
-							out += "}\n\n"
+								wrappersHeaderOut += "\t%s(L, &inst->%s%s);\n" % (outfunc, pp["name"], retFunc)
+							wrappersHeaderOut += "\treturn 1;\n"
+							wrappersHeaderOut += "}\n\n"
+						
+						# Success
 						pidx = pidx + 1
 
-					lout += "\tend\n"
-					lout += "end\n"
+					luaClassBindingOut += "\tend\n"
+					luaClassBindingOut += "end\n"
 
-				lout += "\n\n"
-				pidx = 0
-				if len(pps) > 0:
-					lout += "function %s:__set_callback(name,value)\n" % ckey
-					for pp in pps:
+				luaClassBindingOut += "\n\n"
+				
+				# Iterate over properties again, creating setters
+				pidx = 0 # Def: Count of 
+				if len(classProperties) > 0: # If there are properties, add index setter to the metatable
+					luaClassBindingOut += "function %s:__set_callback(name,value)\n" % ckey
+					for pp in classProperties:
 						pp["type"] = pp["type"].replace("Polycode::", "")
 						pp["type"] = pp["type"].replace("std::", "")
+						
+						# If type is a primitive: Create lua and C++ sides at the same time.
 						if pp["type"] == "Number" or  pp["type"] == "String" or pp["type"] == "int" or pp["type"] == "bool":
 							if pidx == 0:
-								lout += "\tif name == \"%s\" then\n" % (pp["name"])
+								luaClassBindingOut += "\tif name == \"%s\" then\n" % (pp["name"])
 							else:
-								lout += "\telseif name == \"%s\" then\n" % (pp["name"])
-							lout += "\t\t%s.%s_set_%s(self.__ptr, value)\n" % (libName, ckey, pp["name"])
-							lout += "\t\treturn true\n"
+								luaClassBindingOut += "\telseif name == \"%s\" then\n" % (pp["name"])
+							luaClassBindingOut += "\t\t%s.%s_set_%s(self.__ptr, value)\n" % (libName, ckey, pp["name"])
+							luaClassBindingOut += "\t\treturn true\n"
 
-							sout += "\t\t{\"%s_set_%s\", %s_%s_set_%s},\n" % (ckey, pp["name"], libName, ckey, pp["name"])
-							out += "static int %s_%s_set_%s(lua_State *L) {\n" % (libName, ckey, pp["name"])
-							out += "\tluaL_checktype(L, 1, LUA_TLIGHTUSERDATA);\n"
-							out += "\t%s *inst = (%s*)lua_topointer(L, 1);\n" % (ckey, ckey)
+							cppRegisterOut += "\t\t{\"%s_set_%s\", %s_%s_set_%s},\n" % (ckey, pp["name"], libName, ckey, pp["name"])
+							wrappersHeaderOut += "static int %s_%s_set_%s(lua_State *L) {\n" % (libName, ckey, pp["name"])
+							wrappersHeaderOut += "\tluaL_checktype(L, 1, LUA_TLIGHTUSERDATA);\n"
+							wrappersHeaderOut += "\t%s *inst = (%s*)lua_topointer(L, 1);\n" % (ckey, ckey)
 
 							outfunc = "lua_topointer"
 							if pp["type"] == "Number":
@@ -210,298 +237,325 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 							if pp["type"] == "bool":
 								outfunc = "lua_toboolean"
 
-							out += "\t%s param = %s(L, 2);\n" % (pp["type"], outfunc)
-							out += "\tinst->%s = param;\n" % (pp["name"])
+							wrappersHeaderOut += "\t%s param = %s(L, 2);\n" % (pp["type"], outfunc)
+							wrappersHeaderOut += "\tinst->%s = param;\n" % (pp["name"])
 
-							out += "\treturn 0;\n"
-							out += "}\n\n"
-							pidx = pidx + 1
+							wrappersHeaderOut += "\treturn 0;\n"
+							wrappersHeaderOut += "}\n\n"
+							pidx = pidx + 1 # Success
+							
+						# Notice: Setters for object types are not created.
 					if pidx != 0:
-						lout += "\tend\n"
-					lout += "\treturn false\n"
-					lout += "end\n"
+						luaClassBindingOut += "\tend\n"
+					luaClassBindingOut += "\treturn false\n"
+					luaClassBindingOut += "end\n"
 
-
-				lout += "\n\n"
+				# Iterate over methods
+				luaClassBindingOut += "\n\n"
 				for pm in c["methods"]["public"]:
+					# Skip argument-overloaded methods and operators.
+					# TODO: Instead of skipping arguemnt overloads, have special behavior.
+					# TODO: Instead of skipping operators, add to metatable.
 					if pm["name"] in parsed_methods or pm["name"].find("operator") > -1 or pm["name"] in ignore_methods:
 						continue
 
+					# Skip destructors and methods which return templates.
+					# TODO: Special-case certain kind of vector<>s?
 					if pm["name"] == "~"+ckey or pm["rtnType"].find("<") > -1:
-						out += ""
-					else:
-						basicType = False
-						voidRet = False
-						if pm["name"] == ckey:
-							sout += "\t\t{\"%s\", %s_%s},\n" % (ckey, libName, ckey)
-							out += "static int %s_%s(lua_State *L) {\n" % (libName, ckey)
-							idx = 1
-						else:
-							sout += "\t\t{\"%s_%s\", %s_%s_%s},\n" % (ckey, pm["name"], libName, ckey, pm["name"])
-							out += "static int %s_%s_%s(lua_State *L) {\n" % (libName, ckey, pm["name"])
-
-							if pm["rtnType"].find("static ") == -1:
-								out += "\tluaL_checktype(L, 1, LUA_TLIGHTUSERDATA);\n"
-								out += "\t%s *inst = (%s*)lua_topointer(L, 1);\n" % (ckey, ckey)
-							idx = 2
-						paramlist = []
-						lparamlist = []
-						for param in pm["parameters"]:
-							if not param.has_key("type"):
-								continue
-							if param["type"] == "0":
-								continue
-							param["type"] = param["type"].replace("Polycode::", "")
-							param["type"] = param["type"].replace("std::", "")
-							param["type"] = param["type"].replace("const", "")
-							param["type"] = param["type"].replace("&", "")
-							param["type"] = param["type"].replace(" ", "")
-							param["type"] = param["type"].replace("long", "long ")
-							param["type"] = param["type"].replace("unsigned", "unsigned ")
-
-							param["name"] = param["name"].replace("end", "_end").replace("repeat", "_repeat")
-							if"type" in param:
-								luatype = "LUA_TLIGHTUSERDATA"
-								checkfunc = "lua_islightuserdata"
-								if param["type"].find("*") > -1:
-									luafunc = "(%s)lua_topointer" % (param["type"].replace("Polygon", "Polycode::Polygon").replace("Rectangle", "Polycode::Rectangle"))
-								elif param["type"].find("&") > -1:
-									luafunc = "*(%s*)lua_topointer" % (param["type"].replace("const", "").replace("&", "").replace("Polygon", "Polycode::Polygon").replace("Rectangle", "Polycode::Rectangle"))
-								else:
-									luafunc = "*(%s*)lua_topointer" % (param["type"].replace("Polygon", "Polycode::Polygon").replace("Rectangle", "Polycode::Rectangle"))
-								lend = ".__ptr"
-								if param["type"] == "int" or param["type"] == "unsigned int":
-									luafunc = "lua_tointeger"
-									luatype = "LUA_TNUMBER"
-									checkfunc = "lua_isnumber"
-									lend = ""
-								if param["type"] == "bool":
-									luafunc = "lua_toboolean"
-									luatype = "LUA_TBOOLEAN"
-									checkfunc = "lua_isboolean"
-									lend = ""
-								if param["type"] == "Number" or param["type"] == "float" or param["type"] == "double":
-									luatype = "LUA_TNUMBER"
-									luafunc = "lua_tonumber"
-									checkfunc = "lua_isnumber"
-									lend = ""
-								if param["type"] == "String":
-									luatype = "LUA_TSTRING"
-									luafunc = "lua_tostring"
-									checkfunc = "lua_isstring"
-									lend = ""
-
-								param["type"] = param["type"].replace("Polygon", "Polycode::Polygon").replace("Rectangle", "Polycode::Rectangle")
-
-								if "defaltValue" in param:
-									if checkfunc != "lua_islightuserdata" or (checkfunc == "lua_islightuserdata" and param["defaltValue"] == "NULL"):
-										#param["defaltValue"] = param["defaltValue"].replace(" 0f", ".0f")
-										param["defaltValue"] = param["defaltValue"].replace(": :", "::")
-										#param["defaltValue"] = param["defaltValue"].replace("0 ", "0.")
-										param["defaltValue"] = re.sub(r'([0-9]+) ([0-9])+', r'\1.\2', param["defaltValue"])
-
-										out += "\t%s %s;\n" % (param["type"], param["name"])
-										out += "\tif(%s(L, %d)) {\n" % (checkfunc, idx)
-										out += "\t\t%s = %s(L, %d);\n" % (param["name"], luafunc, idx)
-										out += "\t} else {\n"
-										out += "\t\t%s = %s;\n" % (param["name"], param["defaltValue"])
-										out += "\t}\n"
-									else:
-										out += "\tluaL_checktype(L, %d, %s);\n" % (idx, luatype);
-										if param["type"] == "String":
-											out += "\t%s %s = String(%s(L, %d));\n" % (param["type"], param["name"], luafunc, idx)
-										else:
-											out += "\t%s %s = %s(L, %d);\n" % (param["type"], param["name"], luafunc, idx)
+						continue
+					
+					basicType = False
+					voidRet = False
+
+					# Basic setup, C++ side: Add function to registry and start building wrapper function.
+					if pm["name"] == ckey: # It's a constructor
+						cppRegisterOut += "\t\t{\"%s\", %s_%s},\n" % (ckey, libName, ckey)
+						wrappersHeaderOut += "static int %s_%s(lua_State *L) {\n" % (libName, ckey)
+						idx = 1 # Def: Current stack depth (TODO: Figure out, is this correct?)
+					else: # It's not a constructor
+						cppRegisterOut += "\t\t{\"%s_%s\", %s_%s_%s},\n" % (ckey, pm["name"], libName, ckey, pm["name"])
+						wrappersHeaderOut += "static int %s_%s_%s(lua_State *L) {\n" % (libName, ckey, pm["name"])
+
+						# Skip static methods (TODO: Figure out, why is this being done here?). # FIXME
+						if pm["rtnType"].find("static ") == -1:
+							wrappersHeaderOut += "\tluaL_checktype(L, 1, LUA_TLIGHTUSERDATA);\n"
+							wrappersHeaderOut += "\t%s *inst = (%s*)lua_topointer(L, 1);\n" % (ckey, ckey)
+						idx = 2
+					
+					# Generate C++ side parameter pushing
+					paramlist = []
+					lparamlist = []
+					for param in pm["parameters"]:
+						if not param.has_key("type"):
+							continue
+						if param["type"] == "0":
+							continue
+						param["type"] = param["type"].replace("Polycode::", "")
+						param["type"] = param["type"].replace("std::", "")
+						param["type"] = param["type"].replace("const", "")
+						param["type"] = param["type"].replace("&", "")
+						param["type"] = param["type"].replace(" ", "")
+						param["type"] = param["type"].replace("long", "long ")
+						param["type"] = param["type"].replace("unsigned", "unsigned ")
+
+						param["name"] = param["name"].replace("end", "_end").replace("repeat", "_repeat")
+						if"type" in param:
+							luatype = "LUA_TLIGHTUSERDATA"
+							checkfunc = "lua_islightuserdata"
+							if param["type"].find("*") > -1:
+								luafunc = "(%s)lua_topointer" % (param["type"].replace("Polygon", "Polycode::Polygon").replace("Rectangle", "Polycode::Rectangle"))
+							elif param["type"].find("&") > -1:
+								luafunc = "*(%s*)lua_topointer" % (param["type"].replace("const", "").replace("&", "").replace("Polygon", "Polycode::Polygon").replace("Rectangle", "Polycode::Rectangle"))
+							else:
+								luafunc = "*(%s*)lua_topointer" % (param["type"].replace("Polygon", "Polycode::Polygon").replace("Rectangle", "Polycode::Rectangle"))
+							lend = ".__ptr"
+							if param["type"] == "int" or param["type"] == "unsigned int":
+								luafunc = "lua_tointeger"
+								luatype = "LUA_TNUMBER"
+								checkfunc = "lua_isnumber"
+								lend = ""
+							if param["type"] == "bool":
+								luafunc = "lua_toboolean"
+								luatype = "LUA_TBOOLEAN"
+								checkfunc = "lua_isboolean"
+								lend = ""
+							if param["type"] == "Number" or param["type"] == "float" or param["type"] == "double":
+								luatype = "LUA_TNUMBER"
+								luafunc = "lua_tonumber"
+								checkfunc = "lua_isnumber"
+								lend = ""
+							if param["type"] == "String":
+								luatype = "LUA_TSTRING"
+								luafunc = "lua_tostring"
+								checkfunc = "lua_isstring"
+								lend = ""
+
+							param["type"] = param["type"].replace("Polygon", "Polycode::Polygon").replace("Rectangle", "Polycode::Rectangle")
+
+							if "defaltValue" in param:
+								if checkfunc != "lua_islightuserdata" or (checkfunc == "lua_islightuserdata" and param["defaltValue"] == "NULL"):
+									#param["defaltValue"] = param["defaltValue"].replace(" 0f", ".0f")
+									param["defaltValue"] = param["defaltValue"].replace(": :", "::")
+									#param["defaltValue"] = param["defaltValue"].replace("0 ", "0.")
+									param["defaltValue"] = re.sub(r'([0-9]+) ([0-9])+', r'\1.\2', param["defaltValue"])
+
+									wrappersHeaderOut += "\t%s %s;\n" % (param["type"], param["name"])
+									wrappersHeaderOut += "\tif(%s(L, %d)) {\n" % (checkfunc, idx)
+									wrappersHeaderOut += "\t\t%s = %s(L, %d);\n" % (param["name"], luafunc, idx)
+									wrappersHeaderOut += "\t} else {\n"
+									wrappersHeaderOut += "\t\t%s = %s;\n" % (param["name"], param["defaltValue"])
+									wrappersHeaderOut += "\t}\n"
 								else:
-									out += "\tluaL_checktype(L, %d, %s);\n" % (idx, luatype);
+									wrappersHeaderOut += "\tluaL_checktype(L, %d, %s);\n" % (idx, luatype);
 									if param["type"] == "String":
-										out += "\t%s %s = String(%s(L, %d));\n" % (param["type"], param["name"], luafunc, idx)
+										wrappersHeaderOut += "\t%s %s = String(%s(L, %d));\n" % (param["type"], param["name"], luafunc, idx)
 									else:
-										out += "\t%s %s = %s(L, %d);\n" % (param["type"], param["name"], luafunc, idx)
-								paramlist.append(param["name"])
-
-								lparamlist.append(param["name"]+lend)
-								idx = idx +1
-
-						if pm["name"] == ckey:
-							if ckey == "EventHandler":
-								out += "\tLuaEventHandler *inst = new LuaEventHandler();\n"
-								out += "\tinst->wrapperIndex = luaL_ref(L, LUA_REGISTRYINDEX );\n"
-								out += "\tinst->L = L;\n"
+										wrappersHeaderOut += "\t%s %s = %s(L, %d);\n" % (param["type"], param["name"], luafunc, idx)
 							else:
-								out += "\t%s *inst = new %s(%s);\n" % (ckey, ckey, ", ".join(paramlist))
-							out += "\tlua_pushlightuserdata(L, (void*)inst);\n"
-							out += "\treturn 1;\n"
+								wrappersHeaderOut += "\tluaL_checktype(L, %d, %s);\n" % (idx, luatype);
+								if param["type"] == "String":
+									wrappersHeaderOut += "\t%s %s = String(%s(L, %d));\n" % (param["type"], param["name"], luafunc, idx)
+								else:
+									wrappersHeaderOut += "\t%s %s = %s(L, %d);\n" % (param["type"], param["name"], luafunc, idx)
+							paramlist.append(param["name"])
+
+							lparamlist.append(param["name"]+lend)
+							idx = idx +1 # Param parse success-- mark the increased stack
+
+					# Generate C++-side method call / generate return value
+					if pm["name"] == ckey: # If constructor
+						if ckey == "EventHandler": # Special case EventHandler base class (TODO: Figure out why)
+							wrappersHeaderOut += "\tLuaEventHandler *inst = new LuaEventHandler();\n"
+							wrappersHeaderOut += "\tinst->wrapperIndex = luaL_ref(L, LUA_REGISTRYINDEX );\n"
+							wrappersHeaderOut += "\tinst->L = L;\n"
 						else:
-							if pm["rtnType"].find("static ") == -1:
-								call = "inst->%s(%s)" % (pm["name"], ", ".join(paramlist))
-							else:
-								call = "%s::%s(%s)" % (ckey, pm["name"], ", ".join(paramlist))
-							if pm["rtnType"] == "void" or pm["rtnType"] == "static void" or pm["rtnType"] == "virtual void" or pm["rtnType"] == "inline void":
-								out += "\t%s;\n" % (call)
+							wrappersHeaderOut += "\t%s *inst = new %s(%s);\n" % (ckey, ckey, ", ".join(paramlist))
+						wrappersHeaderOut += "\tlua_pushlightuserdata(L, (void*)inst);\n"
+						wrappersHeaderOut += "\treturn 1;\n"
+					else: #If non-constructor
+						if pm["rtnType"].find("static ") == -1: # If non-static
+							call = "inst->%s(%s)" % (pm["name"], ", ".join(paramlist))
+						else: # If static (FIXME: Why doesn't this work?)
+							call = "%s::%s(%s)" % (ckey, pm["name"], ", ".join(paramlist))
+						
+						# If void-typed:
+						if pm["rtnType"] == "void" or pm["rtnType"] == "static void" or pm["rtnType"] == "virtual void" or pm["rtnType"] == "inline void":
+							wrappersHeaderOut += "\t%s;\n" % (call)
+							basicType = True
+							voidRet = True
+							wrappersHeaderOut += "\treturn 0;\n" # 0 arguments returned
+						else: # If there is a return value:
+							# What type is the return value? Default to pointer
+							outfunc = "lua_pushlightuserdata"
+							retFunc = ""
+							basicType = False
+							if pm["rtnType"] == "Number" or  pm["rtnType"] == "inline Number":
+								outfunc = "lua_pushnumber"
 								basicType = True
-								voidRet = True
-								out += "\treturn 0;\n"
-							else:
-								outfunc = "lua_pushlightuserdata"
-								retFunc = ""
-								basicType = False
-								if pm["rtnType"] == "Number" or  pm["rtnType"] == "inline Number":
-									outfunc = "lua_pushnumber"
-									basicType = True
-								if pm["rtnType"] == "String" or pm["rtnType"] == "static String":
-									outfunc = "lua_pushstring"
-									basicType = True
-									retFunc = ".c_str()"
-								if pm["rtnType"] == "int" or pm["rtnType"] == "static int" or  pm["rtnType"] == "size_t" or pm["rtnType"] == "static size_t" or pm["rtnType"] == "long" or pm["rtnType"] == "unsigned int" or pm["rtnType"] == "static long":
-									outfunc = "lua_pushinteger"
-									basicType = True
-								if pm["rtnType"] == "bool" or pm["rtnType"] == "static bool" or pm["rtnType"] == "virtual bool":
-									outfunc = "lua_pushboolean"
-									basicType = True
-
-								if pm["rtnType"].find("*") > -1:
-									out += "\tvoid *ptrRetVal = (void*)%s%s;\n" % (call, retFunc)
-									out += "\tif(ptrRetVal == NULL) {\n"
-									out += "\t\tlua_pushnil(L);\n"
-									out += "\t} else {\n"
-									out += "\t\t%s(L, ptrRetVal);\n" % (outfunc)
-									out += "\t}\n"
-								elif basicType == True:
-									out += "\t%s(L, %s%s);\n" % (outfunc, call, retFunc)
-								else:
-									className = pm["rtnType"].replace("const", "").replace("&", "").replace("inline", "").replace("virtual", "").replace("static", "")
-									if className == "Polygon":
-										className = "Polycode::Polygon"
-									if className == "Rectangle":
-										className = "Polycode::Rectangle"
-									out += "\t%s *retInst = new %s();\n" % (className, className)
-									out += "\t*retInst = %s;\n" % (call)
-									out += "\t%s(L, retInst);\n" % (outfunc)
-								out += "\treturn 1;\n"
-						out += "}\n\n"
-
-						if pm["name"] == ckey:
-							lout += "function %s:%s(...)\n" % (ckey, ckey)
-							if inherits:
-								lout += "\tif type(arg[1]) == \"table\" and count(arg) == 1 then\n"
-								lout += "\t\tif \"\"..arg[1]:class() == \"%s\" then\n" % (c["inherits"][0]["class"])
-								lout += "\t\t\tself.__ptr = arg[1].__ptr\n"
-								lout += "\t\t\treturn\n"
-								lout += "\t\tend\n"
-								lout += "\tend\n"
-							lout += "\tfor k,v in pairs(arg) do\n"
-							lout += "\t\tif type(v) == \"table\" then\n"
-							lout += "\t\t\tif v.__ptr ~= nil then\n"
-							lout += "\t\t\t\targ[k] = v.__ptr\n"
-							lout += "\t\t\tend\n"
-							lout += "\t\tend\n"
-							lout += "\tend\n"
-							lout += "\tif self.__ptr == nil and arg[1] ~= \"__skip_ptr__\" then\n"
-							if ckey == "EventHandler":
-								lout += "\t\tself.__ptr = %s.%s(self)\n" % (libName, ckey)
-							else:
-								lout += "\t\tself.__ptr = %s.%s(unpack(arg))\n" % (libName, ckey)
-							lout += "\t\tPolycore.__ptr_lookup[self.__ptr] = self\n"
-							lout += "\tend\n"
-							lout += "end\n\n"
+							if pm["rtnType"] == "String" or pm["rtnType"] == "static String": # TODO: Path for STL strings?
+								outfunc = "lua_pushstring"
+								basicType = True
+								retFunc = ".c_str()"
+							if pm["rtnType"] == "int" or pm["rtnType"] == "static int" or  pm["rtnType"] == "size_t" or pm["rtnType"] == "static size_t" or pm["rtnType"] == "long" or pm["rtnType"] == "unsigned int" or pm["rtnType"] == "static long":
+								outfunc = "lua_pushinteger"
+								basicType = True
+							if pm["rtnType"] == "bool" or pm["rtnType"] == "static bool" or pm["rtnType"] == "virtual bool":
+								outfunc = "lua_pushboolean"
+								basicType = True
+
+							if pm["rtnType"].find("*") > -1: # Returned var is definitely a pointer.
+								wrappersHeaderOut += "\tvoid *ptrRetVal = (void*)%s%s;\n" % (call, retFunc)
+								wrappersHeaderOut += "\tif(ptrRetVal == NULL) {\n"
+								wrappersHeaderOut += "\t\tlua_pushnil(L);\n"
+								wrappersHeaderOut += "\t} else {\n"
+								wrappersHeaderOut += "\t\t%s(L, ptrRetVal);\n" % (outfunc)
+								wrappersHeaderOut += "\t}\n"
+							elif basicType == True: # Returned var has been flagged as a recognized primitive type
+								wrappersHeaderOut += "\t%s(L, %s%s);\n" % (outfunc, call, retFunc)
+							else: # Some static object is being returned. Convert it to a pointer, then return that.
+								className = pm["rtnType"].replace("const", "").replace("&", "").replace("inline", "").replace("virtual", "").replace("static", "")
+								if className == "Polygon": # Deal with potential windows.h conflict
+									className = "Polycode::Polygon"
+								if className == "Rectangle":
+									className = "Polycode::Rectangle"
+								wrappersHeaderOut += "\t%s *retInst = new %s();\n" % (className, className)
+								wrappersHeaderOut += "\t*retInst = %s;\n" % (call)
+								wrappersHeaderOut += "\t%s(L, retInst);\n" % (outfunc)
+							wrappersHeaderOut += "\treturn 1;\n"
+					wrappersHeaderOut += "}\n\n" # Close out C++ generation
+
+					# Now generate the Lua side method.
+					if pm["name"] == ckey: # Constructors
+						luaClassBindingOut += "function %s:%s(...)\n" % (ckey, ckey)
+						if inherits:
+							luaClassBindingOut += "\tif type(arg[1]) == \"table\" and count(arg) == 1 then\n"
+							luaClassBindingOut += "\t\tif \"\"..arg[1]:class() == \"%s\" then\n" % (c["inherits"][0]["class"])
+							luaClassBindingOut += "\t\t\tself.__ptr = arg[1].__ptr\n"
+							luaClassBindingOut += "\t\t\treturn\n"
+							luaClassBindingOut += "\t\tend\n"
+							luaClassBindingOut += "\tend\n"
+						luaClassBindingOut += "\tfor k,v in pairs(arg) do\n"
+						luaClassBindingOut += "\t\tif type(v) == \"table\" then\n"
+						luaClassBindingOut += "\t\t\tif v.__ptr ~= nil then\n"
+						luaClassBindingOut += "\t\t\t\targ[k] = v.__ptr\n"
+						luaClassBindingOut += "\t\t\tend\n"
+						luaClassBindingOut += "\t\tend\n"
+						luaClassBindingOut += "\tend\n"
+						luaClassBindingOut += "\tif self.__ptr == nil and arg[1] ~= \"__skip_ptr__\" then\n"
+						if ckey == "EventHandler": # As above: Special case behavior for EventHandler. As above, TODO figure out why.
+							luaClassBindingOut += "\t\tself.__ptr = %s.%s(self)\n" % (libName, ckey)
 						else:
-							lout += "function %s:%s(%s)\n" % (ckey, pm["name"], ", ".join(paramlist))
-							if pm["rtnType"].find("static ") == -1:
-								if len(lparamlist):
-									lout += "\tlocal retVal = %s.%s_%s(self.__ptr, %s)\n" % (libName, ckey, pm["name"], ", ".join(lparamlist))
-								else:
-									lout += "\tlocal retVal =  %s.%s_%s(self.__ptr)\n" % (libName, ckey, pm["name"])
+							luaClassBindingOut += "\t\tself.__ptr = %s.%s(unpack(arg))\n" % (libName, ckey)
+						luaClassBindingOut += "\t\t__ptr_lookup.%s[self.__ptr] = self\n" % (ckey)
+						luaClassBindingOut += "\tend\n"
+						luaClassBindingOut += "end\n\n"
+					else: # Non-constructors.
+						luaClassBindingOut += "function %s:%s(%s)\n" % (ckey, pm["name"], ", ".join(paramlist))
+						if pm["rtnType"].find("static ") == -1: # Non-static method
+							if len(lparamlist):
+								luaClassBindingOut += "\tlocal retVal = %s.%s_%s(self.__ptr, %s)\n" % (libName, ckey, pm["name"], ", ".join(lparamlist))
 							else:
-								if len(lparamlist):
-									lout += "\tlocal retVal = %s.%s_%s(%s)\n" % (libName, ckey, pm["name"], ", ".join(lparamlist))
-								else:
-									lout += "\tlocal retVal =  %s.%s_%s()\n" % (libName, ckey, pm["name"])
-
-							if not voidRet:
-								if basicType == True:
-									lout += "\treturn retVal\n"
-								else:
-									className = pm["rtnType"].replace("const", "").replace("&", "").replace("inline", "").replace("virtual", "").replace("static", "").replace("*","").replace(" ", "")
-									lout += "\tif retVal == nil then return nil end\n"
-									lout += "\tif Polycore.__ptr_lookup[retVal] ~= nil then\n"
-									lout += "\t\treturn Polycore.__ptr_lookup[retVal]\n"
-									lout += "\telse\n"
-									lout += "\t\tPolycore.__ptr_lookup[retVal] = %s(\"__skip_ptr__\")\n" % (className)
-									lout += "\t\tPolycore.__ptr_lookup[retVal].__ptr = retVal\n"
-									lout += "\t\treturn Polycore.__ptr_lookup[retVal]\n"
-									lout += "\tend\n"
-							lout += "end\n\n"
-
-					parsed_methods.append(pm["name"])
-
-				#cleanup
-				sout += "\t\t{\"delete_%s\", %s_delete_%s},\n" % (ckey, libName, ckey)
-				out += "static int %s_delete_%s(lua_State *L) {\n" % (libName, ckey)
-				out += "\tluaL_checktype(L, 1, LUA_TLIGHTUSERDATA);\n"
-				out += "\t%s *inst = (%s*)lua_topointer(L, 1);\n" % (ckey, ckey)
-				out += "\tdelete inst;\n"
-				out += "\treturn 0;\n"
-				out += "}\n\n"
-
-				lout += "\n\n"
-				lout += "function %s:__delete()\n" % (ckey)
-				lout += "\tPolycore.__ptr_lookup[self.__ptr] = nil\n"
-				lout += "\t%s.delete_%s(self.__ptr)\n" % (libName, ckey)
-				lout += "end\n"
-				if ckey == "EventHandler":
-					lout += "\n\n"
-					lout += "function EventHandler:__handleEvent(event)\n"
-					lout += "\tevt = Event(\"__skip_ptr__\")\n"
-					lout += "\tevt.__ptr = event\n"
-					lout += "\tself:handleEvent(evt)\n"
-					#lout += "\tself:handleEvent(event)\n"
-					lout += "end\n"
-				lfout += "require \"%s/%s\"\n" % (prefix, ckey)
+								luaClassBindingOut += "\tlocal retVal =  %s.%s_%s(self.__ptr)\n" % (libName, ckey, pm["name"])
+						else: # Static method
+							if len(lparamlist):
+								luaClassBindingOut += "\tlocal retVal = %s.%s_%s(%s)\n" % (libName, ckey, pm["name"], ", ".join(lparamlist))
+							else:
+								luaClassBindingOut += "\tlocal retVal =  %s.%s_%s()\n" % (libName, ckey, pm["name"])
+
+						if not voidRet: # Was there a return value?
+							if basicType == True: # Yes, a primitive
+								luaClassBindingOut += "\treturn retVal\n"
+							else: # Yes, a pointer was returned
+								className = pm["rtnType"].replace("const", "").replace("&", "").replace("inline", "").replace("virtual", "").replace("static", "").replace("*","").replace(" ", "")
+								luaClassBindingOut += "\tif retVal == nil then return nil end\n"
+								luaClassBindingOut += "\tif __ptr_lookup.%s[retVal] ~= nil then\n" % (className)
+								luaClassBindingOut += "\t\treturn __ptr_lookup.%s[retVal]\n" % (className)
+								luaClassBindingOut += "\telse\n"
+								luaClassBindingOut += "\t\t__ptr_lookup.%s[retVal] = %s(\"__skip_ptr__\")\n" % (className, className)
+								luaClassBindingOut += "\t\t__ptr_lookup.%s[retVal].__ptr = retVal\n" % (className)
+								luaClassBindingOut += "\t\treturn __ptr_lookup.%s[retVal]\n" % (className)
+								luaClassBindingOut += "\tend\n"
+						luaClassBindingOut += "end\n\n" # Close out Lua generation
+
+					parsed_methods.append(pm["name"]) # Method parse success
+
+				# With methods out of the way, do some final cleanup:
+				
+				# Delete method (C++ side)
+				cppRegisterOut += "\t\t{\"delete_%s\", %s_delete_%s},\n" % (ckey, libName, ckey)
+				wrappersHeaderOut += "static int %s_delete_%s(lua_State *L) {\n" % (libName, ckey)
+				wrappersHeaderOut += "\tluaL_checktype(L, 1, LUA_TLIGHTUSERDATA);\n"
+				wrappersHeaderOut += "\t%s *inst = (%s*)lua_topointer(L, 1);\n" % (ckey, ckey)
+				wrappersHeaderOut += "\tdelete inst;\n"
+				wrappersHeaderOut += "\treturn 0;\n"
+				wrappersHeaderOut += "}\n\n"
+
+				# Delete method (Lua side)
+				luaClassBindingOut += "\n\n"
+				luaClassBindingOut += "if not __ptr_lookup then __ptr_lookup = {} end\n"
+				luaClassBindingOut += "__ptr_lookup.%s = {}\n\n" % (ckey)
+				luaClassBindingOut += "function %s:__delete()\n" % (ckey)
+				luaClassBindingOut += "\t__ptr_lookup.%s[self.__ptr] = nil\n" % (ckey)
+				luaClassBindingOut += "\t%s.delete_%s(self.__ptr)\n" % (libName, ckey)
+				luaClassBindingOut += "end\n"
+				if ckey == "EventHandler": # TODO Why the eventhandler special case?
+					luaClassBindingOut += "\n\n"
+					luaClassBindingOut += "function EventHandler:__handleEvent(event)\n"
+					luaClassBindingOut += "\tevt = Event(\"__skip_ptr__\")\n"
+					luaClassBindingOut += "\tevt.__ptr = event\n"
+					luaClassBindingOut += "\tself:handleEvent(evt)\n"
+					#luaClassBindingOut += "\tself:handleEvent(event)\n"
+					luaClassBindingOut += "end\n"
+					
+				# Add class to lua index file
+				luaIndexOut += "require \"%s/%s\"\n" % (prefix, ckey)
+				# Write lua file
 				mkdir_p(apiClassPath)
 				fout = open("%s/%s.lua" % (apiClassPath, ckey), "w")
-				fout.write(lout)
-		except CppHeaderParser.CppParseError,  e:
+				fout.write(luaClassBindingOut)
+		except CppHeaderParser.CppParseError,  e: # One input file parse; failed.
 			print e
 			sys.exit(1)
 
-	out += "} // namespace Polycode\n"
+	# Footer boilerplate for wrappersHeaderOut and cppRegisterOut.
+	wrappersHeaderOut += "} // namespace Polycode\n"
 	
-	sout += "\t\t{NULL, NULL}\n"
-	sout += "\t};\n"
-	sout += "\tluaL_openlib(L, \"%s\", %sLib, 0);\n" % (libName, libSmallName)
-	sout += "\treturn 1;\n"
-	sout += "}"
+	cppRegisterOut += "\t\t{NULL, NULL}\n"
+	cppRegisterOut += "\t};\n"
+	cppRegisterOut += "\tluaL_openlib(L, \"%s\", %sLib, 0);\n" % (libName, libSmallName)
+	cppRegisterOut += "\treturn 1;\n"
+	cppRegisterOut += "}"
 	
 	
-	shout = ""
-	shout += "#pragma once\n"
-	shout += "#include <%s>\n" % (mainInclude)
-	shout += "extern \"C\" {\n"
-	shout += "#include <stdio.h>\n"
-	shout += "#include \"lua.h\"\n"
-	shout += "#include \"lualib.h\"\n"
-	shout += "#include \"lauxlib.h\"\n"
-	shout += "int _PolyExport luaopen_%s(lua_State *L);\n" % (prefix)
-	shout += "}\n"
+	cppRegisterHeaderOut = "" # Def: Global C++ *LUA.h
+	cppRegisterHeaderOut += "#pragma once\n"
+	cppRegisterHeaderOut += "#include <%s>\n" % (mainInclude)
+	cppRegisterHeaderOut += "extern \"C\" {\n"
+	cppRegisterHeaderOut += "#include <stdio.h>\n"
+	cppRegisterHeaderOut += "#include \"lua.h\"\n"
+	cppRegisterHeaderOut += "#include \"lualib.h\"\n"
+	cppRegisterHeaderOut += "#include \"lauxlib.h\"\n"
+	cppRegisterHeaderOut += "int _PolyExport luaopen_%s(lua_State *L);\n" % (prefix)
+	cppRegisterHeaderOut += "}\n"
 	
+	# Write out global files
 	mkdir_p(includePath)
 	mkdir_p(apiPath)
 	mkdir_p(sourcePath)
 
 	fout = open("%s/%sLUA.h" % (includePath, prefix), "w")
-	fout.write(shout)
+	fout.write(cppRegisterHeaderOut)
 
 	fout = open("%s/%s.lua" % (apiPath, prefix), "w")
-	fout.write(lfout)
+	fout.write(luaIndexOut)
 	
 	fout = open("%s/%sLUAWrappers.h" % (includePath, prefix), "w")
-	fout.write(out)
+	fout.write(wrappersHeaderOut)
 	
 	fout = open("%s/%sLUA.cpp" % (sourcePath, prefix), "w")
-	fout.write(sout)
+	fout.write(cppRegisterOut)
 	
-
+	# Create .pak zip archive
 	pattern = '*.lua'
 	os.chdir(apiPath)
 	if libName == "Polycore":
@@ -509,7 +563,9 @@ def createLUABindings(inputPath, prefix, mainInclude, libSmallName, libName, api
 			for root, dirs, files in os.walk("."):
 			    for filename in fnmatch.filter(files, pattern):
 				myzip.write(os.path.join(root, filename))
-	#print cppHeader
-	
-createLUABindings(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5], sys.argv[6], sys.argv[7], sys.argv[8], sys.argv[9])
 
+if len(sys.argv) < 10:
+	print ("Usage:\n%s [input path] [prefix] [main include] [lib small name] [lib name] [api path] [api class-path] [include path] [source path] [inherit-in-module-file path (optional)]" % (sys.argv[0]))
+	sys.exit(1)
+else:
+	createLUABindings(sys.argv[1], sys.argv[2], sys.argv[3], sys.argv[4], sys.argv[5], sys.argv[6], sys.argv[7], sys.argv[8], sys.argv[9], sys.argv[10] if len(sys.argv)>10 else None)