Dry up CScriptDebugging a little bit

Author: qaisjp

Client/mods/deathmatch/logic/CScriptDebugging.cpp

@@ -16,8 +16,6 @@
 
 #include <StdInc.h>
 
-#define MAX_STRING_LENGTH 2048
-
 FILE* CScriptDebugging::m_pLogFile;
 
 CScriptDebugging::CScriptDebugging ( CLuaManager* pLuaManager )
@@ -51,165 +49,12 @@ CScriptDebugging::~CScriptDebugging ( void )
     }
 }
 
-
-void CScriptDebugging::LogCustom ( lua_State* luaVM, unsigned char ucRed, unsigned char ucGreen, unsigned char ucBlue, const char* szFormat, ... )
-{
-    assert ( szFormat );
-
-    // Compose the formatted message
-    char szBuffer [MAX_STRING_LENGTH];
-    va_list marker;
-    va_start ( marker, szFormat );
-    VSNPRINTF ( szBuffer, MAX_STRING_LENGTH, szFormat, marker );
-    va_end ( marker );
-
-    LogString ( "", GetLuaDebugInfo( luaVM ), szBuffer, 0, ucRed, ucGreen, ucBlue );
-}
-
-void CScriptDebugging::LogInformation ( lua_State* luaVM, const char* szFormat, ... )
-{
-    assert ( szFormat );
-
-    // Compose the formatted message
-    char szBuffer [MAX_STRING_LENGTH];
-    va_list marker;
-    va_start ( marker, szFormat );
-    VSNPRINTF ( szBuffer, MAX_STRING_LENGTH, szFormat, marker );
-    va_end ( marker );
-
-    // Log it
-    LogString ( "INFO: ", GetLuaDebugInfo( luaVM ), szBuffer, 3 );
-}
-
-
-void CScriptDebugging::LogWarning ( lua_State* luaVM, const char* szFormat, ... )
-{
-    assert ( szFormat );
-
-    // Compose the formatted message
-    char szBuffer [MAX_STRING_LENGTH];
-    va_list marker;
-    va_start ( marker, szFormat );
-    VSNPRINTF ( szBuffer, MAX_STRING_LENGTH, szFormat, marker );
-    va_end ( marker );
-
-    // Log it
-    LogString ( "WARNING: ", GetLuaDebugInfo( luaVM ), szBuffer, 2 );
-}
-
-
-void CScriptDebugging::LogError ( lua_State* luaVM, const char* szFormat, ... )
-{
-    assert ( szFormat );
-
-    // Compose the formatted message
-    char szBuffer [MAX_STRING_LENGTH];
-    va_list marker;
-    va_start ( marker, szFormat );
-    VSNPRINTF ( szBuffer, MAX_STRING_LENGTH, szFormat, marker );
-    va_end ( marker );
-
-    // Log it
-    LogString ( "ERROR: ", GetLuaDebugInfo( luaVM ), szBuffer, 1 );
-}
-
-
-void CScriptDebugging::LogWarning ( const SLuaDebugInfo& luaDebugInfo, const char* szFormat, ... )
-{
-    assert ( szFormat );
-
-    // Compose the formatted message
-    char szBuffer [MAX_STRING_LENGTH];
-    va_list marker;
-    va_start ( marker, szFormat );
-    VSNPRINTF ( szBuffer, MAX_STRING_LENGTH, szFormat, marker );
-    va_end ( marker );
-
-    // Log it
-    LogString ( "WARNING: ", luaDebugInfo, szBuffer, 2 );
-}
-
-
-void CScriptDebugging::LogError ( const SLuaDebugInfo& luaDebugInfo, const char* szFormat, ... )
-{
-    assert ( szFormat );
-
-    // Compose the formatted message
-    char szBuffer [MAX_STRING_LENGTH];
-    va_list marker;
-    va_start ( marker, szFormat );
-    VSNPRINTF ( szBuffer, MAX_STRING_LENGTH, szFormat, marker );
-    va_end ( marker );
-
-    // Log it
-    LogString ( "ERROR: ", luaDebugInfo, szBuffer, 1 );
-}
-
-
-void CScriptDebugging::LogBadPointer ( lua_State* luaVM, const char* szArgumentType, unsigned int uiArgument )
-{
-    assert ( szArgumentType );
-
-    // Populate a message to print/send
-    LogWarning ( luaVM, "Bad '%s' pointer @ '%s'(%u)", szArgumentType, lua_tostring ( luaVM, lua_upvalueindex ( 1 ) ), uiArgument );
-}
-
-
-void CScriptDebugging::LogBadType ( lua_State* luaVM )
-{
-    // Populate a message to print/send
-    LogWarning ( luaVM, "Bad argument @ '%s'", lua_tostring ( luaVM, lua_upvalueindex ( 1 ) ) );
-}
-
-
-void CScriptDebugging::LogCustom ( lua_State* luaVM, const char* szMessage )
-{
-    assert ( szMessage );
-
-    // Populate a message to print/send
-    LogWarning ( luaVM, "%s", szMessage );
-}
-
-
 void CScriptDebugging::LogBadLevel ( lua_State* luaVM, unsigned int uiRequiredLevel )
 {
     // Populate a message to print/send
     LogWarning ( luaVM, "Requires level '%d' @ '%s", uiRequiredLevel, lua_tostring ( luaVM, lua_upvalueindex ( 1 ) ) );
 }
 
