summaryrefslogtreecommitdiffstats
path: root/src/uscxml/interpreter
diff options
context:
space:
mode:
authorStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-04-02 18:42:17 (GMT)
committerStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-04-02 18:42:17 (GMT)
commitf627a8a8b139a42568f67dc18679d92806e0ff4e (patch)
tree0ef345134ce775c6fca5ec35d2b6eecddbf3450e /src/uscxml/interpreter
parentf19be97dea6fd8da994392d6fa7de5b3f0d9bf3e (diff)
downloaduscxml-f627a8a8b139a42568f67dc18679d92806e0ff4e.zip
uscxml-f627a8a8b139a42568f67dc18679d92806e0ff4e.tar.gz
uscxml-f627a8a8b139a42568f67dc18679d92806e0ff4e.tar.bz2
More bug-fixes for W3C tests
Diffstat (limited to 'src/uscxml/interpreter')
-rw-r--r--src/uscxml/interpreter/InterpreterDraft6.cpp13
1 files changed, 4 insertions, 9 deletions
diff --git a/src/uscxml/interpreter/InterpreterDraft6.cpp b/src/uscxml/interpreter/InterpreterDraft6.cpp
index b53ba4e..82785e8 100644
--- a/src/uscxml/interpreter/InterpreterDraft6.cpp
+++ b/src/uscxml/interpreter/InterpreterDraft6.cpp
@@ -33,11 +33,6 @@ void InterpreterDraft6::interpret() {
if (_dataModel) {
_dataModel.assign("_x.args", _cmdLineOptions);
- if (_httpServlet) {
- Data data;
- data.compound["location"] = Data(_httpServlet->getURL(), Data::VERBATIM);
- _dataModel.assign("_ioprocessors['http']", data);
- }
}
setupIOProcessors();
@@ -127,7 +122,7 @@ void InterpreterDraft6::initializeData(const Arabica::DOM::Node<std::string>& da
LOG(ERROR) << "Cannot initialize data when no datamodel is given!";
return;
}
-
+
if (!HAS_ATTR(data, "id")) {
LOG(ERROR) << "Data element has no id!";
return;
@@ -185,7 +180,7 @@ void InterpreterDraft6::initializeData(const Arabica::DOM::Node<std::string>& da
} catch (Event e) {
LOG(ERROR) << "Syntax error in data element:" << std::endl << e << std::endl;
- }
+ }
}
void InterpreterDraft6::mainEventLoop() {
@@ -337,7 +332,7 @@ void InterpreterDraft6::mainEventLoop() {
if (!enabledTransitions.empty())
microstep(enabledTransitions);
}
-
+
EXIT_INTERPRETER:
monIter = _monitors.begin();
while(monIter != _monitors.end()) {
@@ -359,7 +354,7 @@ EXIT_INTERPRETER:
sendIter++;
}
}
-
+
monIter = _monitors.begin();
while(monIter != _monitors.end()) {
try {