[Wxlua-commit] wxLua/modules/wxluadebug/src wxldebug.cpp, 1.38, 1.39 wxlstack.cpp, 1.11, 1.12

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv32730/wxLua/modules/wxluadebug/src

Modified Files:
	wxldebug.cpp wxlstack.cpp 
Log Message:
Implement a better fix for the gc of duplicate pointers
Don't track wxLuaFunctions, should be much faster now
Make wxLuaState::RemoveTrackedMemory also clear the rest of the "tracking" info


Index: wxlstack.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxlstack.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** wxlstack.cpp	30 Jun 2007 00:12:26 -0000	1.11
--- wxlstack.cpp	19 Jul 2007 03:09:47 -0000	1.12
***************
*** 356,360 ****
          const wxLuaDebugItem *item = debugData.Item(n);
          m_stackEntries.Add(item->GetIndex());
! 		m_stackChoice->Append(item->GetName());
      }
  
--- 356,362 ----
          const wxLuaDebugItem *item = debugData.Item(n);
          m_stackEntries.Add(item->GetIndex());
!         wxString name(item->GetName());
!         if (n == count - 1) name += wxT(" (Globals)");
! 		m_stackChoice->Append(name);
      }
  

Index: wxldebug.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/src/wxldebug.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** wxldebug.cpp	28 Jun 2007 22:45:57 -0000	1.38
--- wxldebug.cpp	19 Jul 2007 03:09:47 -0000	1.39
***************
*** 287,291 ****
              bool is_lreg_objTable = (lua_equal(L, -1, -2) != 0);
              lua_pop(L, 1);
!             
              // start iterating
              lua_pushnil(L);
--- 287,291 ----
              bool is_lreg_objTable = (lua_equal(L, -1, -2) != 0);
              lua_pop(L, 1);
! 
              // start iterating
              lua_pushnil(L);
***************
*** 297,307 ****
                  GetTypeValue(wxlState, -1, type, value, &flag_type);
  
-                 if (is_lreg_objTable)
-                 {
-                     long tag = -1;
-                     if (value.BeforeFirst(wxT(' ')).ToLong(&tag))
-                         value = value.BeforeFirst(wxT(' ')) + wxT(" (") + wxlState.GetLuaTagName(tag) + wxT(")");
-                 }
- 
                  //wxPrintf(wxT("wxLuaDebugData::EnumerateTable %d type='%s' key='%s' val='%s'\n"), count, type.c_str(), name.c_str(), value.c_str());
  
--- 297,300 ----
***************
*** 465,471 ****
          s += wxT(" - wxLua References");
      else if (udata == &wxlua_lreg_classes_key)
!         s += wxT(" - wxLuaBindClasses");   
      else if (udata == &wxlua_lreg_derivedmethods_key)
!         s += wxT(" - wxLua Derived Class Methods");    
      else if (udata == &wxlua_lreg_wxluastaterefdata_key)
          s += wxT(" - wxLuaStateRefData");
--- 458,464 ----
          s += wxT(" - wxLua References");
      else if (udata == &wxlua_lreg_classes_key)
!         s += wxT(" - wxLuaBindClasses");
      else if (udata == &wxlua_lreg_derivedmethods_key)
!         s += wxT(" - wxLua Derived Class Methods");
      else if (udata == &wxlua_lreg_wxluastaterefdata_key)
          s += wxT(" - wxLuaStateRefData");