[Wxlua-commit] wxLua/apps/wxlua/src editor.h, 1.16, 1.17 wxlua.cpp, 1.34, 1.35 wxlua.h, 1.18, 1.19

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/wxlua/wxLua/apps/wxlua/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv23109/wxLua/apps/wxlua/src

Modified Files:
	editor.h wxlua.cpp wxlua.h 
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: wxlua.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** wxlua.cpp	7 Sep 2006 04:20:53 -0000	1.34
--- wxlua.cpp	15 Sep 2006 00:10:55 -0000	1.35
***************
*** 141,147 ****
      EVT_LUA_DEBUG_HOOK  (wxID_ANY, wxLuaStandaloneApp::OnLua)
  
!     EVT_WXLUA_DEBUG_STACK_ENUM(      wxLuaStandaloneApp::OnDebugStackEnum)
!     EVT_WXLUA_DEBUG_STACK_ENTRY_ENUM(wxLuaStandaloneApp::OnDebugStackEntryEnum)
!     EVT_WXLUA_DEBUG_TABLE_ENUM(      wxLuaStandaloneApp::OnDebugTableEnum)
  END_EVENT_TABLE()
  
--- 141,147 ----
      EVT_LUA_DEBUG_HOOK  (wxID_ANY, wxLuaStandaloneApp::OnLua)
  
!     EVT_WXLUA_DEBUGGER_STACK_ENUM(      wxLuaStandaloneApp::OnDebugStackEnum)
!     EVT_WXLUA_DEBUGGER_STACK_ENTRY_ENUM(wxLuaStandaloneApp::OnDebugStackEntryEnum)
!     EVT_WXLUA_DEBUGGER_TABLE_ENUM(      wxLuaStandaloneApp::OnDebugTableEnum)
  END_EVENT_TABLE()
  
***************
*** 166,171 ****
      //  to be able to start a new instance when running a lua program.
      m_programName = argv[0];
!     wxLuaDebugServer::SetProgramName(argv[0]);
!     wxLuaDebugServer::SetNetworkName(wxGetHostName());
  
      wxInitAllImageHandlers();
--- 166,171 ----
      //  to be able to start a new instance when running a lua program.
      m_programName = argv[0];
!     wxLuaDebuggerServer::SetProgramName(argv[0]);
!     wxLuaDebuggerServer::SetNetworkName(wxGetHostName());
  
      wxInitAllImageHandlers();
