diff options
4 files changed, 27 insertions, 27 deletions
diff --git a/src/uscxml/Interpreter.cpp b/src/uscxml/Interpreter.cpp index 9390ca4..1a79a63 100644 --- a/src/uscxml/Interpreter.cpp +++ b/src/uscxml/Interpreter.cpp @@ -258,7 +258,7 @@ std::list<InterpreterIssue> Interpreter::validate() { static void printNodeSet(Logger& logger, const std::list<XERCESC_NS::DOMElement*> nodes) { std::string seperator; for (auto nIter = nodes.begin(); nIter != nodes.end(); nIter++) { - LOG(logger, USCXML_VERBATIM) << seperator << (HAS_ATTR(*nIter, kXMLCharId) ? ATTR(*nIter, kXMLCharId) : DOMUtils::xPathForNode(*nIter)); + LOG(logger, USCXML_VERBATIM) << seperator << (HAS_ATTR(*nIter, kXMLCharId) ? ATTR(*nIter, kXMLCharId) : DOMUtils::xPathForNode(*nIter)); seperator = ", "; } } diff --git a/src/uscxml/interpreter/BasicContentExecutor.cpp b/src/uscxml/interpreter/BasicContentExecutor.cpp index f3f5376..9796c4c 100644 --- a/src/uscxml/interpreter/BasicContentExecutor.cpp +++ b/src/uscxml/interpreter/BasicContentExecutor.cpp @@ -66,7 +66,7 @@ void BasicContentExecutor::processSend(XERCESC_NS::DOMElement* element) { } else if (HAS_ATTR(element, kXMLCharEvent)) { sendEvent.name = ATTR(element, kXMLCharEvent); } - } catch (Event e) { + } catch (ErrorEvent e) { ERROR_EXECUTION_RETHROW(e, "Syntax error in send element eventexpr", element); } @@ -77,7 +77,7 @@ void BasicContentExecutor::processSend(XERCESC_NS::DOMElement* element) { } else if (HAS_ATTR(element, kXMLCharTarget)) { target = ATTR(element, kXMLCharTarget); } - } catch (Event e) { + } catch (ErrorEvent e) { ERROR_EXECUTION_RETHROW(e,"Syntax error in send element targetexpr", element); } @@ -88,7 +88,7 @@ void BasicContentExecutor::processSend(XERCESC_NS::DOMElement* element) { } else if (HAS_ATTR(element, kXMLCharType)) { type = ATTR(element, kXMLCharType); } - } catch (Event e) { + } catch (ErrorEvent e) { ERROR_EXECUTION_RETHROW(e, "Syntax error in send element typeexpr", element); } @@ -123,7 +123,7 @@ void BasicContentExecutor::processSend(XERCESC_NS::DOMElement* element) { sendEvent.hideSendId = true; } } - } catch (Event e) { + } catch (ErrorEvent e) { ERROR_EXECUTION_RETHROW(e, "Syntax error in send element idlocation", element); } @@ -147,14 +147,14 @@ void BasicContentExecutor::processSend(XERCESC_NS::DOMElement* element) { LOG(_callbacks->getLogger(), USCXML_ERROR) << "Cannot make sense of delay value " << delay << ": does not end in 's' or 'ms'" << std::endl; } } - } catch (Event e) { + } catch (ErrorEvent e) { ERROR_EXECUTION_RETHROW(e, "Syntax error in send element delayexpr", element); } try { // namelist processNameLists(sendEvent.namelist, element); - } catch (Event e) { + } catch (ErrorEvent e) { ERROR_EXECUTION_RETHROW(e, "Syntax error in send element namelist", element); } @@ -162,7 +162,7 @@ void BasicContentExecutor::processSend(XERCESC_NS::DOMElement* element) { try { // params processParams(sendEvent.params, element); - } catch (Event e) { + } catch (ErrorEvent e) { ERROR_EXECUTION_RETHROW(e, "Syntax error in send element param expr", element); } @@ -172,7 +172,7 @@ void BasicContentExecutor::processSend(XERCESC_NS::DOMElement* element) { if (contents.size() > 0) { sendEvent.data = elementAsData(contents.front()); } - } catch (Event e) { + } catch (ErrorEvent e) { ERROR_EXECUTION_RETHROW(e, "Syntax error in send element content", element); } @@ -430,14 +430,14 @@ void BasicContentExecutor::invoke(XERCESC_NS::DOMElement* element) { invokeId[invokeEvent.invokeid.size()] = 0; element->setUserData(kXMLCharInvokeId, (void*)invokeId, NULL); - } catch (Event e) { + } catch (ErrorEvent e) { ERROR_EXECUTION_RETHROW(e, "Syntax error in invoke element idlocation", element); } try { // namelist processNameLists(invokeEvent.namelist, element); - } catch (Event e) { + } catch (ErrorEvent e) { ERROR_EXECUTION_RETHROW(e, "Syntax error in send element namelist", element); } @@ -445,7 +445,7 @@ void BasicContentExecutor::invoke(XERCESC_NS::DOMElement* element) { try { // params processParams(invokeEvent.params, element); - } catch (Event e) { + } catch (ErrorEvent e) { ERROR_EXECUTION_RETHROW(e, "Syntax error in send element param expr", element); } @@ -466,7 +466,7 @@ void BasicContentExecutor::invoke(XERCESC_NS::DOMElement* element) { } #endif } - } catch (Event e) { + } catch (ErrorEvent e) { ERROR_EXECUTION_RETHROW(e, "Syntax error in invoke element content", element); } @@ -542,10 +542,10 @@ void BasicContentExecutor::raiseDoneEvent(XERCESC_NS::DOMElement* state, XERCESC _callbacks->enqueueInternal(e); // std::cout << exc << std::endl; // throw e; - } catch (Event e) { - ERROR_EXECUTION_RETHROW(e, "Error in donedata element", doneData); - } - + } catch (Event e) { + ERROR_EXECUTION_RETHROW(e, "Error in donedata element", doneData); + } + } _callbacks->enqueueInternal(doneEvent); diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp index 124da6e..4203305 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp +++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp @@ -778,7 +778,7 @@ void JSCDataModel::handleException(JSValueRef exception) { buffer.resize(maxSize); JSStringGetUTF8CString(exceptionStringRef, &buffer[0], maxSize); JSStringRelease(exceptionStringRef); - std::string exceptionMsg(buffer); + std::string exceptionMsg(buffer.c_str()); ERROR_EXECUTION_THROW(exceptionMsg); } @@ -842,7 +842,7 @@ bool JSCDataModel::jsIOProcessorHasProp(JSContextRef ctx, JSObjectRef object, JS std::string buffer; buffer.resize(maxSize); JSStringGetUTF8CString(propertyName, &buffer[0], maxSize); - std::string prop(buffer); + std::string prop(buffer.c_str()); return ioProcessors.find(prop) != ioProcessors.end(); } @@ -856,7 +856,7 @@ JSValueRef JSCDataModel::jsIOProcessorGetProp(JSContextRef ctx, JSObjectRef obje std::string buffer; buffer.resize(maxSize); JSStringGetUTF8CString(propertyName, &buffer[0], maxSize); - std::string prop(buffer); + std::string prop(buffer.c_str()); if (ioProcessors.find(prop) != ioProcessors.end()) { return INSTANCE->getDataAsValue(ioProcessors.find(prop)->second.getDataModelVariables()); @@ -886,7 +886,7 @@ bool JSCDataModel::jsInvokerHasProp(JSContextRef ctx, JSObjectRef object, JSStri std::string buffer; buffer.resize(maxSize); JSStringGetUTF8CString(propertyName, &buffer[0], maxSize); - std::string prop(buffer); + std::string prop(buffer.c_str()); return invokers.find(prop) != invokers.end(); } @@ -900,7 +900,7 @@ JSValueRef JSCDataModel::jsInvokerGetProp(JSContextRef ctx, JSObjectRef object, std::string buffer; buffer.resize(maxSize); JSStringGetUTF8CString(propertyName, &buffer[0], maxSize); - std::string prop(buffer); + std::string prop(buffer.c_str()); if (invokers.find(prop) != invokers.end()) { return INSTANCE->getDataAsValue(invokers.find(prop)->second.getDataModelVariables()); diff --git a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp index a764c82..0518a0e 100644 --- a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp +++ b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp @@ -409,11 +409,11 @@ void PromelaDataModel::setEvent(const Event& event) { case PML_NAME: { Data d = getVariable(node); if (d.atom.size() != 0) - // fixes issue 127 - if (isNumeric(d.atom.c_str(), 10)) { - return Data(d.atom, Data::VERBATIM); - } - return Data(d.asJSON(), Data::VERBATIM); + // fixes issue 127 + if (isNumeric(d.atom.c_str(), 10)) { + return Data(d.atom, Data::VERBATIM); + } + return Data(d.asJSON(), Data::VERBATIM); if (d.type == Data::INTERPRETED && d.atom[0] == '\'' && d.atom[d.atom.size() - 1] == '\'') return Data(d.atom.substr(1, d.atom.size() - 2), Data::VERBATIM); return d; |