Some more refactoring and VHDL transformation

1 files changed, 8 insertions, 8 deletions

diff --git a/src/uscxml/transform/ChartToFlatSCXML.cpp b/src/uscxml/transform/ChartToFlatSCXML.cpp
index 984c287..ac91681 100644
--- a/src/uscxml/transform/ChartToFlatSCXML.cpp
+++ b/src/uscxml/transform/ChartToFlatSCXML.cpp
@@ -32,7 +32,7 @@ if (childs.size() > 0) { \
 	pendingComments.clear(); \
 	if (stateId.length() > 0) \
 		transientState.setAttribute("id", stateId); \
-	for (int i = 0; i < childs.size(); i++) { \
+	for (size_t i = 0; i < childs.size(); i++) { \
 		Node<std::string> imported = _flatDoc.importNode(childs[i], true); \
 		transientState.appendChild(imported); \
 	} \
@@ -64,7 +64,7 @@ void ChartToFlatSCXML::writeTo(std::ostream& stream) {
 
 	// remove all debug attributes
 	NodeSet<std::string> elementNodes = DOMUtils::filterChildType(Node_base::ELEMENT_NODE, _scxml, true);
-	for (int i = 0; i < elementNodes.size(); i++) {
+	for (size_t i = 0; i < elementNodes.size(); i++) {
 		Element<std::string> element(elementNodes[i]);
 		if (!envVarIsTrue("USCXML_ANNOTATE_GLOBAL_TRANS_SENDS") && HAS_ATTR(element, "send"))
 			element.removeAttribute("send");
@@ -94,7 +94,7 @@ void ChartToFlatSCXML::createDocument() {
 	{
 		NodeSet<std::string> allElements = DOMUtils::filterChildType(Node_base::ELEMENT_NODE, _scxml, true);
 		size_t nrElements = 0;
-		for (int i = 0; i < allElements.size(); i++) {
+		for (size_t i = 0; i < allElements.size(); i++) {
 			if (!isInEmbeddedDocument(allElements[i]))
 				nrElements++;
 		}
@@ -138,7 +138,7 @@ void ChartToFlatSCXML::createDocument() {
 		// with early binding, copy all datamodel elements into scxml element
 		datas = _xpath.evaluate("//" + _nsInfo.xpathPrefix + "datamodel", _origSCXML).asNodeSet();
 	}
-	for (int i = 0; i < datas.size(); i++) {
+	for (size_t i = 0; i < datas.size(); i++) {
 		if (isInEmbeddedDocument(datas[i]))
 			continue; // nested document
 		Node<std::string> imported = _flatDoc.importNode(datas[i], true);
@@ -147,13 +147,13 @@ void ChartToFlatSCXML::createDocument() {
 
 
 	NodeSet<std::string> scripts = DOMUtils::filterChildElements(_nsInfo.xmlNSPrefix + "script", _origSCXML);
-	for (int i = 0; i < scripts.size(); i++) {
+	for (size_t i = 0; i < scripts.size(); i++) {
 		Node<std::string> imported = _flatDoc.importNode(scripts[i], true);
 		_scxml.appendChild(imported);
 	}
 
 	NodeSet<std::string> comments = DOMUtils::filterChildType(Node_base::COMMENT_NODE, _origSCXML);
-	for (int i = 0; i < comments.size(); i++) {
+	for (size_t i = 0; i < comments.size(); i++) {
 		Node<std::string> imported = _flatDoc.importNode(comments[i], true);
 		_scxml.appendChild(imported);
 	}
@@ -185,7 +185,7 @@ void ChartToFlatSCXML::createDocument() {
 	{
 		NodeSet<std::string> allElements = DOMUtils::filterChildType(Node_base::ELEMENT_NODE, _scxml, true);
 		size_t nrElements = 0;
-		for (int i = 0; i < allElements.size(); i++) {
+		for (size_t i = 0; i < allElements.size(); i++) {
 			if (!isInEmbeddedDocument(allElements[i]))
 				nrElements++;
 		}
@@ -385,7 +385,7 @@ Node<std::string> ChartToFlatSCXML::globalTransitionToNode(GlobalTransition* glo
 	if (transientStateChain.size() > 0) {
 		Element<std::string> prevExitTransitionElem;
 
-		for (int i = 0; i < transientStateChain.size(); i++) {
+		for (size_t i = 0; i < transientStateChain.size(); i++) {
 			Element<std::string> transientStateElem = Element<std::string>(transientStateChain[i]);
 			transientStateElem.setAttribute("id", transientStateElem.getAttribute("id") + "-via-" + toStr(_lastTransientStateId++));