#5869. Reimplemented path shortening for warnings.

Now lexer and parser have GetFileName (absolute) and GetDisplayFileName (relative / short / cleaned).
Display filename is used for parser/lexer warnings, and for GUI warnings (and for some mission-related warnings too).

This surely cannot break anything =)

git-svn-id: http://svn.thedarkmod.com/svn/darkmod_src/trunk@10036 49c82d7f-2e2a-0410-a16f-ae8f201b507f

Author: stgatilov

game/Missions/MissionDB.cpp

@@ -63,7 +63,7 @@ void CMissionDB::ReloadMissionInfoFile()
 		{
 			if (!src.ReadToken(&token))
 			{
-				src.Warning("Missing name on info declaration in %s line %d", src.GetFileName(), src.GetLineNum());
+				src.Warning("Missing name on info declaration in %s line %d", src.GetDisplayFileName(), src.GetLineNum());
 				break;
 			}
 

game/Missions/ModInfoDecl.cpp

@@ -35,7 +35,7 @@ bool CModInfoDecl::Parse(idLexer& src)
 
 	if (key.type != TT_PUNCTUATION || key.subtype != P_BRACEOPEN)
 	{
-		src.Warning("Cannot find opening brace in file %s:%d.", src.GetFileName(), src.GetLineNum());
+		src.Warning("Cannot find opening brace in file %s:%d.", src.GetDisplayFileName(), src.GetLineNum());
 		return false;
 	}
 

idlib/Lexer.cpp

@@ -218,9 +218,9 @@ void idLexer::Error( const char *str, ... ) {
 	va_end(ap);
 
 	if ( idLexer::flags & LEXFL_NOFATALERRORS ) {
-		idLib::common->Warning( "file %s, line %d: %s", idLexer::filename.c_str(), idLexer::line, text );
+		idLib::common->Warning( "file %s, line %d: %s", idLexer::displayFilename.c_str(), idLexer::line, text );
 	} else {
-		idLib::common->Error( "file %s, line %d: %s", idLexer::filename.c_str(), idLexer::line, text );
+		idLib::common->Error( "file %s, line %d: %s", idLexer::displayFilename.c_str(), idLexer::line, text );
 	}
 }
 
@@ -240,7 +240,7 @@ void idLexer::Warning( const char *str, ... ) {
 	va_start( ap, str );
 	vsprintf( text, str, ap );
 	va_end( ap );
-	idLib::common->Warning( "file %s, line %d: %s", idLexer::filename.c_str(), idLexer::line, text );
+	idLib::common->Warning( "file %s, line %d: %s", idLexer::displayFilename.c_str(), idLexer::line, text );
 }
 
 /*
@@ -1652,6 +1652,12 @@ int idLexer::LoadFile( const char *filename, bool OSPath ) {
 	idLexer::filename = fp->GetFullPath();
 	idLib::fileSystem->CloseFile( fp );
 
+	// stgatilov #5869: compute shorter non-absolute path for warnings
+	// make it relative to TDM root if possible
+	const char *tdmroot = cvarSystem->GetCVarString( "fs_basepath" );
+	displayFilename = idLexer::filename;
+	displayFilename.StripLeadingOnce(tdmroot);
+
 	idLexer::buffer = buf;
 	idLexer::length = length;
 	// pointer in script buffer
@@ -1681,6 +1687,7 @@ int idLexer::LoadMemory( const char *ptr, int length, const char *name, int star
 		return false;
 	}
 	idLexer::filename = name;
+	idLexer::displayFilename = name;
 	idLexer::buffer = ptr;
 	idLexer::fileTime = 0;
 	idLexer::length = length;

idlib/Lexer.h

@@ -285,6 +285,7 @@ class idLexer {
 	int				EndOfFile( void );
 					// returns the current filename
 	const char *	GetFileName( void );
+	const char *	GetDisplayFileName( void );
 					// get offset in script
 	const int		GetFileOffset( void );
 					// get file time
@@ -306,7 +307,8 @@ class idLexer {
 
 private:
 	int				loaded;					// set when a script file is loaded from file or memory
-	idStr			filename;				// file name of the script
+	idStr			displayFilename;		// shortened file path for printing warnings
+	idStr			filename;				// file path of the script (absolute)
 	int				allocated;				// true if buffer memory was allocated
 	const char *	buffer;					// buffer containing the script
 	const char *	script_p;				// current pointer in the script
@@ -346,6 +348,10 @@ ID_INLINE const char *idLexer::GetFileName( void ) {
 	return idLexer::filename;
 }
 
+ID_INLINE const char *idLexer::GetDisplayFileName( void ) {
+	return idLexer::displayFilename;
+}
+
 ID_INLINE const int idLexer::GetFileOffset( void ) {
 	return idLexer::script_p - idLexer::buffer;
 }

idlib/Parser.cpp

@@ -410,7 +410,7 @@ void idParser::PushScript( idLexer *script ) {
 
 	for ( s = idParser::scriptstack; s; s = s->next ) {
 		if ( !idStr::Icmp(s->GetFileName(), script->GetFileName()) ) {
-			idParser::Warning( "'%s' recursively included", script->GetFileName() );
+			idParser::Warning( "'%s' recursively included", script->GetDisplayFileName() );
 			return;
 		}
 	}

idlib/Parser.h

@@ -145,6 +145,7 @@ class idParser {
 	int				GetFlags( void ) const;
 					// returns the current filename
 	const char *	GetFileName( void ) const;
+	const char *	GetDisplayFileName( void ) const;
 					// get current offset in current script
 	const int		GetFileOffset( void ) const;
 					// get file time for current script
@@ -246,6 +247,15 @@ ID_INLINE const char *idParser::GetFileName( void ) const {
 	}
 }
 
+ID_INLINE const char *idParser::GetDisplayFileName( void ) const {
+	if ( idParser::scriptstack ) {
+		return idParser::scriptstack->GetDisplayFileName();
+	}
+	else {
+		return "";
+	}
+}
+
 ID_INLINE const int idParser::GetFileOffset( void ) const {
 	if ( idParser::scriptstack ) {
 		return idParser::scriptstack->GetFileOffset();

ui/Window.cpp

@@ -1670,7 +1670,7 @@ bool idWindow::ParseScript(idParser *src, idGuiScriptList &list, int *timeParm,
 		}
 
 		//stgatilov: add filename string to window pool if not there yet
-		const char *srcFilename = src->GetFileName();
+		const char *srcFilename = src->GetDisplayFileName();
 		srcFilename = AddSourceFilenameToPool(srcFilename);
 
 		idGuiScript *gs = new idGuiScript();
@@ -2251,7 +2251,7 @@ bool idWindow::Parse( idParser *src, bool rebuild) {
 	src->ExpectTokenType( TT_NAME, 0, &token );
 
 	//stgatilov: add filename string to window pool if not there yet
-	srcLocation = {src->GetFileName(), src->GetLineNum()};
+	srcLocation = {src->GetDisplayFileName(), src->GetLineNum()};
 	srcLocation.filename = AddSourceFilenameToPool(srcLocation.filename);
 
 	SetInitialState(token);