Started with promela datamodel

4 files changed, 46 insertions, 2 deletions

diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
index ad2952a..dece4f2 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
@@ -628,6 +628,27 @@ void JSCDataModel::init(const std::string& location, const Data& data) {
 	}
 }
 
+std::string JSCDataModel::andExpressions(std::list<std::string> expressions) {
+
+	if (expressions.size() == 0)
+		return "";
+	
+	if (expressions.size() == 1)
+		return *(expressions.begin());
+	
+	std::ostringstream exprSS;
+	exprSS << "(";
+	std::string conjunction = "";
+	for (std::list<std::string>::const_iterator exprIter = expressions.begin();
+			 exprIter != expressions.end();
+			 exprIter++) {
+		exprSS << conjunction << "(" << *exprIter << ")";
+		conjunction = " && ";
+	}
+	exprSS << ")";
+	return exprSS.str();
+}
+
 void JSCDataModel::handleException(JSValueRef exception) {
 	JSStringRef exceptionStringRef = JSValueToStringCopy(_ctx, exception, NULL);
 	size_t maxSize = JSStringGetMaximumUTF8CStringSize(exceptionStringRef);
@@ -685,7 +706,7 @@ JSValueRef JSCDataModel::jsIn(JSContextRef ctx, JSObjectRef function, JSObjectRe
 			std::string stateName(buffer);
 			free(buffer);
 
-			if (Interpreter::isMember(INSTANCE->_interpreter->getState(stateName), INSTANCE->_interpreter->getConfiguration())) {
+			if (INSTANCE->_interpreter->isInState(stateName)) {
 				continue;
 			}
 		}
diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
index c79c29e..7443439 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
@@ -79,6 +79,8 @@ public:
 	                  const std::string& content);
 	virtual void init(const std::string& location, const Data& data);
 
+	virtual std::string andExpressions(std::list<std::string>);
+
 protected:
 	Arabica::DOM::JSCDOM* _dom;
 
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
index e7c0c72..1341d09 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
@@ -438,7 +438,7 @@ v8::Handle<v8::Value> V8DataModel::jsIn(const v8::Arguments& args) {
 	for (unsigned int i = 0; i < args.Length(); i++) {
 		if (args[i]->IsString()) {
 			std::string stateName(*v8::String::AsciiValue(args[i]->ToString()));
-			if (Interpreter::isMember(INSTANCE->_interpreter->getState(stateName), INSTANCE->_interpreter->getConfiguration())) {
+			if (INSTANCE->_interpreter->isInState(stateName)) {
 				continue;
 			}
 		}
@@ -658,6 +658,25 @@ void V8DataModel::init(const std::string& location,
 	}
 }
 
+std::string V8DataModel::andExpressions(std::list<std::string> expressions) {
+	if (expressions.size() == 0)
+		return "";
+	
+	if (expressions.size() == 1)
+		return *(expressions.begin());
+
+	std::ostringstream exprSS;
+	exprSS << "(";
+	std::string conjunction = "";
+	for (std::list<std::string>::const_iterator exprIter = expressions.begin();
+			 exprIter != expressions.end();
+			 exprIter++) {
+		exprSS << conjunction << "(" << *exprIter << ")";
+		conjunction = " && ";
+	}
+	exprSS << ")";
+	return exprSS.str();
+}
 
 v8::Handle<v8::Value> V8DataModel::evalAsValue(const std::string& expr, bool dontThrow) {
 	v8::TryCatch tryCatch;
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h
index 0a64a2e..a0a1b09 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h
@@ -80,6 +80,8 @@ public:
 	virtual void init(const std::string& location,
 	                  const Data& data);
 
+	virtual std::string andExpressions(std::list<std::string>);
+
 	virtual Data getStringAsData(const std::string& content);
 	virtual Data getValueAsData(const v8::Handle<v8::Value>& value,
 	                            std::set<v8::Value*>& alreadySeen);