Update of /cvsroot/wxlua/wxLua/samples
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv29706/wxLua/samples
Modified Files:
editor.wx.lua
Log Message:
check return values of debuger server to exit more gracefully on failure
move port number into wxLuaDebuggerBase
Index: editor.wx.lua
===================================================================
RCS file: /cvsroot/wxlua/wxLua/samples/editor.wx.lua,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** editor.wx.lua 4 Oct 2006 05:55:03 -0000 1.30
--- editor.wx.lua 4 Oct 2006 22:07:23 -0000 1.31
***************
*** 1523,1531 ****
frame:Connect(ID_ATTACH_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED,
function (event)
debugServer = wx.wxLuaDebuggerServer(portNumber)
if debugServer then
! debugServer:StartServerThread()
end
- DisplayOutput("Waiting for client connect. Start client with wxLua -d"..wx.wxGetHostName()..":"..portNumber.."\n")
portNumber = portNumber + 1
end)
--- 1523,1536 ----
frame:Connect(ID_ATTACH_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED,
function (event)
+ local ok = false
debugServer = wx.wxLuaDebuggerServer(portNumber)
if debugServer then
! ok = debugServer:StartServer()
! end
! if ok then
! DisplayOutput("Waiting for client connect. Start client with wxLua -d"..wx.wxGetHostName()..":"..portNumber.."\n")
! else
! DisplayOutput("Unable to create debugger server.\n")
end
portNumber = portNumber + 1
end)
***************
*** 1540,1543 ****
--- 1545,1554 ----
if not debugServer then return nil end
+ local ok = debugServer:StartServer()
+ if not ok then
+ debugServer:Delete()
+ return nil
+ end
+
function DownloadBreakpoints(editor, fileName)
local nextLine = editor:MarkerNext(0, BREAKPOINT_MARKER_VALUE)
***************
*** 1694,1703 ****
frame:Connect(ID_START_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED,
function (event)
debugServer = CreateDebugServer()
if debugServer then
! debugServer:StartClient()
SetAllEditorsReadOnly(true)
end
! DisplayOutput("Waiting for client connection.\n")
portNumber = portNumber + 1
end)
--- 1705,1721 ----
frame:Connect(ID_START_DEBUG, wx.wxEVT_COMMAND_MENU_SELECTED,
function (event)
+ local ok = false
debugServer = CreateDebugServer()
if debugServer then
! ok = debugServer:StartClient()
SetAllEditorsReadOnly(true)
end
!
! if debugServer and ok then
! DisplayOutput("Waiting for client connection.\n")
! else
! DisplayOutput("Unable to create debugger server.\n"..tostring(debugServer)..tostring(ok))
! end
!
portNumber = portNumber + 1
end)
|
