Plenty of smaller fixes and adaptations

2 files changed, 12 insertions, 1 deletions

diff --git a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp
index 679177a..2621c66 100644
--- a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp
@@ -211,6 +211,16 @@ bool PromelaDataModel::isLocation(const std::string& expr) {
 	return true;
 }
 
+bool PromelaDataModel::isValidSyntax(const std::string& expr) {
+	try {
+		PromelaParser parser(expr);
+	} catch (Event e) {
+		std::cerr << e << std::endl;
+		return false;
+	}
+	return true;
+}
+
 uint32_t PromelaDataModel::getLength(const std::string& expr) {
 	if (!isDeclared(expr)) {
 		ERROR_EXECUTION_THROW("Variable '" + expr + "' was not declared");
@@ -593,7 +603,7 @@ void PromelaDataModel::setVariable(void* ast, const Data& value) {
 			if (value.compound.size() > 0 || value.atom.size() > 0)
 				ERROR_EXECUTION_THROW("Variable " + node->value + " is an array");
 			
-			if (_variables[node->value].compound["size"] < value.array.size())
+			if (strTo<size_t>(_variables[node->value].compound["size"].atom) < value.array.size())
 				ERROR_EXECUTION_THROW("Array assigned to " + node->value + " is too large");
 		}
 
diff --git a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h
index 581c761..25fe536 100644
--- a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h
+++ b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h
@@ -47,6 +47,7 @@ public:
 
 	virtual bool validate(const std::string& location, const std::string& schema);
 	virtual bool isLocation(const std::string& expr);
+	virtual bool isValidSyntax(const std::string& expr);
 
 	virtual uint32_t getLength(const std::string& expr);
 	virtual void setForeach(const std::string& item,