diff options
| author | Stefan Radomski <github@mintwerk.de> | 2017-04-04 20:12:10 (GMT) |
|---|---|---|
| committer | Stefan Radomski <github@mintwerk.de> | 2017-04-04 20:12:10 (GMT) |
| commit | e0d37b8181e12030cc71d538ca08a80a924d5d4a (patch) | |
| tree | 7427160a272635611d5e6b49debecf767496b6df /src | |
| parent | 7b9377314da54f4858ab986d33325bda809d4fda (diff) | |
| download | uscxml-e0d37b8181e12030cc71d538ca08a80a924d5d4a.zip uscxml-e0d37b8181e12030cc71d538ca08a80a924d5d4a.tar.gz uscxml-e0d37b8181e12030cc71d538ca08a80a924d5d4a.tar.bz2 | |
Included UriParser in contrib directory
Diffstat (limited to 'src')
| -rw-r--r-- | src/uscxml/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/uscxml/debug/Breakpoint.h | 1 | ||||
| -rw-r--r-- | src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp | 6 |
3 files changed, 8 insertions, 1 deletions
diff --git a/src/uscxml/CMakeLists.txt b/src/uscxml/CMakeLists.txt index 5c8f582..276bd23 100644 --- a/src/uscxml/CMakeLists.txt +++ b/src/uscxml/CMakeLists.txt @@ -56,7 +56,7 @@ list (APPEND USCXML_FILES ${USCXML_SERVER}) file(GLOB USCXML_CORE ${CMAKE_SOURCE_DIR}/contrib/src/jsmn/jsmn.c ${CMAKE_SOURCE_DIR}/contrib/src/evws/evws.c - # ${CMAKE_SOURCE_DIR}/contrib/src/uriparser/src/*.c + ${CMAKE_SOURCE_DIR}/contrib/src/uriparser/src/*.c *.cpp *.h ) diff --git a/src/uscxml/debug/Breakpoint.h b/src/uscxml/debug/Breakpoint.h index feaf221..a9d96f8 100644 --- a/src/uscxml/debug/Breakpoint.h +++ b/src/uscxml/debug/Breakpoint.h @@ -52,6 +52,7 @@ public: subject = UNDEF_SUBJECT; when = UNDEF_WHEN; action = UNDEF_ACTION; + enabled = true; } Breakpoint(const Data& data); diff --git a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp index 5adf337..863bd5b 100644 --- a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp +++ b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp @@ -448,6 +448,12 @@ void PromelaDataModel::setEvent(const Event& event) { return Data(dataToInt(evaluateExpr(*opIter++)) << dataToInt(evaluateExpr(*opIter++))); case PML_RSHIFT: return Data(dataToInt(evaluateExpr(*opIter++)) >> dataToInt(evaluateExpr(*opIter++))); + case PML_ASGN: { + PromelaParserNode* lhs = *opIter++; + PromelaParserNode* rhs = *opIter++; + setVariable(lhs, evaluateExpr(rhs)); + break; + } case PML_AND: case PML_OR: { PromelaParserNode* lhs = *opIter++; |