***************
*** 215,219 ****
              if (parser.Found(wxT("d"), &value))
              {
!                 // wxLuaDebugServer::StartClient() runs wxExecute(m_programName -d[host]:[port], ...)
  
                  // Set up for debugging
--- 215,219 ----
              if (parser.Found(wxT("d"), &value))
              {
!                 // wxLuaDebuggerServer::StartClient() runs wxExecute(m_programName -d[host]:[port], ...)
  
                  // Set up for debugging
***************
*** 411,415 ****
  }
  
! void wxLuaStandaloneApp::OnDebugStackEnum(wxLuaDebugEvent &event)
  {
      if (wxLuaHandler::GetHandler().GetStackDialog() != NULL)
--- 411,415 ----
  }
  
! void wxLuaStandaloneApp::OnDebugStackEnum(wxLuaDebuggerEvent &event)
  {
      if (wxLuaHandler::GetHandler().GetStackDialog() != NULL)
***************
*** 419,423 ****
  }
  
! void wxLuaStandaloneApp::OnDebugStackEntryEnum(wxLuaDebugEvent &event)
  {
      if (wxLuaHandler::GetHandler().GetStackDialog() != NULL)
--- 419,423 ----
  }
  
! void wxLuaStandaloneApp::OnDebugStackEntryEnum(wxLuaDebuggerEvent &event)
  {
      if (wxLuaHandler::GetHandler().GetStackDialog() != NULL)
***************
*** 427,431 ****
  }
  
! void wxLuaStandaloneApp::OnDebugTableEnum(wxLuaDebugEvent &event)
  {
      if (wxLuaHandler::GetHandler().GetStackDialog() != NULL)
--- 427,431 ----
  }
  
! void wxLuaStandaloneApp::OnDebugTableEnum(wxLuaDebuggerEvent &event)
  {
      if (wxLuaHandler::GetHandler().GetStackDialog() != NULL)

Index: wxlua.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/wxlua.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** wxlua.h	7 Sep 2006 04:20:53 -0000	1.18
--- wxlua.h	15 Sep 2006 00:10:55 -0000	1.19
***************
*** 23,27 ****
  class WXDLLIMPEXP_WXLUA wxLuaEvent;
  class WXDLLIMPEXP_WXLUADEBUG wxLuaStackDialog;
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebugEvent;
  class LuaHandler;
  
--- 23,27 ----
  class WXDLLIMPEXP_WXLUA wxLuaEvent;
  class WXDLLIMPEXP_WXLUADEBUG wxLuaStackDialog;
! class WXDLLIMPEXP_WXLUASOCKET wxLuaDebuggerEvent;
  class LuaHandler;
  
***************
*** 48,54 ****
  
      void OnLua(wxLuaEvent &event);
!     void OnDebugStackEnum(wxLuaDebugEvent &event);
!     void OnDebugTableEnum(wxLuaDebugEvent &event);
!     void OnDebugStackEntryEnum(wxLuaDebugEvent &event);
  
      wxString          m_programName;
--- 48,54 ----
  
      void OnLua(wxLuaEvent &event);
!     void OnDebugStackEnum(wxLuaDebuggerEvent &event);
!     void OnDebugTableEnum(wxLuaDebuggerEvent &event);
!     void OnDebugStackEntryEnum(wxLuaDebuggerEvent &event);
  
      wxString          m_programName;

Index: editor.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/apps/wxlua/src/editor.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** editor.h	7 Sep 2006 04:20:53 -0000	1.16
--- editor.h	15 Sep 2006 00:10:55 -0000	1.17
***************
*** 9,14 ****
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 71959;
! const unsigned char wxLuaEditor[71960] = {
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10,
--- 9,14 ----
  extern const unsigned char wxLuaEditor[];
  
! const size_t wxLuaEditor_len = 71989;
! const unsigned char wxLuaEditor[71990] = {
   45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 45, 61, 45, 45, 45, 10,
   45, 45, 32, 78, 97,109,101, 58, 32, 32, 32, 32, 32, 32, 32, 32, 69,100,105,116,111,114, 46,119,120, 46,108,117, 97, 10,
***************
*** 85,89 ****
  102, 72, 97,118,101, 70,111,117,110,100, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,114,117,101, 32,119,104,101,110, 32,115,116,114,105,110,103, 32,104, 97,115, 32, 98,101,101,110, 32,102,111,117,110,100, 10,
  101,100,105,116,111,114, 65,112,112, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32,119,120, 46,119,120, 71,101,116, 65,112,112, 40, 41, 10,
! 100,101, 98,117,103, 83,101,114,118,101,114, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,119,120, 76,117, 97, 68,101, 98,117,103, 83,101,114,118,101,114, 32,111, 98,106,101, 99,116, 32,119,104,101,110, 32,100,101, 98,117,103,103,105,110,103, 10,
  102, 73,115, 82,117,110,110,105,110,103, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,114,117,101, 32,119,104,101,110, 32,116,104,101, 32,100,101, 98,117,103,103,101,101, 32,105,115, 32,114,117,110,110,105,110,103, 10,
  102, 73,115, 67,111,110,110,101, 99,116,101,100, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,114,117,101, 32,119,104,101,110, 32, 97, 32, 99,108,105,101,110,116, 32,104, 97,115, 32, 99,111,110,110,101, 99,116,101,100, 10,
--- 85,89 ----
  102, 72, 97,118,101, 70,111,117,110,100, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,114,117,101, 32,119,104,101,110, 32,115,116,114,105,110,103, 32,104, 97,115, 32, 98,101,101,110, 32,102,111,117,110,100, 10,
  101,100,105,116,111,114, 65,112,112, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32,119,120, 46,119,120, 71,101,116, 65,112,112, 40, 41, 10,
! 100,101, 98,117,103, 83,101,114,118,101,114, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,119,120, 76,117, 97, 68,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 32,111, 98,106,101, 99,116, 32,119,104,101,110, 32,100,101, 98,117,103,103,105,110,103, 10,
  102, 73,115, 82,117,110,110,105,110,103, 32, 32, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,114,117,101, 32,119,104,101,110, 32,116,104,101, 32,100,101, 98,117,103,103,101,101, 32,105,115, 32,114,117,110,110,105,110,103, 10,
  102, 73,115, 67,111,110,110,101, 99,116,101,100, 32, 32, 32, 32, 32, 61, 32,110,105,108, 32, 32, 32, 32, 45, 45, 32,116,114,117,101, 32,119,104,101,110, 32, 97, 32, 99,108,105,101,110,116, 32,104, 97,115, 32, 99,111,110,110,101, 99,116,101,100, 10,
***************
*** 1531,1535 ****
  102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 65, 84, 84, 65, 67, 72, 95, 68, 69, 66, 85, 71, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40, 32,101,118,101,110,116, 32, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,101, 98,117,103, 83,101,114,118,101,114, 32, 61, 32,119,120, 46,119,120, 76,117, 97, 68,101, 98,117,103, 83,101,114,118,101,114, 40,112,111,114,116, 78,117,109, 98,101,114, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,100,101, 98,117,103, 83,101,114,118,101,114, 32,116,104,101,110, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,101, 98,117,103, 83,101,114,118,101,114, 58, 83,116, 97,114,116, 83,101,114,118,101,114, 84,104,114,101, 97,100, 40, 41, 10,
--- 1531,1535 ----
  102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 65, 84, 84, 65, 67, 72, 95, 68, 69, 66, 85, 71, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40, 32,101,118,101,110,116, 32, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,101, 98,117,103, 83,101,114,118,101,114, 32, 61, 32,119,120, 46,119,120, 76,117, 97, 68,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 40,112,111,114,116, 78,117,109, 98,101,114, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,100,101, 98,117,103, 83,101,114,118,101,114, 32,116,104,101,110, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,101, 98,117,103, 83,101,114,118,101,114, 58, 83,116, 97,114,116, 83,101,114,118,101,114, 84,104,114,101, 97,100, 40, 41, 10,
***************
*** 1575,1579 ****
  102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 83, 84, 65, 82, 84, 95, 68, 69, 66, 85, 71, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40, 32,101,118,101,110,116, 32, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,101, 98,117,103, 83,101,114,118,101,114, 32, 61, 32,119,120, 46,119,120, 76,117, 97, 68,101, 98,117,103, 83,101,114,118,101,114, 40,112,111,114,116, 78,117,109, 98,101,114, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,100,101, 98,117,103, 83,101,114,118,101,114, 32,116,104,101,110, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,101, 98,117,103, 83,101,114,118,101,114, 58, 83,116, 97,114,116, 67,108,105,101,110,116, 40, 41, 10,
--- 1575,1579 ----
  102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 83, 84, 65, 82, 84, 95, 68, 69, 66, 85, 71, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 67, 79, 77, 77, 65, 78, 68, 95, 77, 69, 78, 85, 95, 83, 69, 76, 69, 67, 84, 69, 68, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40, 32,101,118,101,110,116, 32, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,101, 98,117,103, 83,101,114,118,101,114, 32, 61, 32,119,120, 46,119,120, 76,117, 97, 68,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 40,112,111,114,116, 78,117,109, 98,101,114, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,100,101, 98,117,103, 83,101,114,118,101,114, 32,116,104,101,110, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,101, 98,117,103, 83,101,114,118,101,114, 58, 83,116, 97,114,116, 67,108,105,101,110,116, 40, 41, 10,
***************
*** 1595,1599 ****
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,105,100, 32, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32,101,100,105,116,111,114, 58, 71,101,116, 73,100, 40, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 80, 97,116,104, 32, 32, 32, 61, 32,109, 97,107,101, 68,101, 98,117,103, 70,105,108,101, 78, 97,109,101, 40,101,100,105,116,111,114, 44, 32,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 91,105,100, 93, 46,102,105,108,101, 80, 97,116,104, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 76,117, 97, 68,101, 98,117,103, 83,101,114,118,101,114, 67,111,109,112,105,108,101, 40,102,105,108,101, 80, 97,116,104, 44, 32,101,100,105,116,111,114, 84,101,120,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
  102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 79, 77, 80, 73, 76, 69, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10,
--- 1595,1599 ----
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,105,100, 32, 32, 32, 32, 32, 32, 32, 32, 32, 61, 32,101,100,105,116,111,114, 58, 71,101,116, 73,100, 40, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,108,111, 99, 97,108, 32,102,105,108,101, 80, 97,116,104, 32, 32, 32, 61, 32,109, 97,107,101, 68,101, 98,117,103, 70,105,108,101, 78, 97,109,101, 40,101,100,105,116,111,114, 44, 32,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 91,105,100, 93, 46,102,105,108,101, 80, 97,116,104, 41, 10,
!  32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,119,120, 46,119,120, 76,117, 97, 68,101, 98,117,103,103,101,114, 83,101,114,118,101,114, 67,111,109,112,105,108,101, 40,102,105,108,101, 80, 97,116,104, 44, 32,101,100,105,116,111,114, 84,101,120,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
  102,114, 97,109,101, 58, 67,111,110,110,101, 99,116, 40, 73, 68, 95, 67, 79, 77, 80, 73, 76, 69, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 85, 80, 68, 65, 84, 69, 95, 85, 73, 44, 10,
***************
*** 1731,1735 ****
   32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
   10,
! 101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 73, 68, 95, 65, 78, 89, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 95, 67, 76, 73, 69, 78, 84, 95, 67, 79, 78, 78, 69, 67, 84, 69, 68, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,100,101, 98,117,103, 83,101,114,118,101,114, 32,116,104,101,110, 10,
--- 1731,1735 ----
   32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
   10,
! 101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 73, 68, 95, 65, 78, 89, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 71, 69, 82, 95, 67, 76, 73, 69, 78, 84, 95, 67, 79, 78, 78, 69, 67, 84, 69, 68, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,100,101, 98,117,103, 83,101,114,118,101,114, 32,116,104,101,110, 10,
***************
*** 1758,1762 ****
  101,110,100, 10,
   10,
! 101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 73, 68, 95, 65, 78, 89, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 95, 66, 82, 69, 65, 75, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,101,120,105,116,105,110,103, 80,114,111,103,114, 97,109, 32,116,104,101,110, 32,114,101,116,117,114,110, 32,101,110,100, 10,
--- 1758,1762 ----
  101,110,100, 10,
   10,
! 101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 73, 68, 95, 65, 78, 89, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 71, 69, 82, 95, 66, 82, 69, 65, 75, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,101,120,105,116,105,110,103, 80,114,111,103,114, 97,109, 32,116,104,101,110, 32,114,101,116,117,114,110, 32,101,110,100, 10,
***************
*** 1833,1847 ****
  101,110,100, 10,
   10,
! 101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 73, 68, 95, 65, 78, 89, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 95, 80, 82, 73, 78, 84, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,105,115,112,108, 97,121, 79,117,116,112,117,116, 40,101,118,101,110,116, 58, 71,101,116, 77,101,115,115, 97,103,101, 40, 41, 46, 46, 34, 92,110, 34, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
   10,
! 101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 73, 68, 95, 65, 78, 89, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 95, 69, 82, 82, 79, 82, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,105,115,112,108, 97,121, 79,117,116,112,117,116, 40,101,118,101,110,116, 58, 71,101,116, 77,101,115,115, 97,103,101, 40, 41, 46, 46, 34, 92,110, 34, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
   10,
! 101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 73, 68, 95, 65, 78, 89, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 95, 69, 88, 73, 84, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,111,114, 32,105,100, 44, 32,100,111, 99,117,109,101,110,116, 32,105,110, 32,112, 97,105,114,115, 40,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 41, 32,100,111, 10,
--- 1833,1847 ----
  101,110,100, 10,
   10,
! 101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 73, 68, 95, 65, 78, 89, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 71, 69, 82, 95, 80, 82, 73, 78, 84, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,105,115,112,108, 97,121, 79,117,116,112,117,116, 40,101,118,101,110,116, 58, 71,101,116, 77,101,115,115, 97,103,101, 40, 41, 46, 46, 34, 92,110, 34, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
   10,
! 101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 73, 68, 95, 65, 78, 89, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 71, 69, 82, 95, 69, 82, 82, 79, 82, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,100,105,115,112,108, 97,121, 79,117,116,112,117,116, 40,101,118,101,110,116, 58, 71,101,116, 77,101,115,115, 97,103,101, 40, 41, 46, 46, 34, 92,110, 34, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
   10,
! 101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 73, 68, 95, 65, 78, 89, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 71, 69, 82, 95, 69, 88, 73, 84, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,102,111,114, 32,105,100, 44, 32,100,111, 99,117,109,101,110,116, 32,105,110, 32,112, 97,105,114,115, 40,111,112,101,110, 68,111, 99,117,109,101,110,116,115, 41, 32,100,111, 10,
***************
*** 1860,1864 ****
   32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
   10,
! 101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 73, 68, 95, 65, 78, 89, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 95, 69, 86, 65, 76, 85, 65, 84, 69, 95, 69, 88, 80, 82, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 32,116,104,101,110, 10,
--- 1860,1864 ----
   32, 32, 32, 32, 32, 32, 32, 32,101,110,100, 41, 10,
   10,
! 101,100,105,116,111,114, 65,112,112, 58, 67,111,110,110,101, 99,116, 40,119,120, 46,119,120, 73, 68, 95, 65, 78, 89, 44, 32,119,120, 46,119,120, 69, 86, 84, 95, 87, 88, 76, 85, 65, 95, 68, 69, 66, 85, 71, 71, 69, 82, 95, 69, 86, 65, 76, 85, 65, 84, 69, 95, 69, 88, 80, 82, 44, 10,
   32, 32, 32, 32, 32, 32, 32, 32,102,117,110, 99,116,105,111,110, 32, 40,101,118,101,110,116, 41, 10,
   32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32,105,102, 32,119, 97,116, 99,104, 76,105,115,116, 67,116,114,108, 32,116,104,101,110, 10,