From: John L. <jr...@us...> - 2006-12-17 07:47:21
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv28504/wxLua/modules/wxluasocket/src Modified Files: wxluasocket.cpp wxluasocket_bind.cpp Log Message: separate out the wxluatag arrays and use pointer in WXLUAMETHOD Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxluasocket_bind.cpp 14 Dec 2006 01:01:27 -0000 1.11 --- wxluasocket_bind.cpp 17 Dec 2006 07:47:17 -0000 1.12 *************** *** 112,116 **** static WXLUAMETHOD functionList[] = { ! { LuaGlobal, 0, 0, 0, 0, {0} }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; --- 112,116 ---- static WXLUAMETHOD functionList[] = { ! { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, }; count = (sizeof(functionList)/sizeof(functionList[0])) - 1; Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** wxluasocket.cpp 14 Dec 2006 01:01:27 -0000 1.11 --- wxluasocket.cpp 17 Dec 2006 07:47:17 -0000 1.12 *************** *** 27,30 **** --- 27,31 ---- int s_wxluatag_wxLuaDebuggerServer = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor[] = { &s_wxluaarg_Number, 0 }; // wxLuaDebuggerServer(int portNumber) static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L) *************** *** 44,47 **** --- 45,49 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartServer[] = { 0 }; // bool StartServer() static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L) *************** *** 59,62 **** --- 61,65 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StopServer[] = { 0 }; // bool StopServer() static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L) *************** *** 74,77 **** --- 77,81 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartClient[] = { 0 }; // long StartClient() static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L) *************** *** 89,92 **** --- 93,97 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; // bool AddBreakPoint(const wxString &fileName, int lineNumber) static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L) *************** *** 108,111 **** --- 113,117 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint[] = { &s_wxluaarg_String, &s_wxluaarg_Number, 0 }; // bool RemoveBreakPoint(const wxString &fileName, int lineNumber) static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L) *************** *** 127,130 **** --- 133,137 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints[] = { 0 }; // bool ClearAllBreakPoints() static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L) *************** *** 142,145 **** --- 149,153 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run[] = { &s_wxluaarg_String, &s_wxluaarg_String, 0 }; // bool Run(const wxString &file, const wxString &fileName) static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L) *************** *** 161,164 **** --- 169,173 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Step[] = { 0 }; // bool Step() static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L) *************** *** 176,179 **** --- 185,189 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOver[] = { 0 }; // bool StepOver() static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L) *************** *** 191,194 **** --- 201,205 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOut[] = { 0 }; // bool StepOut() static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L) *************** *** 206,209 **** --- 217,221 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Continue[] = { 0 }; // bool Continue() static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L) *************** *** 221,224 **** --- 233,237 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Break[] = { 0 }; // bool Break() static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L) *************** *** 236,239 **** --- 249,253 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_Reset[] = { 0 }; // bool Reset() static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L) *************** *** 251,254 **** --- 265,269 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr[] = { &s_wxluaarg_Number, &s_wxluaarg_String, 0 }; // bool EvaluateExpr(int exprRef, const wxString &expr) static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L) *************** *** 270,273 **** --- 285,289 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog[] = { &s_wxluatag_wxWindow, &s_wxluaarg_Number, 0 }; // void DisplayStackDialog(wxWindow *pParent, wxWindowID id = wxID_ANY) static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L) *************** *** 288,291 **** --- 304,308 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId[] = { 0 }; // long GetDebuggeeProcessId() const static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L) *************** *** 303,306 **** --- 320,324 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_KillDebuggee[] = { 0 }; // bool KillDebuggee() static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L) *************** *** 318,321 **** --- 336,340 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetProgramName[] = { 0 }; // static wxString GetProgramName() static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L) *************** *** 331,334 **** --- 350,354 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetNetworkName[] = { 0 }; // static wxString GetNetworkName() static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L) *************** *** 375,400 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerServer_methods[] = { ! { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, { &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "StartServer", wxLua_wxLuaDebuggerServer_StartServer, 0, 0, { 0 } }, ! { LuaMethod, "StopServer", wxLua_wxLuaDebuggerServer_StopServer, 0, 0, { 0 } }, ! { LuaMethod, "StartClient", wxLua_wxLuaDebuggerServer_StartClient, 0, 0, { 0 } }, ! { LuaMethod, "AddBreakPoint", wxLua_wxLuaDebuggerServer_AddBreakPoint, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "RemoveBreakPoint", wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "ClearAllBreakPoints", wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 0, 0, { 0 } }, ! { LuaMethod, "Run", wxLua_wxLuaDebuggerServer_Run, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Step", wxLua_wxLuaDebuggerServer_Step, 0, 0, { 0 } }, ! { LuaMethod, "StepOver", wxLua_wxLuaDebuggerServer_StepOver, 0, 0, { 0 } }, ! { LuaMethod, "StepOut", wxLua_wxLuaDebuggerServer_StepOut, 0, 0, { 0 } }, ! { LuaMethod, "Continue", wxLua_wxLuaDebuggerServer_Continue, 0, 0, { 0 } }, ! { LuaMethod, "Break", wxLua_wxLuaDebuggerServer_Break, 0, 0, { 0 } }, ! { LuaMethod, "Reset", wxLua_wxLuaDebuggerServer_Reset, 0, 0, { 0 } }, ! { LuaMethod, "EvaluateExpr", wxLua_wxLuaDebuggerServer_EvaluateExpr, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "DisplayStackDialog", wxLua_wxLuaDebuggerServer_DisplayStackDialog, 2, 1, { &s_wxluatag_wxWindow, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "GetDebuggeeProcessId", wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 0, 0, { 0 } }, ! { LuaMethod, "KillDebuggee", wxLua_wxLuaDebuggerServer_KillDebuggee, 0, 0, { 0 } }, ! { LuaMethod, "GetProgramName", wxLua_wxLuaDebuggerServer_GetProgramName, 0, 0, { 0 } }, ! { LuaMethod, "GetNetworkName", wxLua_wxLuaDebuggerServer_GetNetworkName, 0, 0, { 0 } }, ! { LuaDelete, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_destructor, 0, 0, {0} }, ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerServer_Delete, 0, 0, {0} }, }; --- 395,420 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerServer_methods[] = { ! { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }, ! { LuaMethod, "StartServer", wxLua_wxLuaDebuggerServer_StartServer, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartServer }, ! { LuaMethod, "StopServer", wxLua_wxLuaDebuggerServer_StopServer, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StopServer }, ! { LuaMethod, "StartClient", wxLua_wxLuaDebuggerServer_StartClient, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StartClient }, ! { LuaMethod, "AddBreakPoint", wxLua_wxLuaDebuggerServer_AddBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }, ! { LuaMethod, "RemoveBreakPoint", wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }, ! { LuaMethod, "ClearAllBreakPoints", wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_ClearAllBreakPoints }, ! { LuaMethod, "Run", wxLua_wxLuaDebuggerServer_Run, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }, ! { LuaMethod, "Step", wxLua_wxLuaDebuggerServer_Step, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Step }, ! { LuaMethod, "StepOver", wxLua_wxLuaDebuggerServer_StepOver, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOver }, ! { LuaMethod, "StepOut", wxLua_wxLuaDebuggerServer_StepOut, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_StepOut }, ! { LuaMethod, "Continue", wxLua_wxLuaDebuggerServer_Continue, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Continue }, ! { LuaMethod, "Break", wxLua_wxLuaDebuggerServer_Break, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Break }, ! { LuaMethod, "Reset", wxLua_wxLuaDebuggerServer_Reset, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Reset }, ! { LuaMethod, "EvaluateExpr", wxLua_wxLuaDebuggerServer_EvaluateExpr, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }, ! { LuaMethod, "DisplayStackDialog", wxLua_wxLuaDebuggerServer_DisplayStackDialog, 2, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }, ! { LuaMethod, "GetDebuggeeProcessId", wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId }, ! { LuaMethod, "KillDebuggee", wxLua_wxLuaDebuggerServer_KillDebuggee, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_KillDebuggee }, ! { LuaMethod, "GetProgramName", wxLua_wxLuaDebuggerServer_GetProgramName, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetProgramName }, ! { LuaMethod, "GetNetworkName", wxLua_wxLuaDebuggerServer_GetNetworkName, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerServer_GetNetworkName }, ! { LuaDelete, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_destructor, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerServer_Delete, 0, 0, s_wxluaargArray_None }, }; *************** *** 408,411 **** --- 428,432 ---- int s_wxluatag_wxLuaDebuggerEvent = -1; + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetLineNumber[] = { 0 }; // int GetLineNumber() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L) *************** *** 423,426 **** --- 444,448 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetReference[] = { 0 }; // int GetReference() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L) *************** *** 438,441 **** --- 460,464 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetFileName[] = { 0 }; // wxString GetFileName() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L) *************** *** 453,456 **** --- 476,480 ---- } + static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetMessage[] = { 0 }; // wxString GetMessage() const static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L) *************** *** 499,508 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerEvent_methods[] = { ! { LuaMethod, "GetLineNumber", wxLua_wxLuaDebuggerEvent_GetLineNumber, 0, 0, { 0 } }, ! { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, { 0 } }, ! { LuaMethod, "GetFileName", wxLua_wxLuaDebuggerEvent_GetFileName, 0, 0, { 0 } }, ! { LuaMethod, "GetMessage", wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, { 0 } }, ! { LuaDelete, "wxLuaDebuggerEvent", wxLua_wxLuaDebuggerEvent_destructor, 0, 0, {0} }, ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerEvent_Delete, 0, 0, {0} }, }; --- 523,532 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerEvent_methods[] = { ! { LuaMethod, "GetLineNumber", wxLua_wxLuaDebuggerEvent_GetLineNumber, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetLineNumber }, ! { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetReference }, ! { LuaMethod, "GetFileName", wxLua_wxLuaDebuggerEvent_GetFileName, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetFileName }, ! { LuaMethod, "GetMessage", wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, s_wxluatagArray_wxLua_wxLuaDebuggerEvent_GetMessage }, ! { LuaDelete, "wxLuaDebuggerEvent", wxLua_wxLuaDebuggerEvent_destructor, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerEvent_Delete, 0, 0, s_wxluaargArray_None }, }; |