Menu
▾
▴
[Wxlua-commit] wxLua/modules/wxluasocket/src dservice.cpp, 1.21, 1.22 wxldserv.cpp, 1.19, 1.20 wxldtarg.cpp, 1.20, 1.21 wxlsock.cpp, 1.12, 1.13 wxluasocket.cpp, 1.4, 1.5 wxluasocket_bind.cpp, 1.4, 1.5
|
From: John L. <jr...@us...> - 2006-09-15 00:10:59
|
Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23109/wxLua/modules/wxluasocket/src Modified Files: dservice.cpp wxldserv.cpp wxldtarg.cpp wxlsock.cpp wxluasocket.cpp wxluasocket_bind.cpp Log Message: rename EVT_WXLUA_DEBUG_XXX to EVT_WXLUA_DEBUGGER since that's what they apply to rename wxEVT_WXLUA_DEBUG_XXX to wxEVT_WXLUA_DEBUGGER_XXX wxLuaDebugEvent renamed to wxLuaDebuggerEvent rename wxLUASOCKET_DEBUG_EVENT_XXX to wxLUASOCKET_DEBUGGEE_EVENT_XXX rename wxLUASOCKET_DEBUG_CMD_XXX to wxLUASOCKET_DEBUGGER_CMD_XXX make all wxLuaSocketBase::ReadXXX functions return bool for success checking rename wxLuaDebugServer to wxLuaDebuggerServer Index: dservice.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dservice.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** dservice.cpp 13 Sep 2006 04:13:48 -0000 1.21 --- dservice.cpp 15 Sep 2006 00:10:56 -0000 1.22 *************** *** 226,335 **** if (debugSocket && debuggee) { ! wxLuaSocketDebugCommands_Type debugCommand = (wxLuaSocketDebugCommands_Type)debugSocket->ReadByte(); ! switch(debugCommand) { ! case wxLUASOCKET_DEBUG_CMD_NONE : { break; } ! case wxLUASOCKET_DEBUG_CMD_ADD_BREAKPOINT: { ! wxString fileName = debugSocket->ReadString(); ! int lineNumber = debugSocket->ReadInt32(); ! debuggee->AddBreakPoint(fileName, lineNumber); } ! break; ! ! case wxLUASOCKET_DEBUG_CMD_REMOVE_BREAKPOINT: { ! wxString fileName = debugSocket->ReadString(); ! int lineNumber = debugSocket->ReadInt32(); ! debuggee->RemoveBreakPoint(fileName, lineNumber); } ! break; ! ! case wxLUASOCKET_DEBUG_CMD_DISABLE_BREAKPOINT: { ! wxString fileName = debugSocket->ReadString(); ! int lineNumber = debugSocket->ReadInt32(); ! debuggee->DisableBreakPoint(fileName, lineNumber); } ! break; ! ! ! case wxLUASOCKET_DEBUG_CMD_ENABLE_BREAKPOINT: { ! wxString fileName = debugSocket->ReadString(); ! int lineNumber = debugSocket->ReadInt32(); ! debuggee->EnableBreakPoint(fileName, lineNumber); } ! break; ! ! case wxLUASOCKET_DEBUG_CMD_CLEAR_ALL_BREAKPOINTS: ! debuggee->ClearAllBreakPoints(); ! break; ! ! case wxLUASOCKET_DEBUG_CMD_DEBUG_STEP: ! debuggee->Step(); ! break; ! ! case wxLUASOCKET_DEBUG_CMD_DEBUG_STEPOVER: ! debuggee->StepOver(); ! break; ! ! case wxLUASOCKET_DEBUG_CMD_DEBUG_STEPOUT: ! debuggee->StepOut(); ! break; ! ! case wxLUASOCKET_DEBUG_CMD_DEBUG_CONTINUE: ! debuggee->Continue(); ! break; ! ! case wxLUASOCKET_DEBUG_CMD_DEBUG_BREAK: ! debuggee->Break(); ! break; ! case wxLUASOCKET_DEBUG_CMD_ENUMERATE_STACK: ! debuggee->EnumerateStack(); ! break; ! case wxLUASOCKET_DEBUG_CMD_ENUMERATE_STACK_ENTRY: ! { ! int stackRef = debugSocket->ReadInt32(); ! debuggee->EnumerateStackEntry(stackRef); } ! break; ! ! case wxLUASOCKET_DEBUG_CMD_ENUMERATE_TABLE_REF: { ! int tableRef = debugSocket->ReadInt32(); ! int index = debugSocket->ReadInt32(); ! long itemNode = debugSocket->ReadLong(); ! debuggee->EnumerateTable(tableRef, index, itemNode); ! } ! break; ! ! case wxLUASOCKET_DEBUG_CMD_RESET: ! debuggee->Reset(); ! break; ! case wxLUASOCKET_DEBUG_CMD_EVALUATE_EXPR: ! { ! int exprRef = debugSocket->ReadInt32(); ! wxString buffer = debugSocket->ReadString(); ! debuggee->EvaluateExpr(exprRef, buffer); } ! break; ! case wxLUASOCKET_DEBUG_CMD_CLEAR_DEBUG_REFERENCES: { debuggee->ClearReferences(); } ! break; ! case wxLUASOCKET_DEBUG_CMD_RUN_BUFFER: break; // FIXME - not impemented } } --- 226,355 ---- if (debugSocket && debuggee) { ! unsigned char debugCommand = 0; // wxLuaSocketDebuggerCommands_Type ! if (!debugSocket->ReadByte(debugCommand)) ! break; ! ! switch((int)debugCommand) { ! case wxLUASOCKET_DEBUGGER_CMD_NONE : { break; } ! case wxLUASOCKET_DEBUGGER_CMD_ADD_BREAKPOINT: { ! wxString fileName; ! wxInt32 lineNumber = 0; ! if (debugSocket->ReadString(fileName) && ! debugSocket->ReadInt32(lineNumber)) ! { ! debuggee->AddBreakPoint(fileName, lineNumber); ! } ! break; } ! case wxLUASOCKET_DEBUGGER_CMD_REMOVE_BREAKPOINT: { ! wxString fileName; ! wxInt32 lineNumber = 0; ! if (debugSocket->ReadString(fileName) && ! debugSocket->ReadInt32(lineNumber)) ! { ! debuggee->RemoveBreakPoint(fileName, lineNumber); ! } ! break; } ! case wxLUASOCKET_DEBUGGER_CMD_DISABLE_BREAKPOINT: { ! wxString fileName; ! wxInt32 lineNumber = 0; ! if (debugSocket->ReadString(fileName) && ! debugSocket->ReadInt32(lineNumber)) ! { ! debuggee->DisableBreakPoint(fileName, lineNumber); ! } ! break; } ! case wxLUASOCKET_DEBUGGER_CMD_ENABLE_BREAKPOINT: { ! wxString fileName; ! wxInt32 lineNumber = 0; ! if (debugSocket->ReadString(fileName) && ! debugSocket->ReadInt32(lineNumber)) ! { ! debuggee->EnableBreakPoint(fileName, lineNumber); ! } ! break; } ! case wxLUASOCKET_DEBUGGER_CMD_CLEAR_ALL_BREAKPOINTS: ! debuggee->ClearAllBreakPoints(); ! break; ! case wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEP: ! debuggee->Step(); ! break; ! case wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEPOVER: ! debuggee->StepOver(); ! break; ! case wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEPOUT: ! debuggee->StepOut(); ! break; ! case wxLUASOCKET_DEBUGGER_CMD_DEBUG_CONTINUE: ! debuggee->Continue(); ! break; ! case wxLUASOCKET_DEBUGGER_CMD_DEBUG_BREAK: ! debuggee->Break(); ! break; ! case wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK: ! debuggee->EnumerateStack(); ! break; ! case wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_STACK_ENTRY: ! { ! int stackRef = 0; ! if (debugSocket->ReadInt32(stackRef)) ! debuggee->EnumerateStackEntry(stackRef); ! break; } ! case wxLUASOCKET_DEBUGGER_CMD_ENUMERATE_TABLE_REF: { ! wxInt32 tableRef = 0; ! wxInt32 index = 0; ! long itemNode = 0; ! if (debugSocket->ReadInt32(tableRef) && ! debugSocket->ReadInt32(index) && ! debugSocket->ReadLong(itemNode)) ! { ! debuggee->EnumerateTable(tableRef, index, itemNode); ! } ! break; } ! case wxLUASOCKET_DEBUGGER_CMD_RESET: ! debuggee->Reset(); ! break; ! case wxLUASOCKET_DEBUGGER_CMD_EVALUATE_EXPR: ! { ! wxInt32 exprRef = 0; ! wxString buffer; ! if (debugSocket->ReadInt32(exprRef) && ! debugSocket->ReadString(buffer)) ! { ! debuggee->EvaluateExpr(exprRef, buffer); ! } ! break; ! } ! case wxLUASOCKET_DEBUGGER_CMD_CLEAR_DEBUG_REFERENCES: { debuggee->ClearReferences(); + break; } ! case wxLUASOCKET_DEBUGGER_CMD_RUN_BUFFER: ! break; // FIXME - not impemented ! default : ! wxFAIL_MSG(wxT("Invalid wxLuaSocketDebuggerCommands_Type in wxLuaDebugService::OnSocketEvent")); } } *************** *** 373,377 **** debuggee->Continue(); ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STOPDEBUGGER); wxLuaHandler::GetHandler().ProcessEvent(debugEvent); } --- 393,397 ---- debuggee->Continue(); ! wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_STOPDEBUGGER); wxLuaHandler::GetHandler().ProcessEvent(debugEvent); } *************** *** 435,439 **** if (!IsDebugger()) { ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_STARTDEBUGGER); // started debug process --- 455,459 ---- if (!IsDebugger()) { ! wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_STARTDEBUGGER); // started debug process *************** *** 454,458 **** { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUG_EVENT_BREAK); #if wxCHECK_VERSION(2,3,0) dSocket->WriteString(fileName.GetFullPath()); --- 474,478 ---- { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUGGEE_EVENT_BREAK); #if wxCHECK_VERSION(2,3,0) dSocket->WriteString(fileName.GetFullPath()); *************** *** 480,484 **** { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUG_EVENT_ERROR); dSocket->WriteString(errorMsg); --- 500,504 ---- { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUGGEE_EVENT_ERROR); dSocket->WriteString(errorMsg); *************** *** 501,505 **** { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUG_EVENT_ERROR); dSocket->WriteString(errorMsg); --- 521,525 ---- { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUGGEE_EVENT_ERROR); dSocket->WriteString(errorMsg); *************** *** 522,526 **** { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUG_EVENT_EXIT); if (!dSocket->Error()) --- 542,546 ---- { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUGGEE_EVENT_EXIT); if (!dSocket->Error()) *************** *** 542,546 **** { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUG_EVENT_STACK_ENUM); dSocket->WriteDebugData(debugData); --- 562,566 ---- { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUGGEE_EVENT_STACK_ENUM); dSocket->WriteDebugData(debugData); *************** *** 563,567 **** { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUG_EVENT_STACK_ENTRY_ENUM); dSocket->WriteInt32(entryRef); dSocket->WriteDebugData(debugData); --- 583,587 ---- { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUGGEE_EVENT_STACK_ENTRY_ENUM); dSocket->WriteInt32(entryRef); dSocket->WriteDebugData(debugData); *************** *** 585,589 **** { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUG_EVENT_TABLE_ENUM); dSocket->WriteLong(itemNode); dSocket->WriteDebugData(debugData); --- 605,609 ---- { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUGGEE_EVENT_TABLE_ENUM); dSocket->WriteLong(itemNode); dSocket->WriteDebugData(debugData); *************** *** 607,611 **** { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUG_EVENT_EVALUATE_EXPR); dSocket->WriteInt32(exprRef); dSocket->WriteString(strResult); --- 627,631 ---- { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUGGEE_EVENT_EVALUATE_EXPR); dSocket->WriteInt32(exprRef); dSocket->WriteString(strResult); *************** *** 631,635 **** { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUG_EVENT_BREAKPOINT_ADDED); #if wxCHECK_VERSION(2,3,0) dSocket->WriteString(breakPoint.GetFileName().GetFullPath()); --- 651,655 ---- { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUGGEE_EVENT_BREAKPOINT_ADDED); #if wxCHECK_VERSION(2,3,0) dSocket->WriteString(breakPoint.GetFileName().GetFullPath()); *************** *** 661,665 **** { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUG_EVENT_BREAKPOINT_REMOVED); #if wxCHECK_VERSION(2,3,0) dSocket->WriteString(breakPoint.GetFileName().GetFullPath()); --- 681,685 ---- { wxLuaDebugSocket* dSocket = m_debuggerSocketList[i]; ! dSocket->WriteByte(wxLUASOCKET_DEBUGGEE_EVENT_BREAKPOINT_REMOVED); #if wxCHECK_VERSION(2,3,0) dSocket->WriteString(breakPoint.GetFileName().GetFullPath()); *************** *** 769,774 **** // Events from Debug Service ! int debuggeeEvent = m_debuggerSocket->ReadByte(); ! HandleDebugEvent((wxLuaScoketDebugEvents_Type) debuggeeEvent); // Enable input events again. --- 789,795 ---- // Events from Debug Service ! unsigned char debuggeeEvent = 0; // wxLuaSocketDebuggeeEvents_Type ! if (m_debuggerSocket->ReadByte(debuggeeEvent)) ! HandleDebugEvent((wxLuaSocketDebuggeeEvents_Type) debuggeeEvent); // Enable input events again. *************** *** 1004,1010 **** // Notify Debuggee #if wxCHECK_VERSION(2,3,0) ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, lineNumber, fileName.GetFullPath()); #else ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED, lineNumber, fileName); #endif --- 1025,1031 ---- // Notify Debuggee #if wxCHECK_VERSION(2,3,0) ! wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED, lineNumber, fileName.GetFullPath()); #else ! wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED, lineNumber, fileName); #endif *************** *** 1030,1036 **** // Notify Debuggee #if wxCHECK_VERSION(2,3,0) ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, lineNumber, fileName.GetFullPath()); #else ! wxLuaDebugEvent debugEvent(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED, lineNumber, fileName); #endif wxLuaHandler::GetHandler().AddPendingEvent(debugEvent); --- 1051,1057 ---- // Notify Debuggee #if wxCHECK_VERSION(2,3,0) ! wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED, lineNumber, fileName.GetFullPath()); #else ! wxLuaDebuggerEvent debugEvent(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED, lineNumber, fileName); #endif wxLuaHandler::GetHandler().AddPendingEvent(debugEvent); Index: wxluasocket.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxluasocket.cpp 7 Sep 2006 22:42:19 -0000 1.4 --- wxluasocket.cpp 15 Sep 2006 00:10:56 -0000 1.5 *************** *** 21,50 **** // ------------------------------------------------------------------------------------------------- ! // Bind class wxLuaDebugServer // ------------------------------------------------------------------------------------------------- ! // Lua MetaTable Tag for Class 'wxLuaDebugServer' ! int s_wxluatag_wxLuaDebugServer = -1; ! // wxLuaDebugServer(int portNumber) ! static int LUACALL wxLua_wxLuaDebugServer_constructor(lua_State *L) { wxLuaState wxlState(L); ! wxLuaDebugServer *returns; // int portNumber int portNumber = (int)wxlState.GetNumberType(1); // call constructor ! returns = new wxLuaDebugServer(portNumber); // add to tracked memory list ! wxLua_AddToTrackedMemoryList(wxlState, (wxLuaDebugServer *)returns); // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxLuaDebugServer, returns); return 1; } ! // %override wxLua_wxLuaDebugServerCompile_constructor ! // %constructor wxLuaDebugServerCompile(const wxString &buffer, const wxString &fileName) ! static int LUACALL wxLua_wxLuaDebugServerCompile_constructor(lua_State *L) { wxLuaState wxlState(L); --- 21,50 ---- // ------------------------------------------------------------------------------------------------- ! // Bind class wxLuaDebuggerServer // ------------------------------------------------------------------------------------------------- ! // Lua MetaTable Tag for Class 'wxLuaDebuggerServer' ! int s_wxluatag_wxLuaDebuggerServer = -1; ! // 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 ! wxLua_AddToTrackedMemoryList(wxlState, (wxLuaDebuggerServer *)returns); // push the constructed class pointer ! wxlState.PushUserDataType(s_wxluatag_wxLuaDebuggerServer, returns); return 1; } ! // %override wxLua_wxLuaDebuggerServerCompile_constructor ! // %constructor wxLua_wxLuaDebuggerServerCompile_constructor(const wxString &buffer, const wxString &fileName) ! static int LUACALL wxLua_wxLuaDebuggerServerCompile_constructor(lua_State *L) { wxLuaState wxlState(L); *************** *** 63,72 **** // bool StartClient() ! static int LUACALL wxLua_wxLuaDebugServer_StartClient(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this ! wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call StartClient returns = self->StartClient(); --- 63,72 ---- // bool StartClient() ! static int LUACALL wxLua_wxLuaDebuggerServer_StartClient(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); // call StartClient returns = self->StartClient(); *************** *** 78,87 **** // bool StartServerThread() ! static int LUACALL wxLua_wxLuaDebugServer_StartServerThread(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this ! wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call StartServerThread returns = self->StartServerThread(); --- 78,87 ---- // bool StartServerThread() ! static int LUACALL wxLua_wxLuaDebuggerServer_StartServerThread(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); // call StartServerThread returns = self->StartServerThread(); *************** *** 93,97 **** // bool AddBreakPoint(const wxString &fileName, int lineNumber) ! static int LUACALL wxLua_wxLuaDebugServer_AddBreakPoint(lua_State *L) { wxLuaState wxlState(L); --- 93,97 ---- // bool AddBreakPoint(const wxString &fileName, int lineNumber) ! static int LUACALL wxLua_wxLuaDebuggerServer_AddBreakPoint(lua_State *L) { wxLuaState wxlState(L); *************** *** 102,106 **** const wxString fileName = lua2wx(wxlState.GetStringType(2)); // get this ! wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call AddBreakPoint returns = self->AddBreakPoint(fileName, lineNumber); --- 102,106 ---- const wxString fileName = lua2wx(wxlState.GetStringType(2)); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); // call AddBreakPoint returns = self->AddBreakPoint(fileName, lineNumber); *************** *** 112,116 **** // bool RemoveBreakPoint(const wxString &fileName, int lineNumber) ! static int LUACALL wxLua_wxLuaDebugServer_RemoveBreakPoint(lua_State *L) { wxLuaState wxlState(L); --- 112,116 ---- // bool RemoveBreakPoint(const wxString &fileName, int lineNumber) ! static int LUACALL wxLua_wxLuaDebuggerServer_RemoveBreakPoint(lua_State *L) { wxLuaState wxlState(L); *************** *** 121,125 **** const wxString fileName = lua2wx(wxlState.GetStringType(2)); // get this ! wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call RemoveBreakPoint returns = self->RemoveBreakPoint(fileName, lineNumber); --- 121,125 ---- const wxString fileName = lua2wx(wxlState.GetStringType(2)); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); // call RemoveBreakPoint returns = self->RemoveBreakPoint(fileName, lineNumber); *************** *** 131,140 **** // bool ClearAllBreakPoints() ! static int LUACALL wxLua_wxLuaDebugServer_ClearAllBreakPoints(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this ! wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call ClearAllBreakPoints returns = self->ClearAllBreakPoints(); --- 131,140 ---- // 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(); *************** *** 146,150 **** // bool Run(const wxString &file, const wxString &fileName) ! static int LUACALL wxLua_wxLuaDebugServer_Run(lua_State *L) { wxLuaState wxlState(L); --- 146,150 ---- // bool Run(const wxString &file, const wxString &fileName) ! static int LUACALL wxLua_wxLuaDebuggerServer_Run(lua_State *L) { wxLuaState wxlState(L); *************** *** 155,159 **** const wxString file = lua2wx(wxlState.GetStringType(2)); // get this ! wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call Run returns = self->Run(file, fileName); --- 155,159 ---- const wxString file = lua2wx(wxlState.GetStringType(2)); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); // call Run returns = self->Run(file, fileName); *************** *** 165,174 **** // bool Step() ! static int LUACALL wxLua_wxLuaDebugServer_Step(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this ! wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call Step returns = self->Step(); --- 165,174 ---- // 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(); *************** *** 180,189 **** // bool StepOver() ! static int LUACALL wxLua_wxLuaDebugServer_StepOver(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this ! wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call StepOver returns = self->StepOver(); --- 180,189 ---- // 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(); *************** *** 195,204 **** // bool StepOut() ! static int LUACALL wxLua_wxLuaDebugServer_StepOut(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this ! wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call StepOut returns = self->StepOut(); --- 195,204 ---- // 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(); *************** *** 210,219 **** // bool Continue() ! static int LUACALL wxLua_wxLuaDebugServer_Continue(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this ! wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call Continue returns = self->Continue(); --- 210,219 ---- // 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(); *************** *** 225,234 **** // bool Break() ! static int LUACALL wxLua_wxLuaDebugServer_Break(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this ! wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call Break returns = self->Break(); --- 225,234 ---- // 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(); *************** *** 240,249 **** // bool Reset() ! static int LUACALL wxLua_wxLuaDebugServer_Reset(lua_State *L) { wxLuaState wxlState(L); bool returns; // get this ! wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call Reset returns = self->Reset(); --- 240,249 ---- // bool Reset() ! 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(); *************** *** 255,259 **** // void DisplayStackDialog(wxWindow *pParent) ! static int LUACALL wxLua_wxLuaDebugServer_DisplayStackDialog(lua_State *L) { wxLuaState wxlState(L); --- 255,259 ---- // void DisplayStackDialog(wxWindow *pParent) ! static int LUACALL wxLua_wxLuaDebuggerServer_DisplayStackDialog(lua_State *L) { wxLuaState wxlState(L); *************** *** 261,265 **** wxWindow * pParent = (wxWindow *)wxlState.GetUserDataType(2, s_wxluatag_wxWindow); // get this ! wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call DisplayStackDialog self->DisplayStackDialog(pParent); --- 261,265 ---- 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); *************** *** 269,273 **** // bool EvaluateExpr(int exprRef, const wxString &expr) ! static int LUACALL wxLua_wxLuaDebugServer_EvaluateExpr(lua_State *L) { wxLuaState wxlState(L); --- 269,273 ---- // bool EvaluateExpr(int exprRef, const wxString &expr) ! static int LUACALL wxLua_wxLuaDebuggerServer_EvaluateExpr(lua_State *L) { wxLuaState wxlState(L); *************** *** 278,282 **** int exprRef = (int)wxlState.GetNumberType(2); // get this ! wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // call EvaluateExpr returns = self->EvaluateExpr(exprRef, expr); --- 278,282 ---- int exprRef = (int)wxlState.GetNumberType(2); // get this ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); // call EvaluateExpr returns = self->EvaluateExpr(exprRef, expr); *************** *** 287,294 **** } ! static int LUACALL wxLua_wxLuaDebugServer_destructor(lua_State *L) { wxLuaState wxlState(L); ! wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // remove from tracked memory list --- 287,294 ---- } ! static int LUACALL wxLua_wxLuaDebuggerServer_destructor(lua_State *L) { wxLuaState wxlState(L); ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); // remove from tracked memory list *************** *** 298,305 **** } ! static int LUACALL wxLua_wxLuaDebugServer_Delete(lua_State *L) { wxLuaState wxlState(L); ! wxLuaDebugServer * self = (wxLuaDebugServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugServer); // remove from tracked memory list if (self != 0) --- 298,305 ---- } ! static int LUACALL wxLua_wxLuaDebuggerServer_Delete(lua_State *L) { wxLuaState wxlState(L); ! wxLuaDebuggerServer * self = (wxLuaDebuggerServer *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerServer); // remove from tracked memory list if (self != 0) *************** *** 317,359 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxLuaDebugServer_methods[] = { ! { LuaConstructor, "wxLuaDebugServer", wxLua_wxLuaDebugServer_constructor, 1, 1, { &s_wxluaarg_Number, 0 } }, ! { LuaConstructor, "wxLuaDebugServerCompile", wxLua_wxLuaDebugServerCompile_constructor, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "StartClient", wxLua_wxLuaDebugServer_StartClient, 0, 0, { 0 } }, ! { LuaMethod, "StartServerThread", wxLua_wxLuaDebugServer_StartServerThread, 0, 0, { 0 } }, ! { LuaMethod, "AddBreakPoint", wxLua_wxLuaDebugServer_AddBreakPoint, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "RemoveBreakPoint", wxLua_wxLuaDebugServer_RemoveBreakPoint, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_Number, 0 } }, ! { LuaMethod, "ClearAllBreakPoints", wxLua_wxLuaDebugServer_ClearAllBreakPoints, 0, 0, { 0 } }, ! { LuaMethod, "Run", wxLua_wxLuaDebugServer_Run, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "Step", wxLua_wxLuaDebugServer_Step, 0, 0, { 0 } }, ! { LuaMethod, "StepOver", wxLua_wxLuaDebugServer_StepOver, 0, 0, { 0 } }, ! { LuaMethod, "StepOut", wxLua_wxLuaDebugServer_StepOut, 0, 0, { 0 } }, ! { LuaMethod, "Continue", wxLua_wxLuaDebugServer_Continue, 0, 0, { 0 } }, ! { LuaMethod, "Break", wxLua_wxLuaDebugServer_Break, 0, 0, { 0 } }, ! { LuaMethod, "Reset", wxLua_wxLuaDebugServer_Reset, 0, 0, { 0 } }, ! { LuaMethod, "DisplayStackDialog", wxLua_wxLuaDebugServer_DisplayStackDialog, 1, 1, { &s_wxluatag_wxWindow, 0 } }, ! { LuaMethod, "EvaluateExpr", wxLua_wxLuaDebugServer_EvaluateExpr, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! { LuaDelete, "wxLuaDebugServer", wxLua_wxLuaDebugServer_destructor, 0, 0, {0} }, ! { LuaMethod, "Delete", wxLua_wxLuaDebugServer_Delete, 0, 0, {0} }, }; // Extern accessor to class method map ! WXLUAMETHOD* wxLuaDebugServer_methods = s_wxLuaDebugServer_methods; ! int wxLuaDebugServer_methodCount = sizeof(s_wxLuaDebugServer_methods)/sizeof(s_wxLuaDebugServer_methods[0]); // ------------------------------------------------------------------------------------------------- ! // Bind class wxLuaDebugEvent // ------------------------------------------------------------------------------------------------- ! // Lua MetaTable Tag for Class 'wxLuaDebugEvent' ! int s_wxluatag_wxLuaDebugEvent = -1; // int GetLineNumber() const ! static int LUACALL wxLua_wxLuaDebugEvent_GetLineNumber(lua_State *L) { wxLuaState wxlState(L); int returns; // get this ! wxLuaDebugEvent * self = (wxLuaDebugEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugEvent); // call GetLineNumber returns = self->GetLineNumber(); --- 317,359 ---- // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxLuaDebuggerServer_methods[] = { ! { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, { &s_wxluaarg_Number, 0 } }, ! { LuaConstructor, "wxLuaDebuggerServerCompile", wxLua_wxLuaDebuggerServerCompile_constructor, 2, 2, { &s_wxluaarg_String, &s_wxluaarg_String, 0 } }, ! { LuaMethod, "StartClient", wxLua_wxLuaDebuggerServer_StartClient, 0, 0, { 0 } }, ! { LuaMethod, "StartServerThread", wxLua_wxLuaDebuggerServer_StartServerThread, 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, "DisplayStackDialog", wxLua_wxLuaDebuggerServer_DisplayStackDialog, 1, 1, { &s_wxluatag_wxWindow, 0 } }, ! { LuaMethod, "EvaluateExpr", wxLua_wxLuaDebuggerServer_EvaluateExpr, 2, 2, { &s_wxluaarg_Number, &s_wxluaarg_String, 0 } }, ! { LuaDelete, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_destructor, 0, 0, {0} }, ! { LuaMethod, "Delete", wxLua_wxLuaDebuggerServer_Delete, 0, 0, {0} }, }; // Extern accessor to class method map ! WXLUAMETHOD* wxLuaDebuggerServer_methods = s_wxLuaDebuggerServer_methods; ! int wxLuaDebuggerServer_methodCount = sizeof(s_wxLuaDebuggerServer_methods)/sizeof(s_wxLuaDebuggerServer_methods[0]); // ------------------------------------------------------------------------------------------------- ! // Bind class wxLuaDebuggerEvent // ------------------------------------------------------------------------------------------------- ! // Lua MetaTable Tag for Class 'wxLuaDebuggerEvent' ! 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(); *************** *** 365,374 **** // int GetReference() const ! static int LUACALL wxLua_wxLuaDebugEvent_GetReference(lua_State *L) { wxLuaState wxlState(L); int returns; // get this ! wxLuaDebugEvent * self = (wxLuaDebugEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugEvent); // call GetReference returns = self->GetReference(); --- 365,374 ---- // 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(); *************** *** 380,389 **** // wxString GetFileName() const ! static int LUACALL wxLua_wxLuaDebugEvent_GetFileName(lua_State *L) { wxLuaState wxlState(L); wxString returns; // get this ! wxLuaDebugEvent * self = (wxLuaDebugEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugEvent); // call GetFileName returns = self->GetFileName(); --- 380,389 ---- // 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(); *************** *** 395,404 **** // wxString GetMessage() const ! static int LUACALL wxLua_wxLuaDebugEvent_GetMessage(lua_State *L) { wxLuaState wxlState(L); wxString returns; // get this ! wxLuaDebugEvent * self = (wxLuaDebugEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugEvent); // call GetMessage returns = self->GetMessage(); --- 395,404 ---- // wxString GetMessage() const ! 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(); *************** *** 409,416 **** } ! static int LUACALL wxLua_wxLuaDebugEvent_destructor(lua_State *L) { wxLuaState wxlState(L); ! wxLuaDebugEvent * self = (wxLuaDebugEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugEvent); // remove from tracked memory list --- 409,416 ---- } ! static int LUACALL wxLua_wxLuaDebuggerEvent_destructor(lua_State *L) { wxLuaState wxlState(L); ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); // remove from tracked memory list *************** *** 420,427 **** } ! static int LUACALL wxLua_wxLuaDebugEvent_Delete(lua_State *L) { wxLuaState wxlState(L); ! wxLuaDebugEvent * self = (wxLuaDebugEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebugEvent); // remove from tracked memory list if (self != 0) --- 420,427 ---- } ! static int LUACALL wxLua_wxLuaDebuggerEvent_Delete(lua_State *L) { wxLuaState wxlState(L); ! wxLuaDebuggerEvent * self = (wxLuaDebuggerEvent *)wxlState.GetUserDataType(1, s_wxluatag_wxLuaDebuggerEvent); // remove from tracked memory list if (self != 0) *************** *** 439,453 **** // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_wxLuaDebugEvent_methods[] = { ! { LuaMethod, "GetLineNumber", wxLua_wxLuaDebugEvent_GetLineNumber, 0, 0, { 0 } }, ! { LuaMethod, "GetReference", wxLua_wxLuaDebugEvent_GetReference, 0, 0, { 0 } }, ! { LuaMethod, "GetFileName", wxLua_wxLuaDebugEvent_GetFileName, 0, 0, { 0 } }, ! { LuaMethod, "GetMessage", wxLua_wxLuaDebugEvent_GetMessage, 0, 0, { 0 } }, ! { LuaDelete, "wxLuaDebugEvent", wxLua_wxLuaDebugEvent_destructor, 0, 0, {0} }, ! { LuaMethod, "Delete", wxLua_wxLuaDebugEvent_Delete, 0, 0, {0} }, }; // Extern accessor to class method map ! WXLUAMETHOD* wxLuaDebugEvent_methods = s_wxLuaDebugEvent_methods; ! int wxLuaDebugEvent_methodCount = sizeof(s_wxLuaDebugEvent_methods)/sizeof(s_wxLuaDebugEvent_methods[0]); --- 439,453 ---- // Map Lua Class Methods to C Binding Functions ! static WXLUAMETHOD s_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} }, }; // Extern accessor to class method map ! WXLUAMETHOD* wxLuaDebuggerEvent_methods = s_wxLuaDebuggerEvent_methods; ! int wxLuaDebuggerEvent_methodCount = sizeof(s_wxLuaDebuggerEvent_methods)/sizeof(s_wxLuaDebuggerEvent_methods[0]); Index: wxluasocket_bind.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** wxluasocket_bind.cpp 7 Sep 2006 22:42:19 -0000 1.4 --- wxluasocket_bind.cpp 15 Sep 2006 00:10:56 -0000 1.5 *************** *** 28,40 **** static WXLUAEVENT eventList[] = { ! { &wxEVT_WXLUA_DEBUG_BREAK, "wxEVT_WXLUA_DEBUG_BREAK", &s_wxluatag_wxLuaDebugEvent }, ! { &wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED, "wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED", &s_wxluatag_wxLuaDebugEvent }, ! { &wxEVT_WXLUA_DEBUG_ERROR, "wxEVT_WXLUA_DEBUG_ERROR", &s_wxluatag_wxLuaDebugEvent }, ! { &wxEVT_WXLUA_DEBUG_EVALUATE_EXPR, "wxEVT_WXLUA_DEBUG_EVALUATE_EXPR", &s_wxluatag_wxLuaDebugEvent }, ! { &wxEVT_WXLUA_DEBUG_EXIT, "wxEVT_WXLUA_DEBUG_EXIT", &s_wxluatag_wxLuaDebugEvent }, ! { &wxEVT_WXLUA_DEBUG_PRINT, "wxEVT_WXLUA_DEBUG_PRINT", &s_wxluatag_wxLuaDebugEvent }, ! { &wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM, "wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM", &s_wxluatag_wxLuaDebugEvent }, ! { &wxEVT_WXLUA_DEBUG_STACK_ENUM, "wxEVT_WXLUA_DEBUG_STACK_ENUM", &s_wxluatag_wxLuaDebugEvent }, ! { &wxEVT_WXLUA_DEBUG_TABLE_ENUM, "wxEVT_WXLUA_DEBUG_TABLE_ENUM", &s_wxluatag_wxLuaDebugEvent }, { 0, 0, 0 }, --- 28,40 ---- static WXLUAEVENT eventList[] = { ! { &wxEVT_WXLUA_DEBUGGER_BREAK, "wxEVT_WXLUA_DEBUGGER_BREAK", &s_wxluatag_wxLuaDebuggerEvent }, ! { &wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED, "wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED", &s_wxluatag_wxLuaDebuggerEvent }, ! { &wxEVT_WXLUA_DEBUGGER_ERROR, "wxEVT_WXLUA_DEBUGGER_ERROR", &s_wxluatag_wxLuaDebuggerEvent }, ! { &wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR, "wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR", &s_wxluatag_wxLuaDebuggerEvent }, ! { &wxEVT_WXLUA_DEBUGGER_EXIT, "wxEVT_WXLUA_DEBUGGER_EXIT", &s_wxluatag_wxLuaDebuggerEvent }, ! { &wxEVT_WXLUA_DEBUGGER_PRINT, "wxEVT_WXLUA_DEBUGGER_PRINT", &s_wxluatag_wxLuaDebuggerEvent }, ! { &wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM, "wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM", &s_wxluatag_wxLuaDebuggerEvent }, ! { &wxEVT_WXLUA_DEBUGGER_STACK_ENUM, "wxEVT_WXLUA_DEBUGGER_STACK_ENUM", &s_wxluatag_wxLuaDebuggerEvent }, ! { &wxEVT_WXLUA_DEBUGGER_TABLE_ENUM, "wxEVT_WXLUA_DEBUGGER_TABLE_ENUM", &s_wxluatag_wxLuaDebuggerEvent }, { 0, 0, 0 }, *************** *** 127,132 **** static WXLUACLASS classList[] = { ! { "wxLuaDebugEvent", wxLuaDebugEvent_methods, wxLuaDebugEvent_methodCount, -1, CLASSINFO(wxLuaDebugEvent), &s_wxluatag_wxLuaDebugEvent, "wxEvent" }, ! { "wxLuaDebugServer", wxLuaDebugServer_methods, wxLuaDebugServer_methodCount, -1, NULL, &s_wxluatag_wxLuaDebugServer, NULL }, { 0, 0, 0, 0, 0, 0, 0 }, }; --- 127,132 ---- static WXLUACLASS classList[] = { ! { "wxLuaDebuggerEvent", wxLuaDebuggerEvent_methods, wxLuaDebuggerEvent_methodCount, -1, CLASSINFO(wxLuaDebuggerEvent), &s_wxluatag_wxLuaDebuggerEvent, "wxEvent" }, ! { "wxLuaDebuggerServer", wxLuaDebuggerServer_methods, wxLuaDebuggerServer_methodCount, -1, NULL, &s_wxluatag_wxLuaDebuggerServer, NULL }, { 0, 0, 0, 0, 0, 0, 0 }, }; Index: wxldserv.cpp =================================================================== RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxldserv.cpp,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** wxldserv.cpp 13 Sep 2006 04:13:48 -0000 1.19 --- wxldserv.cpp 15 Sep 2006 00:10:56 -0000 1.20 *************** *** 1,4 **** ///////////////////////////////////////////////////////////////////////////// ! // Name: wxLuaDebugServer.cpp // Purpose: Provide remote debugging support for wxLua. // Author: J. Winwood --- 1,4 ---- ///////////////////////////////////////////////////////////////////////////// ! // Name: wxLuaDebuggerServer.cpp // Purpose: Provide remote debugging support for wxLua. // Author: J. Winwood *************** *** 32,84 **** // ---------------------------------------------------------------------------- ! // wxLuaDebugEvent // ---------------------------------------------------------------------------- ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_CLIENT_CONNECTED) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_BREAK) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_PRINT) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_ERROR) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_EXIT) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_STACK_ENUM) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_STACK_ENTRY_ENUM) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_TABLE_ENUM) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_EVALUATE_EXPR) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_STARTDEBUGGER) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_STOPDEBUGGER) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_BREAKPOINT_ADDED) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUG_BREAKPOINT_REMOVED) ! IMPLEMENT_DYNAMIC_CLASS(wxLuaDebugEvent, wxEvent) ! wxLuaDebugEvent::wxLuaDebugEvent(const wxLuaDebugEvent& event) ! :wxEvent(event) { - m_lineNumber = event.m_lineNumber; - m_fileName = event.m_fileName; - m_strMessage = event.m_strMessage; - m_fHasMessage = event.m_fHasMessage; - m_nReference = event.m_nReference; - m_fEnabledFlag = event.m_fEnabledFlag; - SetDebugData(event.GetReference(), event.GetDebugData().Copy()); } ! wxLuaDebugEvent::wxLuaDebugEvent(int eventType, int lineNumber, const wxString &file, bool enabledFlag) { - SetEventType(eventType); - - m_lineNumber = lineNumber; - m_fileName = file; - m_fHasMessage = false; - m_nReference = -1; - m_fEnabledFlag = enabledFlag; } ! wxLuaDebugEvent::~wxLuaDebugEvent() { } ! void wxLuaDebugEvent::SetMessage(const wxString &pMessage) { m_strMessage = pMessage; --- 32,82 ---- // ---------------------------------------------------------------------------- ! // wxLuaDebuggerEvent // ---------------------------------------------------------------------------- ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_CLIENT_CONNECTED) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_BREAK) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_PRINT) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_ERROR) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_EXIT) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_STACK_ENUM) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_TABLE_ENUM) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_EVALUATE_EXPR) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_STARTDEBUGGER) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_STOPDEBUGGER) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_ADDED) ! DEFINE_EVENT_TYPE(wxEVT_WXLUA_DEBUGGER_BREAKPOINT_REMOVED) ! IMPLEMENT_DYNAMIC_CLASS(wxLuaDebuggerEvent, wxEvent) ! wxLuaDebuggerEvent::wxLuaDebuggerEvent(const wxLuaDebuggerEvent& event) ! :wxEvent(event), ! m_lineNumber(event.m_lineNumber), ! m_fileName(event.m_fileName), ! m_strMessage(event.m_strMessage), ! m_fHasMessage(event.m_fHasMessage), ! m_nReference(event.m_nReference), ! m_fEnabledFlag(event.m_fEnabledFlag) { SetDebugData(event.GetReference(), event.GetDebugData().Copy()); } ! wxLuaDebuggerEvent::wxLuaDebuggerEvent(wxEventType eventType, int lineNumber, const wxString &file, bool enabledFlag) + :wxEvent(0, eventType), + m_lineNumber(lineNumber), + m_fileName(file), + m_fHasMessage(false), + m_nReference(-1), + m_fEnabledFlag(enabledFlag) { } ! wxLuaDebuggerEvent::~wxLuaDebuggerEvent() { } ! void wxLuaDebuggerEvent::SetMessage(const wxString &pMessage) { m_strMessage = pMessage; *************** *** 86,90 **** } ! void wxLuaDebugEvent::SetDebugData(long nReference, const wxLuaDebugData& debugData) { m_nReference = nReference; --- 84,88 ---- } ! void wxLuaDebuggerEvent::SetDebugData(long nReference, const wxLuaDebugData& debugData) { m_nReference = nReference; *************** *** 93,100 **** // ---------------------------------------------------------------------------- ! // wxLuaDebugServerInterface // ---------------------------------------------------------------------------- ! wxLuaDebugServerInterface::wxLuaDebugServerInterface(wxLuaDebugServer* server) :wxLuaInterface(wxNullLuaState) { --- 91,98 ---- // ---------------------------------------------------------------------------- ! // wxLuaDebuggerServerInterface // ---------------------------------------------------------------------------- ! wxLuaDebuggerServerInterface::wxLuaDebuggerServerInterface(wxLuaDebuggerServer* server) :wxLuaInterface(wxNullLuaState) { *************** *** 102,106 **** } ! wxLuaDebugServerInterface::~wxLuaDebugServerInterface() { if (m_pServer != NULL) --- 100,104 ---- } ! wxLuaDebuggerServerInterface::~wxLuaDebuggerServerInterface() { if (m_pServer != NULL) *************** *** 111,115 **** } ! wxLuaDebugData wxLuaDebugServerInterface::EnumerateStack() { m_pServer->EnumerateStack(); --- 109,113 ---- } ! wxLuaDebugData wxLuaDebuggerServerInterface::EnumerateStack() { m_pServer->EnumerateStack(); *************** *** 117,121 **** } ! wxLuaDebugData wxLuaDebugServerInterface::EnumerateStackEntry(int nEntry) { m_pServer->EnumerateStackEntry(nEntry); --- 115,119 ---- } ! wxLuaDebugData wxLuaDebuggerServerInterface::EnumerateStackEntry(int nEntry) { m_pServer->EnumerateStackEntry(nEntry); *************** *** 123,127 **** } ! wxLuaDebugData wxLuaDebugServerInterface::EnumerateTable(int nRef, int nEntry, long data) { m_pServer->EnumerateTable(nRef, nEntry, data); --- 121,125 ---- } ! wxLuaDebugData wxLuaDebuggerServerInterface::EnumerateTable(int nRef, int nEntry, long data) { m_pServer->EnumerateTable(nRef, nEntry, data); *************** *** 129,133 **** } ! wxLuaDebugData wxLuaDebugServerInterface::GetGlobalData() { return wxLuaDebugData(); --- 127,131 ---- } ! wxLuaDebugData wxLuaDebuggerServerInterface::GetGlobalData() { return wxLuaDebugData(); *************** *** 147,151 **** { if (GetSocketBase()->IsConnected() && ! GetSocketBase()->WriteByte(wxLUASOCKET_DEBUG_CMD_ADD_BREAKPOINT) && GetSocketBase()->WriteString(fileName) && GetSocketBase()->WriteInt32(lineNumber)) --- 145,149 ---- { if (GetSocketBase()->IsConnected() && ! GetSocketBase()->WriteByte(wxLUASOCKET_DEBUGGER_CMD_ADD_BREAKPOINT) && GetSocketBase()->WriteString(fileName) && GetSocketBase()->WriteInt32(lineNumber)) *************** *** 168,172 **** { if (GetSocketBase()->IsConnected() && ! GetSocketBase()->WriteByte(wxLUASOCKET_DEBUG_CMD_REMOVE_BREAKPOINT) && GetSocketBase()->WriteString(fileName) && GetSocketBase()->WriteInt32(lineNumber)) --- 166,170 ---- { if (GetSocketBase()->IsConnected() && ! GetSocketBase()->WriteByte(wxLUASOCKET_DEBUGGER_CMD_REMOVE_BREAKPOINT) && GetSocketBase()->WriteString(fileName) && GetSocketBase()->WriteInt32(lineNumber)) *************** *** 188,192 **** try { ! if (GetSocketBase()->WriteByte(wxLUASOCKET_DEBUG_CMD_DISABLE_BREAKPOINT) && GetSocketBase()->WriteString(fileName) && GetSocketBase()->WriteInt32(lineNumber)) --- 186,190 ---- try { ! if (GetSocketBase()->WriteByte(wxLUASOCKET_DEBUGGER_CMD_DISABLE_BREAKPOINT) && GetSocketBase()->WriteString(fileName) && GetSocketBase()->WriteInt32(lineNumber)) *************** *** 208,212 **** try { ! if (GetSocketBase()->WriteByte(wxLUASOCKET_DEBUG_CMD_ENABLE_BREAKPOINT) && GetSocketBase()->WriteString(fileName) && GetSocketBase()->WriteInt32(lineNumber)) --- 206,210 ---- try { ! if (GetSocketBase()->WriteByte(wxLUASOCKET_DEBUGGER_CMD_ENABLE_BREAKPOINT) && GetSocketBase()->WriteString(fileName) && GetSocketBase()->WriteInt32(lineNumber)) *************** *** 229,233 **** { if (GetSocketBase()->IsConnected() && ! GetSocketBase()->WriteByte(wxLUASOCKET_DEBUG_CMD_CLEAR_ALL_BREAKPOINTS)) { return true; --- 227,231 ---- { if (GetSocketBase()->IsConnected() && ! GetSocketBase()->WriteByte(wxLUASOCKET_DEBUGGER_CMD_CLEAR_ALL_BREAKPOINTS)) { return true; *************** *** 247,251 **** try { ! if (GetSocketBase()->WriteByte(wxLUASOCKET_DEBUG_CMD_RUN_BUFFER) && GetSocketBase()->WriteString(fileName) && GetSocketBase()->WriteString(buffer)) --- 245,249 ---- try { ! if (GetSocketBase()->WriteByte(wxLUASOCKET_DEBUGGER_CMD_RUN_BUFFER) && GetSocketBase()->WriteString(fileName) && GetSocketBase()->WriteString(buffer)) *************** *** 267,271 **** try { ! return GetSocketBase()->WriteByte(wxLUASOCKET_DEBUG_CMD_DEBUG_STEP); } catch(wxLuaSocketException &) --- 265,269 ---- try { ! return GetSocketBase()->WriteByte(wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEP); } catch(wxLuaSocketException &) *************** *** 282,286 **** try { ! return GetSocketBase()->WriteByte(wxLUASOCKET_DEBUG_CMD_DEBUG_STEPOVER); } catch(wxLuaSocketException &) --- 280,284 ---- try { ! return GetSocketBase()->WriteByte(wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEPOVER); } catch(wxLuaSocketException &) *************** *** 297,301 **** try { ! return GetSocketBase()->WriteByte(wxLUASOCKET_DEBUG_CMD_DEBUG_STEPOUT); } catch(wxLuaSocketException &) --- 295,299 ---- try { ! return GetSocketBase()->WriteByte(wxLUASOCKET_DEBUGGER_CMD_DEBUG_STEPOUT); } catch(wxLuaSocketException &) *************** *** 312,316 **** try { ! return GetSocketBase()->WriteByte(wxLUASOCKET_DEBUG_CMD_DEBUG_CONTINUE); } catch(wxLuaSocketException &) --- 310,314 ---- try { ! return GetSocketBase()->WriteByte(wxLUASOCKET_DEBUGGER_CMD_DEBUG_CONTINUE); } catch(wxLuaSocketException &) *************** *** 327,331 **** try { ! return GetSocketBase()->WriteByte(wxLUASOCKET_DEBUG_CMD_DEBUG_BREAK); } catch(wxLuaSocketException &) --- 325,329 ---- try { ! return GetSocketBase()->WriteByte(wxLUASOCKET_DEBUGGER_CMD_DEBUG_BREAK); } catch(wxLuaSocketException &) *************** *** 342,346 **** try { ! return GetSocketBase()->WriteByte(wxLUASOCKET_DEBUG_CMD_RESET); } catch(wxLuaSocketException &) --- 340,344 ---- try { ! return GetSocketBase()->WriteByte(wxLUASOCKET_DEBUGGER_CMD_RESET); } catch(wxLuaSocketException &) *************** *** 357,361 **** try { ! return GetSocketBas... [truncated message content] |
