Browse Source

Merge pull request #1272 from Azaezel/alpha41/argcCapReport

enhanced argc reporting
Brian Roberts 1 năm trước cách đây
mục cha
commit
dd7147b34a

+ 1 - 1
Engine/source/console/consoleInternal.cpp

@@ -1173,7 +1173,7 @@ ConsoleValue Namespace::Entry::execute(S32 argc, ConsoleValue *argv, SimObject *
 
 
    if ((mMinArgs && argc < mMinArgs) || (mMaxArgs && argc > mMaxArgs))
    if ((mMinArgs && argc < mMinArgs) || (mMaxArgs && argc > mMaxArgs))
    {
    {
-      Con::warnf(ConsoleLogEntry::Script, "%s::%s - wrong number of arguments.", mNamespace->mName, mFunctionName);
+      Con::warnf(ConsoleLogEntry::Script, "%s::%s - wrong number of arguments. got %d, expected %d to %d", mNamespace->mName, mFunctionName, argc, mMinArgs, mMaxArgs);
       Con::warnf(ConsoleLogEntry::Script, "usage: %s", mUsage);
       Con::warnf(ConsoleLogEntry::Script, "usage: %s", mUsage);
       return std::move(ConsoleValue());
       return std::move(ConsoleValue());
    }
    }

+ 1 - 1
Engine/source/console/torquescript/compiledEval.cpp

@@ -1909,7 +1909,7 @@ Con::EvalResult CodeBlock::exec(U32 ip, const char* functionName, Namespace* thi
             if ((nsEntry->mMinArgs && S32(callArgc) < nsEntry->mMinArgs) || (nsEntry->mMaxArgs && S32(callArgc) > nsEntry->mMaxArgs))
             if ((nsEntry->mMinArgs && S32(callArgc) < nsEntry->mMinArgs) || (nsEntry->mMaxArgs && S32(callArgc) > nsEntry->mMaxArgs))
             {
             {
                const char* nsName = ns ? ns->mName : "";
                const char* nsName = ns ? ns->mName : "";
-               Con::warnf(ConsoleLogEntry::Script, "%s: %s::%s - wrong number of arguments.", getFileLine(ip - 4), nsName, fnName);
+               Con::warnf(ConsoleLogEntry::Script, "%s: %s::%s - wrong number of arguments. got %d, expected %d to %d", getFileLine(ip - 4), nsName, fnName, S32(callArgc), nsEntry->mMinArgs, nsEntry->mMaxArgs);
                Con::warnf(ConsoleLogEntry::Script, "%s: usage: %s", getFileLine(ip - 4), nsEntry->mUsage);
                Con::warnf(ConsoleLogEntry::Script, "%s: usage: %s", getFileLine(ip - 4), nsEntry->mUsage);
                gCallStack.popFrame();
                gCallStack.popFrame();
                stack[_STK + 1].setEmptyString();
                stack[_STK + 1].setEmptyString();