summaryrefslogtreecommitdiffstats
path: root/src/uscxml/transform
diff options
context:
space:
mode:
authorStefan Radomski <sradomski@mintwerk.de>2016-01-20 23:27:47 (GMT)
committerStefan Radomski <sradomski@mintwerk.de>2016-01-20 23:27:47 (GMT)
commit762eb95910cd4dfad6a84f97332b7549b2fdbd69 (patch)
tree81cd2bef6106f28fbd6289c85e8a2d779a4fb1e0 /src/uscxml/transform
parent29586fff4c6ea5ded7e787e30fceafda84db23d1 (diff)
downloaduscxml-762eb95910cd4dfad6a84f97332b7549b2fdbd69.zip
uscxml-762eb95910cd4dfad6a84f97332b7549b2fdbd69.tar.gz
uscxml-762eb95910cd4dfad6a84f97332b7549b2fdbd69.tar.bz2
Reverted a erroneous bugfix
Diffstat (limited to 'src/uscxml/transform')
-rw-r--r--src/uscxml/transform/ChartToC.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/uscxml/transform/ChartToC.cpp b/src/uscxml/transform/ChartToC.cpp
index cb54257..e726d7f 100644
--- a/src/uscxml/transform/ChartToC.cpp
+++ b/src/uscxml/transform/ChartToC.cpp
@@ -1615,8 +1615,7 @@ void ChartToC::writeFSM(std::ostream& stream) {
stream << " bit_copy(history_targets, scxml_states[i].completion, " << _stateCharArraySize << ");" << std::endl;
stream << " bit_and(history_targets, ctx->history, " << _stateCharArraySize << ");" << std::endl;
stream << " bit_or(entry_set, history_targets, " << _stateCharArraySize << ");" << std::endl;
- stream << " if (SCXML_STATE_MASK(scxml_states[i].type) == SCXML_STATE_HAS_HISTORY || " << std::endl;
- stream << " SCXML_STATE_MASK(scxml_states[i].type) == SCXML_STATE_HISTORY_DEEP) {" << std::endl;
+ stream << " if (scxml_states[i].type == (SCXML_STATE_HAS_HISTORY | SCXML_STATE_HISTORY_DEEP)) {" << std::endl;
stream << " // a deep history state with nested histories -> more completion" << std::endl;
stream << " for (size_t j = i + 1; j < SCXML_NUMBER_STATES; j++) {" << std::endl;
stream << " if (IS_SET(j, scxml_states[i].completion) &&" << std::endl;