diff options
| author | rlm <rlm@techsat.com> | 2020-05-13 13:52:04 (GMT) |
|---|---|---|
| committer | rlm <rlm@techsat.com> | 2020-05-13 13:52:04 (GMT) |
| commit | 06fb01af83ca81b827bbdbddddb3a5f2ae9fdfcf (patch) | |
| tree | ba1370212c3d8ff6263f0c2387b6ff83695ca2a0 | |
| parent | 358bfca30fbb055c5c47e8479246327231d83dca (diff) | |
| download | uscxml-06fb01af83ca81b827bbdbddddb3a5f2ae9fdfcf.zip uscxml-06fb01af83ca81b827bbdbddddb3a5f2ae9fdfcf.tar.gz uscxml-06fb01af83ca81b827bbdbddddb3a5f2ae9fdfcf.tar.bz2 | |
:Jira: ADSVHTNG-1209 - updated signature of set function as per TA standard version 5
Change-Id: I237727754143ce02a52f17b7a4b35bb89a7872a6
| -rwxr-xr-x | src/uscxml/transform/ChartToC.cpp | 6 | ||||
| -rw-r--r-- | src/uscxml/util/TASCXMLUtils.h | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/uscxml/transform/ChartToC.cpp b/src/uscxml/transform/ChartToC.cpp index a577127..31918ca 100755 --- a/src/uscxml/transform/ChartToC.cpp +++ b/src/uscxml/transform/ChartToC.cpp @@ -916,6 +916,7 @@ void ChartToC::writeTypes(std::ostream& stream) { stream << "struct uscxml_elem_taset {" << std::endl; stream << " const char* dataid;" << std::endl; stream << " const char* value;" << std::endl; + stream << " const char* valueexpr;" << std::endl; stream << "};" << std::endl; stream << std::endl; @@ -1873,13 +1874,14 @@ void ChartToC::writeElementInfo(std::ostream& stream) { if (tasets.size() > 0) { _hasElement.insert("set"); stream << "static const uscxml_elem_taset " << _prefix << "_elem_tasets[" << tasets.size() << "] = {" << std::endl; - stream << " /* dataid, value */" << std::endl; + stream << " /* dataid, value, valueexpr */" << std::endl; size_t i = 0; for (auto iter = tasets.begin(); iter != tasets.end(); iter++, i++) { DOMElement* taset = *iter; stream << " { "; stream << (HAS_ATTR(taset, tascxml::kXMLCharDataId) ? "\"" + escape(ATTR(taset, tascxml::kXMLCharDataId)) + "\"" : "NULL") << ", "; - stream << (HAS_ATTR(taset, tascxml::kXMLCharValue) ? "\"" + escape(ATTR(taset, tascxml::kXMLCharValue)) + "\"" : "NULL"); + stream << (HAS_ATTR(taset, tascxml::kXMLCharValue) ? "\"" + escape(ATTR(taset, tascxml::kXMLCharValue)) + "\"" : "NULL") << ", "; + stream << (HAS_ATTR(taset, tascxml::kXMLCharValueExpr) ? "\"" + escape(ATTR(taset, tascxml::kXMLCharValueExpr)) + "\"" : "NULL"); stream << " }" << (i + 1 < tasets.size() ? "," : "") << std::endl; taset->setAttribute(X("documentOrder"), X(toStr(i))); } diff --git a/src/uscxml/util/TASCXMLUtils.h b/src/uscxml/util/TASCXMLUtils.h index 9620b92..4d34695 100644 --- a/src/uscxml/util/TASCXMLUtils.h +++ b/src/uscxml/util/TASCXMLUtils.h @@ -18,8 +18,9 @@ namespace tascxml { static const uscxml::X kXMLCharCurrentVaue = uscxml::X("currentvalue"); static const uscxml::X kXMLCharDataId = uscxml::X("dataid"); - static const uscxml::X kXMLCharValue = uscxml::X("value"); + static const uscxml::X kXMLCharValue = uscxml::X("value"); + static const uscxml::X kXMLCharValueExpr = uscxml::X("valueexpr"); } -#endif
\ No newline at end of file +#endif |