diff options
| author | Stefan Radomski <sradomski@mintwerk.de> | 2015-05-08 10:58:28 (GMT) |
|---|---|---|
| committer | Stefan Radomski <sradomski@mintwerk.de> | 2015-05-08 10:58:28 (GMT) |
| commit | 1bc525a7992f560735bb7e0de6981e8e6f616246 (patch) | |
| tree | a2ac035bb763b80c2c566194e78c92f1915c32dc /src/uscxml/transform/ChartToFSM.cpp | |
| parent | 81aa1c79dd158aa7bc76876552e4b1d05ecea656 (diff) | |
| download | uscxml-1bc525a7992f560735bb7e0de6981e8e6f616246.zip uscxml-1bc525a7992f560735bb7e0de6981e8e6f616246.tar.gz uscxml-1bc525a7992f560735bb7e0de6981e8e6f616246.tar.bz2 | |
Some fixes for transition preemption with flattening
Diffstat (limited to 'src/uscxml/transform/ChartToFSM.cpp')
| -rw-r--r-- | src/uscxml/transform/ChartToFSM.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/uscxml/transform/ChartToFSM.cpp b/src/uscxml/transform/ChartToFSM.cpp index 38262db..971ee10 100644 --- a/src/uscxml/transform/ChartToFSM.cpp +++ b/src/uscxml/transform/ChartToFSM.cpp @@ -820,8 +820,11 @@ template <typename T> bool PtrComp(const T * const & a, const T * const & b) { bool hasUnconditionalSuperset(GlobalTransition* first, GlobalTransition* second) { NodeSet<std::string> firstTransitions = first->getTransitions(); - NodeSet<std::string> secondTransitions = first->getTransitions(); + NodeSet<std::string> secondTransitions = second->getTransitions(); +// if (first->condition.size() > 0) +// return false; + if (isSuperset(second, first)) { for (int i = 0; i < firstTransitions.size(); i++) { if (!InterpreterImpl::isMember(firstTransitions[i], secondTransitions)) { |