marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Debugger: Send scenario-relative paths

stable-5.1
Martin Plicht 2010-01-16 02:32:53 +01:00
parent 98dfe3dc1a
commit a519a5f352
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/script/C4AulDebug.cpp
View File

@ -184,7 +184,7 @@ void C4AulDebug::ProcessLine(const StdStrBuf &Line)
else if (SEqualNoCase(szCmd, "LST"))
{
for (C4AulScript* script = ScriptEngine.Child0; script; script = script->Next) {
SendLine(Config.AtRelativePath(script->ScriptName.getData()));
SendLine(RelativePath(script->ScriptName));
}
}
@ -199,7 +199,7 @@ void C4AulDebug::ProcessLine(const StdStrBuf &Line)
C4AulScript* script;
for (script = ScriptEngine.Child0; script; script = script->Next)
{
if (SEqualNoCase(Config.AtRelativePath(script->ScriptName.getData()), scriptPath.getData()))
if (SEqualNoCase(RelativePath(script->ScriptName), scriptPath.getData()))
break;
}
@ -397,6 +397,16 @@ void C4AulDebug::StepPoint(C4AulBCC *pCPos, C4AulScriptContext *pRetCtx, C4Value
Game.HaltCount--;
}
const char* C4AulDebug::RelativePath(StdStrBuf &path)
{
const char* p = path.getData();
const char* result = Config.AtRelativePath(p);
if (p != result)
return result;
// try scenario-relative path
return GetRelativePathS(p, ::Game.ScenarioFile.GetName());
}
void C4AulDebug::ObtainStackTrace(C4AulScriptContext* pCtx, C4AulBCC* pCPos)
{
for (std::list<StdStrBuf*>::iterator it = StackTrace.begin(); it != StackTrace.end(); it++)
@ -420,5 +430,5 @@ StdStrBuf C4AulDebug::FormatCodePos(C4AulScriptContext *pCtx, C4AulBCC *pCPos)
const char *szScript = pCtx->Func->pOrgScript->GetScript();
int iLine = SGetLine(szScript, pCPos->SPos);
// Format
return FormatString("%s:%d", Config.AtRelativePath(pCtx->Func->pOrgScript->ScriptName.getData()), iLine);
return FormatString("%s:%d", RelativePath(pCtx->Func->pOrgScript->ScriptName), iLine);
}

1
src/script/C4AulDebug.h
View File

@ -33,6 +33,7 @@ class C4AulDebug : public C4NetIOTCP, private C4NetIO::CBClass
std::list<StdStrBuf*> StackTrace;
void ObtainStackTrace(C4AulScriptContext* pCtx, C4AulBCC* pCPos);
const char* RelativePath(StdStrBuf &path);
private: