TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 07:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #2237 from JeffProgrammer/codeinterpreter_cleanup

Browse source 
Small Cleanup to CodeInterpreter
This commit is contained in:
Areloch 2018-04-30 22:52:12 -05:00 • committed by GitHub
commit 532cc4ad1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Engine/source/console/codeInterpreter.cpp
View file

@ -426,12 +426,12 @@ ConsoleValueRef CodeInterpreter::exec(U32 ip,
} }
if (thisNamespace && thisNamespace->mName) if (thisNamespace && thisNamespace->mName)
{ {
dSprintf(sTraceBuffer + dStrlen(sTraceBuffer), sizeof(sTraceBuffer) - dStrlen(sTraceBuffer), dSprintf(sTraceBuffer + dStrlen(sTraceBuffer), (U32)(sizeof(sTraceBuffer) - dStrlen(sTraceBuffer)),
"%s::%s() - return %s", thisNamespace->mName, mThisFunctionName, STR.getStringValue()); "%s::%s() - return %s", thisNamespace->mName, mThisFunctionName, STR.getStringValue());
} }
else else
{ {
dSprintf(sTraceBuffer + dStrlen(sTraceBuffer), sizeof(sTraceBuffer) - dStrlen(sTraceBuffer), dSprintf(sTraceBuffer + dStrlen(sTraceBuffer), (U32)(sizeof(sTraceBuffer) - dStrlen(sTraceBuffer)),
"%s() - return %s", mThisFunctionName, STR.getStringValue()); "%s() - return %s", mThisFunctionName, STR.getStringValue());
} }
Con::printf("%s", sTraceBuffer); Con::printf("%s", sTraceBuffer);
@ -477,12 +477,12 @@ void CodeInterpreter::parseArgs(U32 &ip)
} }
if (mExec.thisNamespace && mExec.thisNamespace->mName) if (mExec.thisNamespace && mExec.thisNamespace->mName)
{ {
dSprintf(sTraceBuffer + dStrlen(sTraceBuffer), sizeof(sTraceBuffer) - dStrlen(sTraceBuffer), dSprintf(sTraceBuffer + dStrlen(sTraceBuffer), (U32)(sizeof(sTraceBuffer) - dStrlen(sTraceBuffer)),
"%s::%s(", mExec.thisNamespace->mName, mThisFunctionName); "%s::%s(", mExec.thisNamespace->mName, mThisFunctionName);
} }
else else
{ {
dSprintf(sTraceBuffer + dStrlen(sTraceBuffer), sizeof(sTraceBuffer) - dStrlen(sTraceBuffer), dSprintf(sTraceBuffer + dStrlen(sTraceBuffer), (U32)(sizeof(sTraceBuffer) - dStrlen(sTraceBuffer)),
"%s(", mThisFunctionName); "%s(", mThisFunctionName);
} }
for (S32 i = 0; i < wantedArgc; i++) for (S32 i = 0; i < wantedArgc; i++)
@ -2388,9 +2388,6 @@ OPCodeReturn CodeInterpreter::op_callfunc_pointer(U32 &ip)
{ {
const char* nsName = ""; const char* nsName = "";
Namespace::Entry::CallbackUnion * nsCb = &mNSEntry->cb;
const char * nsUsage = mNSEntry->mUsage;
#ifndef TORQUE_DEBUG #ifndef TORQUE_DEBUG
// [tom, 12/13/2006] This stops tools functions from working in the console, // [tom, 12/13/2006] This stops tools functions from working in the console,
// which is useful behavior when debugging so I'm ifdefing this out for debug builds. // which is useful behavior when debugging so I'm ifdefing this out for debug builds.
@ -2589,8 +2586,6 @@ OPCodeReturn CodeInterpreter::op_callfunc_this(U32 &ip)
} }
else else
{ {
Namespace::Entry::CallbackUnion * nsCb = &mNSEntry->cb;
const char * nsUsage = mNSEntry->mUsage;
const char* nsName = ns ? ns->mName : ""; const char* nsName = ns ? ns->mName : "";
#ifndef TORQUE_DEBUG #ifndef TORQUE_DEBUG
// [tom, 12/13/2006] This stops tools functions from working in the console, // [tom, 12/13/2006] This stops tools functions from working in the console,