TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-02 03:53:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Caches the processed line in CodeBlock for better assert reporting

Browse source 
Adds additional context on eval and evaluate calls to better isolate script executions that are throwing errors, such as via command fields or eval() calls.
This commit is contained in:
JeffR 2026-02-21 11:03:07 -06:00
parent 2dae0fbbad
commit 171211c4e2
12 changed files with 46 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Engine/source/T3D/trigger.cpp
View file

@ -742,7 +742,10 @@ void Trigger::potentialEnterObject(GameBase* enter)
{
String command = String("%obj = ") + enter->getIdString() + ";";
command = command + String("%this = ") + getIdString() + ";" + mEnterCommand;
Con::evaluate(command.c_str());
StringTableEntry objectName = getName() != StringTable->EmptyString() ? getName() : getIdString();
String context = String::ToString("%s, %s", getGroup(), objectName);
Con::evaluate(command.c_str(), false, context);
}
if( mDataBlock && testTrippable() && testCondition())
@ -791,7 +794,10 @@ void Trigger::processTick(const Move* move)
{
String command = String("%obj = ") + remove->getIdString() + ";";
command = command + String("%this = ") + getIdString() + ";" + mLeaveCommand;
Con::evaluate(command.c_str());
StringTableEntry objectName = getName() != StringTable->EmptyString() ? getName() : getIdString();
String context = String::ToString("%s, %s", getGroup(), objectName);
Con::evaluate(command.c_str(), false, context);
}
if (testTrippable() && testCondition())
mDataBlock->onLeaveTrigger_callback( this, remove );
@ -800,7 +806,11 @@ void Trigger::processTick(const Move* move)
}
if (evalCmD(&mTickCommand))
Con::evaluate(mTickCommand.c_str());
{
StringTableEntry objectName = getName() != StringTable->EmptyString() ? getName() : getIdString();
String context = String::ToString("%s, %s", getGroup(), objectName);
Con::evaluate(mTickCommand.c_str(), false, context);
}
if (mObjects.size() != 0 && testTrippable() && testCondition())
mDataBlock->onTickTrigger_callback( this );

3
Engine/source/console/consoleFunctions.cpp
View file

