Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxluasocket/src wxluasocket.cpp, 1.31, 1.32
|
From: John L. <jr...@us...> - 2007-12-07 02:13:20
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv12976/wxLua/modules/wxluasocket/src Modified Files: wxluasocket.cpp Log Message: Too many changes to list... A large portion of the internal workings of the wxLuaState have been rewritten. All of the data that was stored in wxLuaStateData that might be needed by a function taking a lua_State* is now in the LUA_REGISTRYINDEX. C functions have been added to access these values. The generated bindings no longer need to have "wxLuaState wxlState(L);" since everything can be done with the C functions. The result is that wxLua should be faster. Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** wxluasocket.cpp 1 Aug 2007 19:15:38 -0000 1.31 --- wxluasocket.cpp 7 Dec 2007 02:13:14 -0000 1.32 *************** *** 33,44 **** static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L) { - wxLuaState wxlState(L); bool returns; // int lineNumber int lineNumber = (int)wxlua_getnumbertype(L, 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)); --- 33,43 ---- static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L) { bool returns; // int lineNumber int lineNumber = (int)wxlua_getnumbertype(L, 3); // const wxString fileName ! const wxString fileName = wxlua_getwxstringtype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call AddBreakPoint returns = (self->AddBreakPoint(fileName, lineNumber)); *************** *** 55,62 **** 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()); --- 54,60 ---- static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L) { bool returns; // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call Break returns = (self->Break()); *************** *** 73,80 **** 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()); --- 71,77 ---- static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L) { bool returns; // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call ClearAllBreakPoints returns = (self->ClearAllBreakPoints()); *************** *** 91,98 **** 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()); --- 88,94 ---- static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L) { bool returns; // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call Continue returns = (self->Continue()); *************** *** 109,113 **** static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L) { - wxLuaState wxlState(L); // get number of arguments int argCount = lua_gettop(L); --- 105,108 ---- *************** *** 115,121 **** wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 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); --- 110,116 ---- wxWindowID id = (argCount >= 3 ? (wxWindowID)wxlua_getnumbertype(L, 3) : wxID_ANY); // wxWindow pParent ! wxWindow * pParent = (wxWindow *)wxluaT_getuserdatatype(L, 2, s_wxluatag_wxWindow); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call DisplayStackDialog self->DisplayStackDialog(pParent, id); *************** *** 130,141 **** 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)wxlua_getnumbertype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); // call EvaluateExpr returns = (self->EvaluateExpr(exprRef, expr)); --- 125,135 ---- static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L) { bool returns; // const wxString expr ! const wxString expr = wxlua_getwxstringtype(L, 3); // int exprRef int exprRef = (int)wxlua_getnumbertype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call EvaluateExpr returns = (self->EvaluateExpr(exprRef, expr)); *************** *** 152,159 **** 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()); --- 146,152 ---- static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L) { long returns; // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call GetDebuggeeProcessId returns = (self->GetDebuggeeProcessId()); *************** *** 169,178 **** 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; --- 162,170 ---- static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L) { wxString returns; // call GetNetworkName returns = (wxLuaDebuggerServer::GetNetworkName()); // push the result string ! wxlua_pushwxString(L, returns); return 1; *************** *** 184,193 **** 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; --- 176,184 ---- static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L) { wxString returns; // call GetProgramName returns = (wxLuaDebuggerServer::GetProgramName()); // push the result string ! wxlua_pushwxString(L, returns); return 1; *************** *** 200,207 **** static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L) { - wxLuaState wxlState(L); bool returns; // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); // call KillDebuggee returns = (self->KillDebuggee()); --- 191,197 ---- static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L) { bool returns; // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call KillDebuggee returns = (self->KillDebuggee()); *************** *** 218,229 **** static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L) { - wxLuaState wxlState(L); bool returns; // int lineNumber int lineNumber = (int)wxlua_getnumbertype(L, 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)); --- 208,218 ---- static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L) { bool returns; // int lineNumber int lineNumber = (int)wxlua_getnumbertype(L, 3); // const wxString fileName ! const wxString fileName = wxlua_getwxstringtype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call RemoveBreakPoint returns = (self->RemoveBreakPoint(fileName, lineNumber)); *************** *** 240,247 **** static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L) { - wxLuaState wxlState(L); bool returns; // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); // call Reset returns = (self->Reset()); --- 229,235 ---- static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L) { bool returns; // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call Reset returns = (self->Reset()); *************** *** 258,269 **** 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)); --- 246,256 ---- static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L) { bool returns; // const wxString fileName ! const wxString fileName = wxlua_getwxstringtype(L, 3); // const wxString file ! const wxString file = wxlua_getwxstringtype(L, 2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call Run returns = (self->Run(file, fileName)); *************** *** 280,287 **** 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()); --- 267,273 ---- static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L) { long returns; // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call StartClient returns = (self->StartClient()); *************** *** 298,305 **** 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()); --- 284,290 ---- static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L) { bool returns; // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call StartServer returns = (self->StartServer()); *************** *** 316,323 **** 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()); --- 301,307 ---- static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L) { bool returns; // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call Step returns = (self->Step()); *************** *** 334,341 **** 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()); --- 318,324 ---- static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L) { bool returns; // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call StepOut returns = (self->StepOut()); *************** *** 352,359 **** 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()); --- 335,341 ---- static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L) { bool returns; // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call StepOver returns = (self->StepOver()); *************** *** 370,377 **** 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()); --- 352,358 ---- static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L) { bool returns; // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call StopServer returns = (self->StopServer()); *************** *** 387,394 **** 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, wxLuaState::DELETE_CLEAR_OBJECT)) { lua_pushnil(L); --- 368,374 ---- static int LUACALL wxLua_wxLuaDebuggerServer_delete(lua_State *L) { ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 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) && wxluaO_removetrackedobject(L, self, wxLUA_DELETE_CLEAR_OBJECT)) { lua_pushnil(L); *************** *** 405,409 **** { wxluabind_removetableforcall(L); - wxLuaState wxlState(L); wxLuaDebuggerServer *returns; // int portNumber --- 385,388 ---- *************** *** 412,418 **** returns = new wxLuaDebuggerServer(portNumber); // add to tracked memory list ! wxlState.AddTrackedObject(returns); // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxLuaDebuggerServer, returns); return 1; --- 391,397 ---- returns = new wxLuaDebuggerServer(portNumber); // add to tracked memory list ! wxluaO_addtrackedobject(L, returns); // push the constructed class pointer ! wxluaT_pushuserdatatype(L, s_wxluatag_wxLuaDebuggerServer, returns); return 1; *************** *** 463,474 **** 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; --- 442,452 ---- static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L) { wxString returns; // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerEvent); // call GetFileName returns = (self->GetFileName()); // push the result string ! wxlua_pushwxString(L, returns); return 1; *************** *** 481,488 **** 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()); --- 459,465 ---- static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L) { int returns; // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerEvent); // call GetLineNumber returns = (self->GetLineNumber()); *************** *** 499,510 **** static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L) { - wxLuaState wxlState(L); wxString returns; // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); // call GetMessage returns = (self->GetMessage()); // push the result string ! wxlState.lua_PushString(returns); return 1; --- 476,486 ---- static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L) { wxString returns; // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerEvent); // call GetMessage returns = (self->GetMessage()); // push the result string ! wxlua_pushwxString(L, returns); return 1; *************** *** 517,524 **** 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()); --- 493,499 ---- static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L) { int returns; // get this ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerEvent); // call GetReference returns = (self->GetReference()); *************** *** 534,541 **** 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, wxLuaState::DELETE_CLEAR_OBJECT)) { lua_pushnil(L); --- 509,515 ---- static int LUACALL wxLua_wxLuaDebuggerEvent_delete(lua_State *L) { ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 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) && wxluaO_removetrackedobject(L, self, wxLUA_DELETE_CLEAR_OBJECT)) { lua_pushnil(L); |
