Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 05:17:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename check functions and make them static

Browse source
This commit is contained in:
Atlante45 2015-10-27 12:39:40 -07:00
parent ffe73348fb
commit c0138bd189
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
libraries/script-engine/src/ScriptEngine.cpp
View file

@ -83,7 +83,7 @@ void inputControllerFromScriptValue(const QScriptValue &object, AbstractInputCon
out = qobject_cast<AbstractInputController*>(object.toQObject()); out = qobject_cast<AbstractInputController*>(object.toQObject());
} }
bool checkSyntax(const QScriptProgram& program) { static bool hasCorrectSyntax(const QScriptProgram& program) {
const auto syntaxCheck = QScriptEngine::checkSyntax(program.sourceCode()); const auto syntaxCheck = QScriptEngine::checkSyntax(program.sourceCode());
if (syntaxCheck.state() != QScriptSyntaxCheckResult::Valid) { if (syntaxCheck.state() != QScriptSyntaxCheckResult::Valid) {
const auto error = syntaxCheck.errorMessage(); const auto error = syntaxCheck.errorMessage();
@ -96,7 +96,7 @@ bool checkSyntax(const QScriptProgram& program) {
return true; return true;
} }
bool checkExceptions(QScriptEngine& engine, const QString& fileName) { static bool hadUncauchtExceptions(QScriptEngine& engine, const QString& fileName) {
if (engine.hasUncaughtException()) { if (engine.hasUncaughtException()) {
const auto backtrace = engine.uncaughtExceptionBacktrace(); const auto backtrace = engine.uncaughtExceptionBacktrace();
const auto exception = engine.uncaughtException().toString(); const auto exception = engine.uncaughtException().toString();
@ -109,9 +109,9 @@ bool checkExceptions(QScriptEngine& engine, const QString& fileName) {
message += QString("\n[Backtrace]%1%2").arg(lineSeparator, backtrace.join(lineSeparator)); message += QString("\n[Backtrace]%1%2").arg(lineSeparator, backtrace.join(lineSeparator));
} }
qCWarning(scriptengine) << qPrintable(message); qCWarning(scriptengine) << qPrintable(message);
return false; return true;
} }
return true; return false;
} }
ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString, ScriptEngine::ScriptEngine(const QString& scriptContents, const QString& fileNameString,
@ -608,7 +608,7 @@ QScriptValue ScriptEngine::evaluate(const QString& sourceCode, const QString& fi
// Check syntax // Check syntax
const QScriptProgram program(sourceCode, fileName, lineNumber); const QScriptProgram program(sourceCode, fileName, lineNumber);
if (!checkSyntax(program)) { if (!hasCorrectSyntax(program)) {
return QScriptValue(); return QScriptValue();
} }
@ -616,7 +616,7 @@ QScriptValue ScriptEngine::evaluate(const QString& sourceCode, const QString& fi
const auto result = QScriptEngine::evaluate(program); const auto result = QScriptEngine::evaluate(program);
--_evaluatesPending; --_evaluatesPending;
const auto hadUncaughtException = checkExceptions(*this, program.fileName()); const auto hadUncaughtException = hadUncauchtExceptions(*this, program.fileName());
if (_wantSignals) { if (_wantSignals) {
emit evaluationFinished(result, hadUncaughtException); emit evaluationFinished(result, hadUncaughtException);
} }
@ -685,7 +685,7 @@ void ScriptEngine::run() {
} }
lastUpdate = now; lastUpdate = now;
if (!checkExceptions(*this, _fileNameString)) { if (hadUncauchtExceptions(*this, _fileNameString)) {
stop(); stop();
} }
} }
@ -1009,7 +1009,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
auto fileName = QString("(EntityID:%1, %2)").arg(entityID.toString(), isURL ? scriptOrURL : "EmbededEntityScript"); auto fileName = QString("(EntityID:%1, %2)").arg(entityID.toString(), isURL ? scriptOrURL : "EmbededEntityScript");
QScriptProgram program(contents, fileName); QScriptProgram program(contents, fileName);
if (!checkSyntax(program)) { if (!hasCorrectSyntax(program)) {
if (!isFileUrl) { if (!isFileUrl) {
scriptCache->addScriptToBadScriptList(scriptOrURL); scriptCache->addScriptToBadScriptList(scriptOrURL);
} }
@ -1022,7 +1022,7 @@ void ScriptEngine::entityScriptContentAvailable(const EntityItemID& entityID, co
QScriptEngine sandbox; QScriptEngine sandbox;
QScriptValue testConstructor = sandbox.evaluate(program); QScriptValue testConstructor = sandbox.evaluate(program);
if (!checkExceptions(sandbox, program.fileName())) { if (hadUncauchtExceptions(sandbox, program.fileName())) {
return; return;
} }