Update ScriptEngine.cpp

Just some revisions...
This commit is contained in:
Kalila L 2020-09-03 01:41:31 -04:00
parent 4096d75bb4
commit ab46b1fc9e

View file

@ -120,7 +120,7 @@ static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine) {
// was this generated by a script engine? If we don't recognize it then send the message and exit
ScriptEngine* scriptEngine = qobject_cast<ScriptEngine*>(engine);
if (scriptEngine == nullptr) {
if (!scriptEngine) {
qCDebug(scriptengine_script, "%s", qUtf8Printable(message));
return QScriptValue();
}
@ -130,20 +130,17 @@ static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine) {
AbstractLoggerInterface* loggerInterface = AbstractLoggerInterface::get();
if (loggerInterface->showSourceDebugging()) {
QScriptContext* userContext = context;
while (userContext != nullptr && QScriptContextInfo(userContext).functionType() == QScriptContextInfo::NativeFunction) {
while (userContext && QScriptContextInfo(userContext).functionType() == QScriptContextInfo::NativeFunction) {
userContext = userContext->parentContext();
}
QString location;
if (userContext != nullptr) {
if (userContext) {
QScriptContextInfo contextInfo(userContext);
QString fileName = contextInfo.fileName();
int lineNumber = contextInfo.lineNumber();
QString functionName = contextInfo.functionName();
location = functionName;
if (lineNumber != -1) {
location = QString("%1:%2").arg(location).arg(lineNumber);
}
if (!fileName.isEmpty()) {
if (location.isEmpty()) {
location = fileName;
@ -151,6 +148,9 @@ static QScriptValue debugPrint(QScriptContext* context, QScriptEngine* engine) {
location = QString("%1 at %2").arg(location).arg(fileName);
}
}
if (lineNumber != -1) {
location = QString("%1:%2").arg(location).arg(lineNumber);
}
}
if (location.isEmpty()) {
location = scriptEngine->getFilename();