Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxluasocket/src wxluasocket.cpp, 1.18, 1.19 wxluasocket_bind.cpp, 1.13, 1.14
|
From: John L. <jr...@us...> - 2007-03-15 23:25:06
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv5608/wxLua/modules/wxluasocket/src Modified Files: wxluasocket.cpp wxluasocket_bind.cpp Log Message: simplified binding generator and write bindings out alphabetically use #elif statements to guarantee there is only one item with the same name Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** wxluasocket_bind.cpp 26 Feb 2007 01:57:07 -0000 1.13 --- wxluasocket_bind.cpp 15 Mar 2007 23:24:58 -0000 1.14 *************** *** 46,50 **** // --------------------------------------------------------------------------- ! // wxLuaGetDefineList_wxluasocket() is called to register defines and enums // --------------------------------------------------------------------------- --- 46,50 ---- // --------------------------------------------------------------------------- ! // wxLuaGetDefineList_wxluasocket() is called to register %define and %enum // --------------------------------------------------------------------------- *************** *** 53,63 **** static WXLUADEFINE defineList[] = { - // ------------------------------------------------------------------- - // %define - // ------------------------------------------------------------------- - - // ------------------------------------------------------------------- - // %enum - // ------------------------------------------------------------------- { 0, 0 }, --- 53,56 ---- *************** *** 69,73 **** // --------------------------------------------------------------------------- ! // wxLuaGetStringList_wxluasocket() is called to register strings // --------------------------------------------------------------------------- --- 62,66 ---- // --------------------------------------------------------------------------- ! // wxLuaGetStringList_wxluasocket() is called to register %define %string // --------------------------------------------------------------------------- *************** *** 76,82 **** static WXLUASTRING stringList[] = { - // ------------------------------------------------------------------- - // %define %string - // ------------------------------------------------------------------- { 0, 0 }, --- 69,72 ---- *************** *** 94,97 **** --- 84,88 ---- static WXLUAOBJECT objectList[] = { + { 0, 0, 0, 0 }, }; *************** *** 112,115 **** --- 103,107 ---- static WXLUAMETHOD functionList[] = { + { LuaGlobal, 0, 0, 0, 0, s_wxluaargArray_None }, }; *************** *** 130,133 **** --- 122,126 ---- { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, CLASSINFO(wxLuaDebuggerEvent), &s_wxluatag_wxLuaDebuggerEvent, "wxEvent", NULL }, { "wxLuaDebuggerServer", wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, CLASSINFO(wxLuaDebuggerServer), &s_wxluatag_wxLuaDebuggerServer, "wxEvtHandler", NULL }, + { 0, 0, 0, 0, 0, 0, 0 }, }; *************** *** 139,143 **** // --------------------------------------------------------------------------- ! // wxLuaGetClassList_wxluasocket() is called to register classes // --------------------------------------------------------------------------- --- 132,136 ---- // --------------------------------------------------------------------------- ! // wxLuaBinding_wxluasocket() - the binding class // --------------------------------------------------------------------------- Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** wxluasocket.cpp 15 Mar 2007 00:01:26 -0000 1.18 --- wxluasocket.cpp 15 Mar 2007 23:24:58 -0000 1.19 *************** *** 27,57 **** 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) ! { ! wxLuaState wxlState(L); ! wxLuaDebuggerServer *returns; ! // int portNumber ! int portNumber = (int)wxlState.GetNumberType(1); ! // call constructor ! returns = new wxLuaDebuggerServer(portNumber); ! // add to tracked memory list ! wxlState.AddTrackedObject((wxLuaDebuggerServer *)returns); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxLuaDebuggerServer, returns); ! ! return 1; ! } ! ! // bool StartServer() ! static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StartServer ! returns = self->StartServer(); // push the result flag lua_pushboolean(L, returns); --- 27,44 ---- int s_wxluatag_wxLuaDebuggerServer = -1; ! 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) { wxLuaState wxlState(L); bool returns; + // int lineNumber + int lineNumber = (int)wxlState.GetNumberType(3); + // const wxString fileName + const wxString fileName = wxlState.GetwxStringType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call AddBreakPoint ! returns = self->AddBreakPoint(fileName, lineNumber); // push the result flag lua_pushboolean(L, returns); *************** *** 60,65 **** } ! // bool StopServer() ! static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L) { wxLuaState wxlState(L); --- 47,52 ---- } ! // bool Break() ! static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L) { wxLuaState wxlState(L); *************** *** 67,72 **** // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StopServer ! returns = self->StopServer(); // push the result flag lua_pushboolean(L, returns); --- 54,59 ---- // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call Break ! returns = self->Break(); // push the result flag lua_pushboolean(L, returns); *************** *** 75,107 **** } ! // long StartClient() ! static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L) { wxLuaState wxlState(L); ! long returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StartClient ! returns = self->StartClient(); ! // push the result number ! lua_pushnumber(L, returns); return 1; } ! 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) { wxLuaState wxlState(L); bool returns; - // int lineNumber - int lineNumber = (int)wxlState.GetNumberType(3); - // const wxString fileName - const wxString fileName = wxlState.GetwxStringType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call AddBreakPoint ! returns = self->AddBreakPoint(fileName, lineNumber); // push the result flag lua_pushboolean(L, returns); --- 62,89 ---- } ! // bool ClearAllBreakPoints() ! static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L) { wxLuaState wxlState(L); ! bool returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call ClearAllBreakPoints ! returns = self->ClearAllBreakPoints(); ! // push the result flag ! lua_pushboolean(L, returns); return 1; } ! // bool Continue() ! static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call Continue ! returns = self->Continue(); // push the result flag lua_pushboolean(L, returns); *************** *** 110,162 **** } ! 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) { wxLuaState wxlState(L); - bool returns; - // int lineNumber - int lineNumber = (int)wxlState.GetNumberType(3); - // const wxString fileName - const wxString fileName = wxlState.GetwxStringType(2); - // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call RemoveBreakPoint ! returns = self->RemoveBreakPoint(fileName, lineNumber); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; } ! // bool ClearAllBreakPoints() ! static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L) { wxLuaState wxlState(L); ! bool returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call ClearAllBreakPoints ! returns = self->ClearAllBreakPoints(); ! // push the result flag ! lua_pushboolean(L, returns); ! return 1; } ! 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) { wxLuaState wxlState(L); bool returns; ! // const wxString fileName ! const wxString fileName = wxlState.GetwxStringType(3); ! // const wxString file ! const wxString file = wxlState.GetwxStringType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call Run ! returns = self->Run(file, fileName); // push the result flag lua_pushboolean(L, returns); --- 92,141 ---- } ! static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L) { wxLuaState wxlState(L); wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; } ! 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) { wxLuaState wxlState(L); ! // get number of arguments ! int argCount = lua_gettop(L); ! // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlState.GetNumberType(3) : wxID_ANY); ! // wxWindow pParent ! wxWindow * pParent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call DisplayStackDialog ! self->DisplayStackDialog(pParent, id); ! return 0; } ! 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) { wxLuaState wxlState(L); bool returns; ! // const wxString expr ! const wxString expr = wxlState.GetwxStringType(3); ! // int exprRef ! int exprRef = (int)wxlState.GetNumberType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call EvaluateExpr ! returns = self->EvaluateExpr(exprRef, expr); // push the result flag lua_pushboolean(L, returns); *************** *** 165,215 **** } ! // bool Step() ! static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L) { wxLuaState wxlState(L); ! bool returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call Step ! returns = self->Step(); ! // push the result flag ! lua_pushboolean(L, returns); return 1; } ! // bool StepOver() ! static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L) { wxLuaState wxlState(L); ! bool returns; ! // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StepOver ! returns = self->StepOver(); ! // push the result flag ! lua_pushboolean(L, returns); return 1; } ! // bool StepOut() ! static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L) { wxLuaState wxlState(L); ! bool returns; ! // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StepOut ! returns = self->StepOut(); ! // push the result flag ! lua_pushboolean(L, returns); return 1; } ! // bool Continue() ! static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L) { wxLuaState wxlState(L); --- 144,190 ---- } ! // long GetDebuggeeProcessId() const ! static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L) { wxLuaState wxlState(L); ! long returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call GetDebuggeeProcessId ! returns = self->GetDebuggeeProcessId(); ! // push the result number ! lua_pushnumber(L, returns); return 1; } ! // static wxString GetNetworkName() ! static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L) { wxLuaState wxlState(L); ! wxString returns; ! // call GetNetworkName ! returns = wxLuaDebuggerServer::GetNetworkName(); ! // push the result string ! wxlState.lua_PushString(returns); return 1; } ! // static wxString GetProgramName() ! static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L) { wxLuaState wxlState(L); ! wxString returns; ! // call GetProgramName ! returns = wxLuaDebuggerServer::GetProgramName(); ! // push the result string ! wxlState.lua_PushString(returns); return 1; } ! // bool KillDebuggee() ! static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L) { wxLuaState wxlState(L); *************** *** 217,222 **** // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call Continue ! returns = self->Continue(); // push the result flag lua_pushboolean(L, returns); --- 192,197 ---- // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call KillDebuggee ! returns = self->KillDebuggee(); // push the result flag lua_pushboolean(L, returns); *************** *** 225,237 **** } ! // bool Break() ! static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call Break ! returns = self->Break(); // push the result flag lua_pushboolean(L, returns); --- 200,217 ---- } ! 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) { wxLuaState wxlState(L); bool returns; + // int lineNumber + int lineNumber = (int)wxlState.GetNumberType(3); + // const wxString fileName + const wxString fileName = wxlState.GetwxStringType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call RemoveBreakPoint ! returns = self->RemoveBreakPoint(fileName, lineNumber); // push the result flag lua_pushboolean(L, returns); *************** *** 255,272 **** } ! 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) { wxLuaState wxlState(L); bool returns; ! // const wxString expr ! const wxString expr = wxlState.GetwxStringType(3); ! // int exprRef ! int exprRef = (int)wxlState.GetNumberType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call EvaluateExpr ! returns = self->EvaluateExpr(exprRef, expr); // push the result flag lua_pushboolean(L, returns); --- 235,252 ---- } ! 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) { wxLuaState wxlState(L); bool returns; ! // const wxString fileName ! const wxString fileName = wxlState.GetwxStringType(3); ! // const wxString file ! const wxString file = wxlState.GetwxStringType(2); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call Run ! returns = self->Run(file, fileName); // push the result flag lua_pushboolean(L, returns); *************** *** 275,314 **** } ! 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) { wxLuaState wxlState(L); ! // get number of arguments ! int argCount = lua_gettop(L); ! // wxWindowID id = wxID_ANY ! wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlState.GetNumberType(3) : wxID_ANY); ! // wxWindow pParent ! wxWindow * pParent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call DisplayStackDialog ! self->DisplayStackDialog(pParent, id); ! return 0; } ! // long GetDebuggeeProcessId() const ! static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L) { wxLuaState wxlState(L); ! long returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call GetDebuggeeProcessId ! returns = self->GetDebuggeeProcessId(); ! // push the result number ! lua_pushnumber(L, returns); return 1; } ! // bool KillDebuggee() ! static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L) { wxLuaState wxlState(L); --- 255,290 ---- } ! // long StartClient() ! static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L) { wxLuaState wxlState(L); ! long returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StartClient ! returns = self->StartClient(); ! // push the result number ! lua_pushnumber(L, returns); ! return 1; } ! // bool StartServer() ! static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L) { wxLuaState wxlState(L); ! bool returns; // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StartServer ! returns = self->StartServer(); ! // push the result flag ! lua_pushboolean(L, returns); return 1; } ! // bool Step() ! static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L) { wxLuaState wxlState(L); *************** *** 316,321 **** // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call KillDebuggee ! returns = self->KillDebuggee(); // push the result flag lua_pushboolean(L, returns); --- 292,297 ---- // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call Step ! returns = self->Step(); // push the result flag lua_pushboolean(L, returns); *************** *** 324,364 **** } ! // static wxString GetProgramName() ! static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L) { wxLuaState wxlState(L); ! wxString returns; ! // call GetProgramName ! returns = wxLuaDebuggerServer::GetProgramName(); ! // push the result string ! wxlState.lua_PushString(returns); return 1; } ! // static wxString GetNetworkName() ! static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L) { wxLuaState wxlState(L); ! wxString returns; ! // call GetNetworkName ! returns = wxLuaDebuggerServer::GetNetworkName(); ! // push the result string ! wxlState.lua_PushString(returns); return 1; } ! static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L) { wxLuaState wxlState(L); wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; } --- 300,364 ---- } ! // bool StepOut() ! static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L) { wxLuaState wxlState(L); ! bool returns; ! // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StepOut ! returns = self->StepOut(); ! // push the result flag ! lua_pushboolean(L, returns); return 1; } ! // bool StepOver() ! static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L) { wxLuaState wxlState(L); ! bool returns; ! // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StepOver ! returns = self->StepOver(); ! // push the result flag ! lua_pushboolean(L, returns); return 1; } ! // bool StopServer() ! static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L) { wxLuaState wxlState(L); + bool returns; + // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); ! // call StopServer ! returns = self->StopServer(); ! // push the result flag ! lua_pushboolean(L, returns); ! ! return 1; ! } ! ! static wxLuaArgTag s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor[] = { &s_wxluaarg_Number, 0 }; ! // wxLuaDebuggerServer(int portNumber) ! static int LUACALL wxLua_wxLuaDebuggerServer_constructor(lua_State *L) ! { ! wxLuaState wxlState(L); ! wxLuaDebuggerServer *returns; ! // int portNumber ! int portNumber = (int)wxlState.GetNumberType(1); ! // call constructor ! returns = new wxLuaDebuggerServer(portNumber); ! // add to tracked memory list ! wxlState.AddTrackedObject((wxLuaDebuggerServer *)returns); ! // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxLuaDebuggerServer, returns); ! ! return 1; } *************** *** 367,391 **** // 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_wxluaargArray_None }, - { LuaMethod, "StopServer", wxLua_wxLuaDebuggerServer_StopServer, 0, 0, s_wxluaargArray_None }, - { LuaMethod, "StartClient", wxLua_wxLuaDebuggerServer_StartClient, 0, 0, s_wxluaargArray_None }, { 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_wxluaargArray_None }, - { LuaMethod, "Run", wxLua_wxLuaDebuggerServer_Run, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }, - { LuaMethod, "Step", wxLua_wxLuaDebuggerServer_Step, 0, 0, s_wxluaargArray_None }, - { LuaMethod, "StepOver", wxLua_wxLuaDebuggerServer_StepOver, 0, 0, s_wxluaargArray_None }, - { LuaMethod, "StepOut", wxLua_wxLuaDebuggerServer_StepOut, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Continue", wxLua_wxLuaDebuggerServer_Continue, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Break", wxLua_wxLuaDebuggerServer_Break, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Reset", wxLua_wxLuaDebuggerServer_Reset, 0, 0, s_wxluaargArray_None }, ! { 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_wxluaargArray_None }, - { LuaMethod, "KillDebuggee", wxLua_wxLuaDebuggerServer_KillDebuggee, 0, 0, s_wxluaargArray_None }, - { LuaMethod, "GetProgramName", wxLua_wxLuaDebuggerServer_GetProgramName, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetNetworkName", wxLua_wxLuaDebuggerServer_GetNetworkName, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerServer_Delete, 0, 0, s_wxluaargArray_None }, }; --- 367,391 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerServer_methods[] = { { LuaMethod, "AddBreakPoint", wxLua_wxLuaDebuggerServer_AddBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_AddBreakPoint }, ! { LuaMethod, "Break", wxLua_wxLuaDebuggerServer_Break, 0, 0, s_wxluaargArray_None }, { LuaMethod, "ClearAllBreakPoints", wxLua_wxLuaDebuggerServer_ClearAllBreakPoints, 0, 0, s_wxluaargArray_None }, { LuaMethod, "Continue", wxLua_wxLuaDebuggerServer_Continue, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerServer_Delete, 0, 0, s_wxluaargArray_None }, { LuaMethod, "DisplayStackDialog", wxLua_wxLuaDebuggerServer_DisplayStackDialog, 2, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_DisplayStackDialog }, + { LuaMethod, "EvaluateExpr", wxLua_wxLuaDebuggerServer_EvaluateExpr, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_EvaluateExpr }, { LuaMethod, "GetDebuggeeProcessId", wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetNetworkName", wxLua_wxLuaDebuggerServer_GetNetworkName, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetProgramName", wxLua_wxLuaDebuggerServer_GetProgramName, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "KillDebuggee", wxLua_wxLuaDebuggerServer_KillDebuggee, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "RemoveBreakPoint", wxLua_wxLuaDebuggerServer_RemoveBreakPoint, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_RemoveBreakPoint }, ! { LuaMethod, "Reset", wxLua_wxLuaDebuggerServer_Reset, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Run", wxLua_wxLuaDebuggerServer_Run, 2, 2, s_wxluatagArray_wxLua_wxLuaDebuggerServer_Run }, ! { LuaMethod, "StartClient", wxLua_wxLuaDebuggerServer_StartClient, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StartServer", wxLua_wxLuaDebuggerServer_StartServer, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Step", wxLua_wxLuaDebuggerServer_Step, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StepOut", wxLua_wxLuaDebuggerServer_StepOut, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StepOver", wxLua_wxLuaDebuggerServer_StepOver, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "StopServer", wxLua_wxLuaDebuggerServer_StopServer, 0, 0, s_wxluaargArray_None }, ! { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor }, }; *************** *** 399,443 **** int s_wxluatag_wxLuaDebuggerEvent = -1; ! // int GetLineNumber() const ! static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L) { wxLuaState wxlState(L); - int returns; - // get this wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); ! // call GetLineNumber ! returns = self->GetLineNumber(); ! // push the result number ! lua_pushnumber(L, returns); ! ! return 1; } ! // int GetReference() const ! static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L) { wxLuaState wxlState(L); ! int returns; // get this wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); ! // call GetReference ! returns = self->GetReference(); ! // push the result number ! lua_pushnumber(L, returns); return 1; } ! // wxString GetFileName() const ! static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L) { wxLuaState wxlState(L); ! wxString returns; // get this wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); ! // call GetFileName ! returns = self->GetFileName(); ! // push the result string ! wxlState.lua_PushString(returns); return 1; --- 399,441 ---- int s_wxluatag_wxLuaDebuggerEvent = -1; ! static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L) { wxLuaState wxlState(L); wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; } ! // wxString GetFileName() const ! static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L) { wxLuaState wxlState(L); ! wxString returns; // get this wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); ! // call GetFileName ! returns = self->GetFileName(); ! // push the result string ! wxlState.lua_PushString(returns); return 1; } ! // int GetLineNumber() const ! static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L) { wxLuaState wxlState(L); ! int returns; // get this wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); ! // call GetLineNumber ! returns = self->GetLineNumber(); ! // push the result number ! lua_pushnumber(L, returns); return 1; *************** *** 459,473 **** } ! static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L) { wxLuaState wxlState(L); wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); ! // if removed from tracked mem list, reset the tag so that gc() is not called on this object. ! if ((self != NULL) && wxlState.RemoveTrackedObject(self)) ! { ! lua_pushnil(L); ! lua_setmetatable(L, -2); ! } ! return 0; } --- 457,473 ---- } ! // int GetReference() const ! static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L) { wxLuaState wxlState(L); + int returns; + // get this wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); ! // call GetReference ! returns = self->GetReference(); ! // push the result number ! lua_pushnumber(L, returns); ! ! return 1; } *************** *** 476,484 **** // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerEvent_methods[] = { ! { LuaMethod, "GetLineNumber", wxLua_wxLuaDebuggerEvent_GetLineNumber, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetFileName", wxLua_wxLuaDebuggerEvent_GetFileName, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetMessage", wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerEvent_Delete, 0, 0, s_wxluaargArray_None }, }; --- 476,484 ---- // Map Lua Class Methods to C Binding Functions WXLUAMETHOD wxLuaDebuggerEvent_methods[] = { ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerEvent_Delete, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetFileName", wxLua_wxLuaDebuggerEvent_GetFileName, 0, 0, s_wxluaargArray_None }, + { LuaMethod, "GetLineNumber", wxLua_wxLuaDebuggerEvent_GetLineNumber, 0, 0, s_wxluaargArray_None }, { LuaMethod, "GetMessage", wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, s_wxluaargArray_None }, ! { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, s_wxluaargArray_None }, }; |