-
-// Handle filename/line number in string
-void CScriptDebugging::LogPCallError( lua_State* luaVM, const SString& strRes, bool bInitialCall )
-{   
-    std::vector < SString > vecSplit;
-    strRes.Split( ":", vecSplit );
-                
-    if ( vecSplit.size() >= 3 )
-    {
-        // File+line info present
-        SString strFile = vecSplit[ 0 ];
-        int     iLine   = atoi( vecSplit[ 1 ] );
-        
-        // Get the message string (we cannot use vecSplit here as the message itself could contain ':')
-        auto pos = strRes.find ( ':', vecSplit[0].length () + vecSplit[1].length () ) ;
-        SString strMsg = strRes.SubStr ( pos+2 );
-        
-        if ( iLine == 0 && bInitialCall )
-        {
-            // Location hint for compiled scripts
-            LogError ( SLuaDebugInfo( strFile, iLine ), "(global scope) %s", *strMsg );
-        }
-        else
-            LogError ( SLuaDebugInfo( strFile, iLine ), "%s", *strMsg );
-    }
-    else
-    {
-        // File+line info not present
-        LogError( luaVM, "%s", strRes.c_str () );
-    }
-}
-
-
 void CALLBACK TimerProc( void* lpParametar, BOOLEAN TimerOrWaitFired )
 {
     // Got a logfile?
@@ -280,98 +125,6 @@ bool CScriptDebugging::SetLogfile ( const char* szFilename, unsigned int uiLevel
     return false;
 }
 
-
-//
-// Get best debug info we possibly can from the relevent lua state
-//
-const SLuaDebugInfo& CScriptDebugging::GetLuaDebugInfo( lua_State * luaVM )
-{
-    static SLuaDebugInfo scriptDebugInfo;
-    scriptDebugInfo = SLuaDebugInfo();
-
-    // Get a VM from somewhere
-    if ( !luaVM && !m_LuaMainStack.empty () )
-        luaVM = m_LuaMainStack.back ()->GetVM ();
-
-    // Lua oop found at level 4 added one just in case it somehow ends up deeper due to nested calls
-    for ( int level = 1; level <= 5; level++ )
-    {
-        lua_Debug debugInfo;
-        if ( luaVM && lua_getstack ( luaVM, level, &debugInfo ) )
-        {
-            lua_getinfo ( luaVM, "nlS", &debugInfo );
-            // Lua oop handlers get marked as "C", ignore these as the information we want is further up the stack (typically level 4+)
-            if ( strcmp(debugInfo.source, "=[C]") != 0 )
-            {
-                 // Make sure this function isn't defined in a string (eg: from runcode)
-                if ( debugInfo.source[0] == '@' )
-                {
-                    // Get and store the location of the debug message
-                    scriptDebugInfo.strFile = debugInfo.source + 1;
-                    scriptDebugInfo.iLine = debugInfo.currentline;
-                    scriptDebugInfo.infoType = DEBUG_INFO_FILE_AND_LINE;
-                    // Stop here as we now have the best info
-                    break;
-                }
-                else
-                {
-                    scriptDebugInfo.strShortSrc = debugInfo.short_src;
-                    scriptDebugInfo.infoType = DEBUG_INFO_SHORT_SRC;
-                    // Try other levels to see if we can get the calling file
-                }
-            }
-        }
-        else
-        {
-            // Use saved info if set
-            if ( m_SavedLuaDebugInfo.infoType != DEBUG_INFO_NONE )
-            {
-                scriptDebugInfo = m_SavedLuaDebugInfo;
-            }
-            // No point in trying other levels as lua_getstack will fail
-            break;
-        }
-    }
-
-    return scriptDebugInfo;
-}
-
-
-//
-// Make full log message from components
-//
-SString CScriptDebugging::ComposeErrorMessage( const char* szPrePend, const SLuaDebugInfo& luaDebugInfo, const char* szMessage )
-{
-    SString strText;
-
-    // 1st part - if not empty, it should have a space at the end
-    strText = szPrePend;
-
-    // 2nd part if set
-    if ( luaDebugInfo.infoType == DEBUG_INFO_FILE_AND_LINE )
-    {
-        if ( luaDebugInfo.iLine == INVALID_LINE_NUMBER )
-            strText += SString( "%s: ", *luaDebugInfo.strFile );
-        else
-            strText += SString( "%s:%d: ", *luaDebugInfo.strFile, luaDebugInfo.iLine );
-    }
-
-    // 3rd part
-    strText += szMessage;
-
-    // 5th part - just kidding. This is actually the 4th part!
-    if ( !luaDebugInfo.strShortSrc.empty() )
-    {
-        if ( luaDebugInfo.strShortSrc.BeginsWith( "[" ) )
-            strText += SString( " %s", *luaDebugInfo.strShortSrc );
-        else
-            strText += SString( " [%s]", *luaDebugInfo.strShortSrc );
-    }
-
-    return strText;
-}
-
-
 void CScriptDebugging::LogString ( const char* szPrePend, const SLuaDebugInfo& luaDebugInfo, const char* szMessage, unsigned int uiMinimumDebugLevel, unsigned char ucRed, unsigned char ucGreen, unsigned char ucBlue )
 {
     SString strText = ComposeErrorMessage( szPrePend, luaDebugInfo, szMessage );
@@ -469,33 +222,3 @@ void CScriptDebugging::PrintLog ( const char* szText )
         fwrite( strInput.c_str(), strInput.length(), 1, m_pLogFile );
     }
 }
-
-
-// Keep a stack of called VMs to give global warnings/errors a context
-void CScriptDebugging::PushLuaMain ( CLuaMain* pLuaMain )
-{
-    m_LuaMainStack.push_back ( pLuaMain );
-}
-
-void CScriptDebugging::PopLuaMain ( CLuaMain* pLuaMain )
-{
-    dassert ( !m_LuaMainStack.empty () );
-    if ( !m_LuaMainStack.empty () )
-    {
-        dassert ( m_LuaMainStack.back () == pLuaMain );
-        m_LuaMainStack.pop_back ();
-    }
-}
-
-void CScriptDebugging::OnLuaMainDestroy ( CLuaMain* pLuaMain )
-{
-    dassert ( !ListContains ( m_LuaMainStack, pLuaMain ) );
-    ListRemove ( m_LuaMainStack, pLuaMain );
-}
-
-CLuaMain* CScriptDebugging::GetTopLuaMain ( void )
-{
-    if ( !m_LuaMainStack.empty () )
-        return m_LuaMainStack.back();
-    return NULL;
-}