Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24710/wxLua/modules/wxluasocket/include
Modified Files:
dservice.h wxldserv.h wxldtarg.h
Log Message:
Make wxLuaDebugData have functions to BuildStack, BuildStackList, BuildTableList
These replace the same functions in wxLuaInterface
Replaces EnumerateStack, EnumerateStackEntry, EnumerateTable in wxLuaTarget and wxLuaDebugee
moved helper functions MakeNumber, MakeBoolean, GetTableInfo, GetUserDataInfo as well
Index: wxldserv.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldserv.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxldserv.h 29 Nov 2005 05:45:10 -0000 1.3
--- wxldserv.h 1 Dec 2005 06:43:53 -0000 1.4
***************
*** 28,38 ****
// ----------------------------------------------------------------------------
! // wxLuaThread
// ----------------------------------------------------------------------------
! class WXDLLIMPEXP_WXLUA wxLuaThread : public wxThread
{
public:
! wxLuaThread(wxLuaDebugServer *pServer) : wxThread(wxTHREAD_JOINABLE)
{
m_pServer = pServer;
--- 28,38 ----
// ----------------------------------------------------------------------------
! // wxLuaDebugServerThread - a wxThread for the wxLuaDebugServer
// ----------------------------------------------------------------------------
! class WXDLLIMPEXP_WXLUA wxLuaDebugServerThread : public wxThread
{
public:
! wxLuaDebugServerThread(wxLuaDebugServer *pServer) : wxThread(wxTHREAD_JOINABLE)
{
m_pServer = pServer;
***************
*** 51,55 ****
// ----------------------------------------------------------------------------
! // wxLuaDebugServer
// ----------------------------------------------------------------------------
--- 51,56 ----
// ----------------------------------------------------------------------------
! // wxLuaDebugServer - a socket server for a lua program to communicate with a
! // wxLuaDebugTarget run in C++.
// ----------------------------------------------------------------------------
***************
*** 95,99 ****
int m_portNumber;
wxProcess *m_pProcess;
! wxLuaThread *m_pThread;
wxLuaStackFrame *m_pStackFrameDialog;
bool m_fShutdown;
--- 96,100 ----
int m_portNumber;
wxProcess *m_pProcess;
! wxLuaDebugServerThread *m_pThread;
wxLuaStackFrame *m_pStackFrameDialog;
bool m_fShutdown;
Index: wxldtarg.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/wxldtarg.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** wxldtarg.h 30 Nov 2005 04:46:17 -0000 1.3
--- wxldtarg.h 1 Dec 2005 06:43:53 -0000 1.4
***************
*** 25,29 ****
// ----------------------------------------------------------------------------
! // wxLuaDebugTarget - Handles Debugger/Debuggee IO
// ----------------------------------------------------------------------------
--- 25,30 ----
// ----------------------------------------------------------------------------
! // wxLuaDebugTarget - a C++ socket target that the wxLuaDebugServer run in lua
! // communicates with. Handles the Debugger/Debuggee IO
// ----------------------------------------------------------------------------
***************
*** 149,154 ****
wxString GetTableInfo(int index);
wxString GetUserDataInfo(int index, bool full = true);
- wxString MakeBoolean(int num);
- wxString MakeNumber(double dnum);
wxString GetDebugInfo(int &lineNumber) const;
--- 150,153 ----
Index: dservice.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/include/dservice.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** dservice.h 25 Nov 2005 19:45:36 -0000 1.4
--- dservice.h 1 Dec 2005 06:43:53 -0000 1.5
***************
*** 185,189 ****
public:
wxLuaDebuggee(wxLuaDebugService * debugService, lua_State *state);
! ~wxLuaDebuggee();
void AddBreakPoint(const wxFileName &fileName, int lineNumber);
--- 185,189 ----
public:
wxLuaDebuggee(wxLuaDebugService * debugService, lua_State *state);
! virtual ~wxLuaDebuggee();
void AddBreakPoint(const wxFileName &fileName, int lineNumber);
***************
*** 206,210 ****
wxLuaDebugService* m_debugService;
! lua_State *m_luaState;
LuaBreakPointList m_breakPointList;
--- 206,210 ----
wxLuaDebugService* m_debugService;
! wxLuaState m_wxlState;
LuaBreakPointList m_breakPointList;
***************
*** 246,255 ****
wxString GetTableInfo(int index);
wxString GetUserDataInfo(int index, bool full = true);
- wxString MakeBoolean(int num);
- wxString MakeNumber(double dnum);
wxFileName GetDebugInfo(int &lineNumber) const;
-
// Debug Events from Lua Interpreter
static void LUACALL LuaDebugHook(lua_State *state, lua_Debug *debug);
--- 246,252 ----
***************
*** 268,272 ****
public:
wxLuaDebugService(int portNumber = PORT_LUADEBUG);
! ~wxLuaDebugService();
// Start Service
--- 265,269 ----
public:
wxLuaDebugService(int portNumber = PORT_LUADEBUG);
! virtual ~wxLuaDebugService();
// Start Service
***************
*** 326,330 ****
public:
wxLuaDebugger();
! ~wxLuaDebugger();
bool Connect(const wxString& hostname = wxT("localhost"), int portNumber = PORT_LUADEBUG);
--- 323,327 ----
public:
wxLuaDebugger();
! virtual ~wxLuaDebugger();
bool Connect(const wxString& hostname = wxT("localhost"), int portNumber = PORT_LUADEBUG);
|