@ -2367,8 +2367,7 @@ DefineEngineFunction( exec, bool, ( const char* fileName, bool noCalls, bool jou
DefineEngineFunction( eval, const char*, ( const char* consoleString, bool echo ), (false), "eval(consoleString)")
{
Con::EvalResult returnValue = Con::evaluate(consoleString, echo, NULL);
Con::EvalResult returnValue = Con::evaluate(consoleString, echo, Platform::makeRelativePathName(Con::getCurrentScriptModulePath(), NULL));
return Con::getReturnBuffer(returnValue.value.getString());
}

3
Engine/source/console/torquescript/astNodes.cpp
View file

@ -59,7 +59,8 @@ inline FuncVars* getFuncVars(S32 lineNumber)
{
if (gFuncVars == &gGlobalScopeFuncVars)
{
const char* str = avar("Attemping to use local variable in global scope. File: %s Line: %d", CodeBlock::smCurrentParser->getCurrentFile(), lineNumber);
const char* lineTxt = CodeBlock::smCurrentLineText;
const char* str = avar("Attemping to use local variable in global scope. File: %s Line Num: %d \nLine: %s", CodeBlock::smCurrentParser->getCurrentFile(), lineNumber, lineTxt);
scriptErrorHandler(str);
}
return gFuncVars;

2
Engine/source/console/torquescript/codeBlock.cpp
View file

@ -35,6 +35,7 @@ using namespace Compiler;
bool CodeBlock::smInFunction = false;
CodeBlock * CodeBlock::smCodeBlockList = NULL;
StringTableEntry CodeBlock::smCurrentLineText = StringTable->EmptyString();
TorqueScriptParser *CodeBlock::smCurrentParser = NULL;
extern FuncVars gEvalFuncVars;
@ -578,6 +579,7 @@ Con::EvalResult CodeBlock::compileExec(StringTableEntry fileName, const char *in
consoleAllocReset();
name = fileName;
smCurrentLineText = inString;
if (fileName)
{

1
Engine/source/console/torquescript/codeBlock.h
View file

@ -61,6 +61,7 @@ private:
public:
static bool smInFunction;
static TorqueScriptParser * smCurrentParser;
static StringTableEntry smCurrentLineText;
static CodeBlock *getCodeBlockList()
{

9
Engine/source/console/torquescript/compiler.cpp
View file

@ -160,7 +160,8 @@ S32 FuncVars::assign(StringTableEntry var, TypeReq currentType, S32 lineNumber,
if (found->second.isConstant)
{
const char* str = avar("Script Warning: Reassigning variable %s when it is a constant. File: %s Line : %d", var, CodeBlock::smCurrentParser->getCurrentFile(), lineNumber);
const char* lineTxt = CodeBlock::smCurrentLineText;
const char* str = avar("Script Warning: Reassigning variable %s when it is a constant. File: %s Line Num: %d \nLine: %s", var, CodeBlock::smCurrentParser->getCurrentFile(), lineNumber, lineTxt);
scriptErrorHandler(str);
}
return found->second.reg;
@ -179,7 +180,8 @@ S32 FuncVars::lookup(StringTableEntry var, S32 lineNumber)
if (found == vars.end())
{
const char* str = avar("Script Warning: Variable %s referenced before used when compiling script. File: %s Line: %d", var, CodeBlock::smCurrentParser->getCurrentFile(), lineNumber);
const char* lineTxt = CodeBlock::smCurrentLineText;
const char* str = avar("Script Warning: Variable %s referenced before used when compiling script. File: %s Line Num: %d \nLine: %s", var, CodeBlock::smCurrentParser->getCurrentFile(), lineNumber, lineTxt);
scriptErrorHandler(str);
return assign(var, TypeReqString, lineNumber, false);
@ -194,7 +196,8 @@ TypeReq FuncVars::lookupType(StringTableEntry var, S32 lineNumber)
if (found == vars.end())
{
const char* str = avar("Script Warning: Variable %s referenced before used when compiling script. File: %s Line: %d", var, CodeBlock::smCurrentParser->getCurrentFile(), lineNumber);
const char* lineText = CodeBlock::smCurrentLineText;
const char* str = avar("Script Warning: Variable %s referenced before used when compiling script. File: %s Line Num: %d \nLine: %s", var, CodeBlock::smCurrentParser->getCurrentFile(), lineNumber, lineText);
scriptErrorHandler(str);
assign(var, TypeReqString, lineNumber, false);

4
Engine/source/gui/controls/guiGameListMenuCtrl.cpp
View file

@ -974,7 +974,9 @@ void GuiGameListMenuCtrl::doScriptCommand(StringTableEntry command)
if (command && command[0])
{
setThisControl();
Con::evaluate(command, false, __FILE__);
StringTableEntry objectName = getName() != StringTable->EmptyString() ? getName() : getInternalName();
String context = String::ToString("%s, Object: %s", Platform::makeRelativePathName(getFilename(), NULL), objectName);
Con::evaluate(command, false, context);
}
}

4
Engine/source/gui/controls/guiGameSettingsCtrl.cpp
View file

@ -494,7 +494,9 @@ void GuiGameSettingsCtrl::doScriptCommand(StringTableEntry command)
if (command && command[0])
{
setThisControl();
Con::evaluate(command, false, __FILE__);
StringTableEntry objectName = getName() != StringTable->EmptyString() ? getName() : getInternalName();
String context = String::ToString("%s, Object: %s", Platform::makeRelativePathName(getFilename(), NULL), objectName);
Con::evaluate(command, false, context);
}
}

4
Engine/source/gui/controls/guiListBoxCtrl.cpp
View file

@ -1539,7 +1539,9 @@ StringTableEntry GuiListBoxCtrl::_makeMirrorItemName( SimObject *inObj )
Con::setIntVariable( "$ThisControl", getId() );
Con::setIntVariable( "$ThisObject", inObj->getId() );
outName = StringTable->insert( Con::evaluate( mMakeNameCallback ).value, true );
StringTableEntry objectName = getName() != StringTable->EmptyString() ? getName() : getInternalName();
String context = String::ToString("%s, Object: %s", Platform::makeRelativePathName(getFilename(), NULL), objectName);
outName = StringTable->insert( Con::evaluate( mMakeNameCallback, false, context).value, true );
}
else if ( inObj->getName() )
outName = StringTable->insert( inObj->getName() );

4
Engine/source/gui/controls/guiMLTextEditCtrl.cpp
View file

@ -211,7 +211,9 @@ bool GuiMLTextEditCtrl::onKeyDown(const GuiEvent& event)
case KEY_ESCAPE:
if ( mEscapeCommand[0] )
{
Con::evaluate( mEscapeCommand );
StringTableEntry objectName = getName() != StringTable->EmptyString() ? getName() : getInternalName();
String context = String::ToString("%s, Object: %s", Platform::makeRelativePathName(getFilename(), NULL), objectName);
Con::evaluate( mEscapeCommand, false, context );
return( true );
}
return( Parent::onKeyDown( event ) );

4
Engine/source/gui/core/guiControl.cpp
View file

@ -2495,7 +2495,9 @@ void GuiControl::getCursor(GuiCursor *&cursor, bool &showCursor, const GuiEvent
const char* GuiControl::evaluate( const char* str )
{
smThisControl = this;
const char* result = Con::evaluate(str, false).value;
StringTableEntry objectName = getName() != StringTable->EmptyString() ? getName() : getInternalName();
String context = String::ToString("%s, Object: %s", Platform::makeRelativePathName(getFilename(), NULL), objectName);
const char* result = Con::evaluate(str, false, context).value;
smThisControl = NULL;
return result;

8
Engine/source/sim/actionMap.cpp
View file

@ -1482,8 +1482,12 @@ bool ActionMap::processAction(const InputEventInfo* pEvent)
if(pNode->flags & Node::BindCmd)
{
// it's a bind command
if(pNode->makeConsoleCommand)
Con::evaluate(pNode->makeConsoleCommand);
if (pNode->makeConsoleCommand)
{
StringTableEntry objectName = getName() != StringTable->EmptyString() ? getName() : getInternalName();
String context = String::ToString("%s, Object: %s", Platform::makeRelativePathName(getFilename(), NULL), objectName);
Con::evaluate(pNode->makeConsoleCommand, false, context);
}
}
else if (pNode->flags & Node::Held)
{