Changeset 17498

Timestamp:

01/07/14 16:11:13 (11 years ago)

Author:

tbretz

Message:

Implemented that one can wait for 'not a state' to check if a state has been changed away from something.

Location:

trunk/FACT++

Files:

• scripts/doc/dim.js (modified) (1 diff)
• src/InterpreterV8.cc (modified) (3 diffs)

trunk/FACT++/scripts/doc/dim.js

@@ -115 +115 @@
  * @param {String} name
  *     The name of the server of which you want to wait for a state.
- *     The name must not contain quotation marks.
+ *     The name must not contain quotation marks. To wait for
+ *     "not the given state", prefix the server name with an
+ *     exclamation mark, e.g. "!DIM_CONTROL"
  *
  * @param {String,Integer} state

trunk/FACT++/src/InterpreterV8.cc

@@ -362 +362 @@
     const string state   = args[1]->IsString() ? *String::AsciiValue(args[1]) : "";
     const string arg1    = args[1]->IsString() ? ("\""+state+"\"") : to_string(args[1]->Int32Value());
+    const bool   isNot   = arg0[0]=='!';
+    const string name    = isNot ? arg0.substr(1) : arg0;
 
     if (arg0.find_first_of("\"'")!=string::npos)
@@ -377 +379 @@
                       "{"
                          "var s = dim.state(name);"
-                         "if(!s)throw new Error('Waiting for state "+arg1+" of server "+arg0+" failed.');"
+                         "if(!s)throw new Error('Waiting for state "+arg1+" of server "+arg0+" failed.');";
+    if (isNot)
+                         "if(state=="+index+")return true;";
+    else
                          "if(state=="+index+")return true;";
     if (timeout)
@@ -387 +392 @@
         code +=    "if(ms>0)throw new Error('Waiting for state "+arg1+" of server "+arg0+" timed out.');";
     code +=        "return false;"
-                   "})('"+arg0+"',"+arg1;
+                   "})('"+name+"',"+arg1;
     if (timeout)
         code +=    "," + (args[2]->IsUndefined()?"undefined":to_string(args[2]->Int32Value()));