Changeset 947

Timestamp:

Feb 8, 2014, 1:01:18 AM (11 years ago)

Author:

s10k

Message:

XmlTools
Custom_code fix, allows the user exit a procedure prematurely using "return"

File:

• XmlTools2/trunk/xmlpatch.cpp (modified) (3 diffs)

XmlTools2/trunk/xmlpatch.cpp

@@ -210 +210 @@
 
     UtilXmlTools::displaySuccessMessage(1,"@COMMAND");
+}
+
+QScriptValue echo(QScriptContext *context, QScriptEngine *engine)
+{
+    std::cout << context->argument(0).toString().toUtf8().constData() << std::endl;
+
+    return "";
 }
 
@@ -229 +236 @@
     QFile jsxmlfile(":/resources/libs/jsxml.js");
 
+    // Add echo function so user can debug the code
+    QScriptValue echoFunction = engine.newFunction(echo);
+    engine.globalObject().setProperty("echo", echoFunction);
+
     filesToProcess=UtilXmlTools::getAllXmlFilesByWildcard(filesWildcard);
 
@@ -263 +274 @@
         engine.globalObject().setProperty("$xmlData",currXmlFileString);
 
-        engineResult=engine.evaluate(jsString);
+        // main needs to be called so the user code is evaluated
+        engineResult=engine.evaluate("main(); function main() {"+jsString+"}"); // main funtion allows to use return to exit prematurely from user code
 
 #ifdef _USE_OLD_JS_ENGINE