Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxluasocket/src wxlsock.cpp, 1.32, 1.33 wxluasocket.cpp, 1.33, 1.34 wxluasocket_bind.cpp, 1.23, 1.24
|
From: John L. <jr...@us...> - 2007-12-10 05:39:21
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23281/wxLua/modules/wxluasocket/src Modified Files: wxlsock.cpp wxluasocket.cpp wxluasocket_bind.cpp Log Message: genwxbind.lua - don't create "returns" variable before use to save a line of code. Applied Lua patches for 5.1.2 8-11 Added wxlua_lreg_createtable(..) to create the LUA_REGISTRYINDEX tables for wxLua Added wxlua_lreg_regtable_key in LUA_REGISTRYINDEX to help the wxLuaDebugData find wxLua's tables faster to give more information Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** wxluasocket_bind.cpp 17 Nov 2007 00:15:12 -0000 1.23 --- wxluasocket_bind.cpp 10 Dec 2007 05:39:10 -0000 1.24 *************** *** 145,162 **** } - // --------------------------------------------------------------------------- // wxLuaBinding_wxluasocket() - the binding class // --------------------------------------------------------------------------- - // binding class - extern wxLuaBindClass *wxLuaGetClassList_wxluasocket(size_t &count); - extern wxLuaBindDefine *wxLuaGetDefineList_wxluasocket(size_t &count); - extern wxLuaBindString *wxLuaGetStringList_wxluasocket(size_t &count); - extern wxLuaBindEvent *wxLuaGetEventList_wxluasocket(size_t &count); - extern wxLuaBindObject *wxLuaGetObjectList_wxluasocket(size_t &count); - extern wxLuaBindMethod *wxLuaGetFunctionList_wxluasocket(size_t &count); - - IMPLEMENT_DYNAMIC_CLASS(wxLuaBinding_wxluasocket, wxLuaBinding) --- 145,152 ---- *************** *** 181,186 **** } - // bind wxLuaBinding_wxluasocket to a single wxLuaState bool wxLuaBinding_wxluasocket_bind(const wxLuaState& wxlState_) { --- 171,176 ---- } + // --------------------------------------------------------------------------- bool wxLuaBinding_wxluasocket_bind(const wxLuaState& wxlState_) { *************** *** 199,203 **** return true; } ! // initialize wxLuaBinding_wxluasocket for all wxLuaStates bool wxLuaBinding_wxluasocket_init() { --- 189,193 ---- return true; } ! bool wxLuaBinding_wxluasocket_init() { Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.33 retrieving revision 1.34 diff -C2 -d -r1.33 -r1.34 *** wxluasocket.cpp 7 Dec 2007 06:44:47 -0000 1.33 --- wxluasocket.cpp 10 Dec 2007 05:39:10 -0000 1.34 *************** *** 33,37 **** static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L) { - bool returns; // int lineNumber int lineNumber = (int)wxlua_getnumbertype(L, 3); --- 33,36 ---- *************** *** 41,45 **** wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call AddBreakPoint ! returns = (self->AddBreakPoint(fileName, lineNumber)); // push the result flag lua_pushboolean(L, returns); --- 40,44 ---- wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call AddBreakPoint ! bool returns = (self->AddBreakPoint(fileName, lineNumber)); // push the result flag lua_pushboolean(L, returns); *************** *** 54,62 **** 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()); // push the result flag lua_pushboolean(L, returns); --- 53,60 ---- static int LUACALL wxLua_wxLuaDebuggerServer_Break(lua_State *L) { // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call Break ! bool returns = (self->Break()); // push the result flag lua_pushboolean(L, returns); *************** *** 71,79 **** 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()); // push the result flag lua_pushboolean(L, returns); --- 69,76 ---- static int LUACALL wxLua_wxLuaDebuggerServer_ClearAllBreakPoints(lua_State *L) { // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call ClearAllBreakPoints ! bool returns = (self->ClearAllBreakPoints()); // push the result flag lua_pushboolean(L, returns); *************** *** 88,96 **** 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()); // push the result flag lua_pushboolean(L, returns); --- 85,92 ---- static int LUACALL wxLua_wxLuaDebuggerServer_Continue(lua_State *L) { // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call Continue ! bool returns = (self->Continue()); // push the result flag lua_pushboolean(L, returns); *************** *** 125,129 **** static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L) { - bool returns; // const wxString expr const wxString expr = wxlua_getwxStringtype(L, 3); --- 121,124 ---- *************** *** 133,137 **** wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call EvaluateExpr ! returns = (self->EvaluateExpr(exprRef, expr)); // push the result flag lua_pushboolean(L, returns); --- 128,132 ---- wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call EvaluateExpr ! bool returns = (self->EvaluateExpr(exprRef, expr)); // push the result flag lua_pushboolean(L, returns); *************** *** 146,154 **** 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()); // push the result number lua_pushnumber(L, returns); --- 141,148 ---- static int LUACALL wxLua_wxLuaDebuggerServer_GetDebuggeeProcessId(lua_State *L) { // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call GetDebuggeeProcessId ! long returns = (self->GetDebuggeeProcessId()); // push the result number lua_pushnumber(L, returns); *************** *** 162,168 **** static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L) { - wxString returns; // call GetNetworkName ! returns = (wxLuaDebuggerServer::GetNetworkName()); // push the result string wxlua_pushwxString(L, returns); --- 156,161 ---- static int LUACALL wxLua_wxLuaDebuggerServer_GetNetworkName(lua_State *L) { // call GetNetworkName ! wxString returns = (wxLuaDebuggerServer::GetNetworkName()); // push the result string wxlua_pushwxString(L, returns); *************** *** 176,182 **** static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L) { - wxString returns; // call GetProgramName ! returns = (wxLuaDebuggerServer::GetProgramName()); // push the result string wxlua_pushwxString(L, returns); --- 169,174 ---- static int LUACALL wxLua_wxLuaDebuggerServer_GetProgramName(lua_State *L) { // call GetProgramName ! wxString returns = (wxLuaDebuggerServer::GetProgramName()); // push the result string wxlua_pushwxString(L, returns); *************** *** 191,199 **** 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()); // push the result flag lua_pushboolean(L, returns); --- 183,190 ---- static int LUACALL wxLua_wxLuaDebuggerServer_KillDebuggee(lua_State *L) { // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call KillDebuggee ! bool returns = (self->KillDebuggee()); // push the result flag lua_pushboolean(L, returns); *************** *** 208,212 **** static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L) { - bool returns; // int lineNumber int lineNumber = (int)wxlua_getnumbertype(L, 3); --- 199,202 ---- *************** *** 216,220 **** wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call RemoveBreakPoint ! returns = (self->RemoveBreakPoint(fileName, lineNumber)); // push the result flag lua_pushboolean(L, returns); --- 206,210 ---- wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call RemoveBreakPoint ! bool returns = (self->RemoveBreakPoint(fileName, lineNumber)); // push the result flag lua_pushboolean(L, returns); *************** *** 229,237 **** 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()); // push the result flag lua_pushboolean(L, returns); --- 219,226 ---- static int LUACALL wxLua_wxLuaDebuggerServer_Reset(lua_State *L) { // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call Reset ! bool returns = (self->Reset()); // push the result flag lua_pushboolean(L, returns); *************** *** 246,250 **** static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L) { - bool returns; // const wxString fileName const wxString fileName = wxlua_getwxStringtype(L, 3); --- 235,238 ---- *************** *** 254,258 **** wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call Run ! returns = (self->Run(file, fileName)); // push the result flag lua_pushboolean(L, returns); --- 242,246 ---- wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call Run ! bool returns = (self->Run(file, fileName)); // push the result flag lua_pushboolean(L, returns); *************** *** 267,275 **** 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()); // push the result number lua_pushnumber(L, returns); --- 255,262 ---- static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L) { // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call StartClient ! long returns = (self->StartClient()); // push the result number lua_pushnumber(L, returns); *************** *** 284,292 **** 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()); // push the result flag lua_pushboolean(L, returns); --- 271,278 ---- static int LUACALL wxLua_wxLuaDebuggerServer_StartServer(lua_State *L) { // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call StartServer ! bool returns = (self->StartServer()); // push the result flag lua_pushboolean(L, returns); *************** *** 301,309 **** 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()); // push the result flag lua_pushboolean(L, returns); --- 287,294 ---- static int LUACALL wxLua_wxLuaDebuggerServer_Step(lua_State *L) { // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call Step ! bool returns = (self->Step()); // push the result flag lua_pushboolean(L, returns); *************** *** 318,326 **** 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()); // push the result flag lua_pushboolean(L, returns); --- 303,310 ---- static int LUACALL wxLua_wxLuaDebuggerServer_StepOut(lua_State *L) { // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call StepOut ! bool returns = (self->StepOut()); // push the result flag lua_pushboolean(L, returns); *************** *** 335,343 **** 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()); // push the result flag lua_pushboolean(L, returns); --- 319,326 ---- static int LUACALL wxLua_wxLuaDebuggerServer_StepOver(lua_State *L) { // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call StepOver ! bool returns = (self->StepOver()); // push the result flag lua_pushboolean(L, returns); *************** *** 352,360 **** 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()); // push the result flag lua_pushboolean(L, returns); --- 335,342 ---- static int LUACALL wxLua_wxLuaDebuggerServer_StopServer(lua_State *L) { // get this wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerServer); // call StopServer ! bool returns = (self->StopServer()); // push the result flag lua_pushboolean(L, returns); *************** *** 385,393 **** { wxluabind_removetableforcall(L); - wxLuaDebuggerServer *returns; // int portNumber int portNumber = (int)wxlua_getnumbertype(L, 1); // call constructor ! returns = new wxLuaDebuggerServer(portNumber); // add to tracked memory list wxluaO_addtrackedobject(L, returns); --- 367,374 ---- { wxluabind_removetableforcall(L); // int portNumber int portNumber = (int)wxlua_getnumbertype(L, 1); // call constructor ! wxLuaDebuggerServer* returns = new wxLuaDebuggerServer(portNumber); // add to tracked memory list wxluaO_addtrackedobject(L, returns); *************** *** 442,450 **** 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); --- 423,430 ---- static int LUACALL wxLua_wxLuaDebuggerEvent_GetFileName(lua_State *L) { // get this wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerEvent); // call GetFileName ! wxString returns = (self->GetFileName()); // push the result string wxlua_pushwxString(L, returns); *************** *** 459,467 **** 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()); // push the result number lua_pushnumber(L, returns); --- 439,446 ---- static int LUACALL wxLua_wxLuaDebuggerEvent_GetLineNumber(lua_State *L) { // get this wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerEvent); // call GetLineNumber ! int returns = (self->GetLineNumber()); // push the result number lua_pushnumber(L, returns); *************** *** 476,484 **** 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); --- 455,462 ---- static int LUACALL wxLua_wxLuaDebuggerEvent_GetMessage(lua_State *L) { // get this wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerEvent); // call GetMessage ! wxString returns = (self->GetMessage()); // push the result string wxlua_pushwxString(L, returns); *************** *** 493,501 **** 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()); // push the result number lua_pushnumber(L, returns); --- 471,478 ---- static int LUACALL wxLua_wxLuaDebuggerEvent_GetReference(lua_State *L) { // get this wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxluaT_getuserdatatype(L, 1, s_wxluatag_wxLuaDebuggerEvent); // call GetReference ! int returns = (self->GetReference()); // push the result number lua_pushnumber(L, returns); Index: wxlsock.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxlsock.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** wxlsock.cpp 8 Nov 2007 23:47:15 -0000 1.32 --- wxlsock.cpp 10 Dec 2007 05:39:10 -0000 1.33 *************** *** 154,161 **** { wxLuaDebugData debugData(true); - bool ok = false; wxInt32 idx, idxMax = 0; ! ok = ReadInt32(idxMax); wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::ReadDebugData"), wxString::Format(wxT("items %d"), idxMax)); --- 154,160 ---- { wxLuaDebugData debugData(true); wxInt32 idx, idxMax = 0; ! bool ok = ReadInt32(idxMax); wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::ReadDebugData"), wxString::Format(wxT("items %d"), idxMax)); *************** *** 249,258 **** // {char GetName \0}{char GetType \0}{char GetValue \0}{char GetSource \0}] - bool ok = false; wxInt32 idx, idxMax = debugData.GetCount(); wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::WriteDebugData"), wxString::Format(wxT("items %d"), idxMax)); ! ok = Write((const char*)&idxMax, sizeof(wxInt32)) == sizeof(wxInt32); for (idx = 0; ok && (idx < idxMax); ++idx) --- 248,256 ---- // {char GetName \0}{char GetType \0}{char GetValue \0}{char GetSource \0}] wxInt32 idx, idxMax = debugData.GetCount(); wxLuaSocketDebugMsg(m_name + wxT(" wxLuaSocketBase::WriteDebugData"), wxString::Format(wxT("items %d"), idxMax)); ! bool ok = Write((const char*)&idxMax, sizeof(wxInt32)) == sizeof(wxInt32); for (idx = 0; ok && (idx < idxMax); ++idx) |
