[Wxlua-commit] wxLua/modules/wxluadebug/include wxldebug.h,1.8,1.9

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

Update of /cvsroot/wxlua/wxLua/modules/wxluadebug/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1520/modules/wxluadebug/include

Modified Files:
	wxldebug.h 
Log Message:
restore the stacktree for the wxLua app
more code unification for wxLuaDebug classes
revert to EnumerateStack, EnumerateStackEntry, EnumerateTable instead of BuildStack, BuildStackList, BuildTableList


Index: wxldebug.h
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluadebug/include/wxldebug.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wxldebug.h	1 Dec 2005 06:43:53 -0000	1.8
--- wxldebug.h	2 Dec 2005 06:38:30 -0000	1.9
***************
*** 101,105 ****
  
  // ----------------------------------------------------------------------------
! // wxLuaDebugData
  // ----------------------------------------------------------------------------
  
--- 101,106 ----
  
  // ----------------------------------------------------------------------------
! // wxLuaDebugData - a wxSortedArray of pointers to wxLuaDebugDataItem(s)
! //                  it has a destructor that deletes them.
  // ----------------------------------------------------------------------------
  
***************
*** 112,122 ****
      // fill this with the stack entries for the wxLuaState
      //   returns the number of stack entries added
!     int BuildStack(const wxLuaState& wxlState);
!     int BuildStackList(const wxLuaState& wxlState, int stackRef, wxArrayInt& references);
!     int BuildTableList(const wxLuaState& wxlState, int nRef, int nEntry, wxArrayInt& references);
  
      static wxString MakeNumber(double dnum);
      static wxString MakeBoolean(int num);
      static wxString GetTableInfo(const wxLuaState& wxlState, int index);
      static wxString GetUserDataInfo(const wxLuaState& wxlState, int index, bool full = true);
  
--- 113,131 ----
      // fill this with the stack entries for the wxLuaState
      //   returns the number of stack entries added
!     int EnumerateStack(const wxLuaState& wxlState);
!     int EnumerateStackEntry(const wxLuaState& wxlState, int stackRef, wxArrayInt& references);
!     int EnumerateTable(const wxLuaState& wxlState, int nRef, int nEntry, wxArrayInt& references);
  
+     // Get a human readable string name of the lua_type(L, index) and the
+     //   value at the index, returns the value of lua_type
+     static int GetTypeValue(const wxLuaState& wxlState, int index, wxString& type, wxString& value);
+     // Write the input number as either an int, uint, or as a double
      static wxString MakeNumber(double dnum);
+     // Convert the number to either "True" or "False" (eg !0 or 0)
      static wxString MakeBoolean(int num);
+     // Get a wxString description about the table at the index in the lua stack
      static wxString GetTableInfo(const wxLuaState& wxlState, int index);
+     // Get a wxString description about user data at the index in the lua stack
+     //  if full then try to look up the name of the user data from the bindings
      static wxString GetUserDataInfo(const wxLuaState& wxlState, int index, bool full = true);
  
***************
*** 135,141 ****
      virtual ~wxLuaInterface();
  
!     wxLuaDebugData *BuildStack();
!     wxLuaDebugData *BuildStackList(int nEntry);
!     wxLuaDebugData *BuildTableList(int nRef, int nEntry);
      wxLuaDebugData *GetGlobalData();
  
--- 144,150 ----
      virtual ~wxLuaInterface();
  
!     wxLuaDebugData *EnumerateStack();
!     wxLuaDebugData *EnumerateStackEntry(int nEntry);
!     wxLuaDebugData *EnumerateTable(int nRef, int nEntry);
      wxLuaDebugData *GetGlobalData();