development/webtester
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added test for multidimensional for loop

Browse Source
This commit is contained in:
Marc Wäckerlin
2015-10-11 15:28:53 +00:00
parent 9fad6a0397
commit 7ad5b32893
3 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/commands.hxx
View File

@@ -762,6 +762,9 @@ class Script: public QObject {
_variables[name] = value;
_rvariables[value] = name;
}
QStringList variables() {
return _variables.keys();
}
QString variable(QString name) {
QMap<QString, QString>::iterator it(_variables.find(name));
if (it==_variables.end()) throw VariableNotFound(name);
@@ -1675,11 +1678,11 @@ class Set: public Command {
Logger log(this, script);
if (_next) {
_next->execute(script, frame);
script->set(script->replacevars(_name),
script->set(_name,
script->replacevars(_next->result()));
log(_name+"='"+_next->result().replace("\\", "\\\\").replace("'", "\\'")+"'");
} else {
script->set(script->replacevars(_name),
script->set(_name,
script->replacevars(_value));
log(_name+"='"+_value.replace("\\", "\\\\").replace("'", "\\'")+"'");
}
@@ -2414,6 +2417,8 @@ inline bool Command::runScript(Command* parentCommand,
disconnect(&scriptCopy, SIGNAL(logging(QString)),
parent, SLOT(parentlog(QString)));
parentCommand->_result = scriptCopy.result();
Q_FOREACH(QString key, scriptCopy.variables())
if (!vars.contains(key)) parent->set(key, scriptCopy.variable(key));
if (parentCommand->_result.size())
parent->log("result: "+parentCommand->_result);
return res;