Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 1 file). Show all
Unified · Split
| @@ -564,7 +564,6 @@ void ScriptEngine::resetModuleCache(bool deleteScriptCache) { · 563 unmodified lines | |||
| 564 | if (it.flags() & QScriptValue::SkipInEnumeration) { | 564 | if (it.flags() & QScriptValue::SkipInEnumeration) { |
| 565 | continue; | 565 | continue; |
| 566 | } | 566 | } |
| 567 | //scriptCache->deleteScript(it.name()); | ||
| 568 | qCDebug(scriptengine) << "resetModuleCache(true) -- staging " << it.name() << " for cache reset at next require"; | 567 | qCDebug(scriptengine) << "resetModuleCache(true) -- staging " << it.name() << " for cache reset at next require"; |
| 569 | cacheMeta.setProperty(it.name(), true); | 568 | cacheMeta.setProperty(it.name(), true); |
| 570 | } | 569 | } |
| @@ -594,8 +593,8 @@ void ScriptEngine::init() { · 23 unmodified lines | |||
| 594 | entityScriptingInterface->init(); | 593 | entityScriptingInterface->init(); |
| 595 | connect(entityScriptingInterface.data(), &EntityScriptingInterface::deletingEntity, this, [this](const EntityItemID& entityID) { | 594 | connect(entityScriptingInterface.data(), &EntityScriptingInterface::deletingEntity, this, [this](const EntityItemID& entityID) { |
| 596 | if (_entityScripts.contains(entityID)) { | 595 | if (_entityScripts.contains(entityID)) { |
| 597 | if (isEntityScriptRunning(entityID)) { | 596 | if (isEntityScriptRunning(entityID) && !isStopping()) { |
| 598 | qCWarning(scriptengine) << "deletingEntity while entity script is still running!" << entityID; | 597 | qCWarning(scriptengine) << "deletingEntity while entity script is still running" << entityID; |
| 599 | } | 598 | } |
| 600 | _entityScripts.remove(entityID); | 599 | _entityScripts.remove(entityID); |
| 601 | emit entityScriptDetailsUpdated(); | 600 | emit entityScriptDetailsUpdated(); |
| @@ -954,7 +953,7 @@ QScriptValue ScriptEngine::evaluate(const QString& sourceCode, const QString& fi · 352 unmodified lines | |||
| 954 | syntaxError.setProperty("detail", "evaluate"); | 953 | syntaxError.setProperty("detail", "evaluate"); |
| 955 | } | 954 | } |
| 956 | raiseException(syntaxError); | 955 | raiseException(syntaxError); |
| 957 | maybeEmitUncaughtException(__FUNCTION__); | 956 | maybeEmitUncaughtException("lint"); |
| 958 | return syntaxError; | 957 | return syntaxError; |
| 959 | } | 958 | } |
| 960 | QScriptProgram program { sourceCode, fileName, lineNumber }; | 959 | QScriptProgram program { sourceCode, fileName, lineNumber }; |
| @@ -962,14 +961,14 @@ QScriptValue ScriptEngine::evaluate(const QString& sourceCode, const QString& fi · 1 unmodified line | |||
| 962 | // can this happen? | 961 | // can this happen? |
| 963 | auto err = makeError("could not create QScriptProgram for " + fileName); | 962 | auto err = makeError("could not create QScriptProgram for " + fileName); |
| 964 | raiseException(err); | 963 | raiseException(err); |
| 965 | maybeEmitUncaughtException(__FUNCTION__); | 964 | maybeEmitUncaughtException("compile"); |
| 966 | return err; | 965 | return err; |
| 967 | } | 966 | } |
| 968 | 967 | ||
| 969 | QScriptValue result; | 968 | QScriptValue result; |
| 970 | { | 969 | { |
| 971 | result = BaseScriptEngine::evaluate(program); | 970 | result = BaseScriptEngine::evaluate(program); |
| 972 | maybeEmitUncaughtException(__FUNCTION__); | 971 | maybeEmitUncaughtException("evaluate"); |
| 973 | } | 972 | } |
| 974 | return result; | 973 | return result; |
| 975 | } | 974 | } |
| @@ -1644,11 +1643,11 @@ QScriptValue ScriptEngine::require(const QString& moduleId) { · 668 unmodified lines | |||
| 1644 | 1643 | ||
| 1645 | auto exports = module.property("exports"); | 1644 | auto exports = module.property("exports"); |
| 1646 | if (!invalidateCache && exports.isObject()) { | 1645 | if (!invalidateCache && exports.isObject()) { |
| 1647 | // we have found a cacheed module -- just need to possibly register it with current parent | 1646 | // we have found a cached module -- just need to possibly register it with current parent |
| 1648 | qCDebug(scriptengine_module) << QString("require - using cached module '%1' for '%2' (loaded: %3)") | 1647 | qCDebug(scriptengine_module) << QString("require - using cached module '%1' for '%2' (loaded: %3)") |
| 1649 | .arg(modulePath).arg(moduleId).arg(module.property("loaded").toString()); | 1648 | .arg(modulePath).arg(moduleId).arg(module.property("loaded").toString()); |
| 1650 | registerModuleWithParent(module, parent); | 1649 | registerModuleWithParent(module, parent); |
| 1651 | maybeEmitUncaughtException(__FUNCTION__); | 1650 | maybeEmitUncaughtException("cached module"); |
| 1652 | return exports; | 1651 | return exports; |
| 1653 | } | 1652 | } |
| 1654 | 1653 | ||
| @@ -2380,9 +2379,12 @@ void ScriptEngine::unloadEntityScript(const EntityItemID& entityID) { · 725 unmodified lines | |||
| 2380 | const EntityScriptDetails &oldDetails = _entityScripts[entityID]; | 2379 | const EntityScriptDetails &oldDetails = _entityScripts[entityID]; |
| 2381 | if (isEntityScriptRunning(entityID)) { | 2380 | if (isEntityScriptRunning(entityID)) { |
| 2382 | callEntityScriptMethod(entityID, "unload"); | 2381 | callEntityScriptMethod(entityID, "unload"); |
| 2383 | } else { | 2382 | } |
| 2383 | #ifdef DEBUG_ENTITY_STATES | ||
| 2384 | else { | ||
| 2384 | qCDebug(scriptengine) << "unload called while !running" << entityID << oldDetails.status; | 2385 | qCDebug(scriptengine) << "unload called while !running" << entityID << oldDetails.status; |
| 2385 | } | 2386 | } |
| 2387 | #endif | ||
| 2386 | if (oldDetails.status != EntityScriptStatus::UNLOADED) { | 2388 | if (oldDetails.status != EntityScriptStatus::UNLOADED) { |
| 2387 | EntityScriptDetails newDetails; | 2389 | EntityScriptDetails newDetails; |
| 2388 | newDetails.status = EntityScriptStatus::UNLOADED; | 2390 | newDetails.status = EntityScriptStatus::UNLOADED; |