2 files changed, 14 insertions, 0 deletions
diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
index 6dc8c26..73a3744 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
@@ -482,6 +482,19 @@ void JSCDataModel::setForeach(const std::string& item,
 	}
 }
 
+bool JSCDataModel::isLocation(const std::string& expr) {
+	JSStringRef scriptJS = JSStringCreateWithUTF8CString((expr + "++").c_str());
+	JSValueRef exception = NULL;
+	bool valid = JSCheckScriptSyntax(_ctx, scriptJS, NULL, 0, &exception);
+	JSStringRelease(scriptJS);
+
+	if (exception || !valid) {
+		return false;
+	}
+	return true;
+}
+
+
 bool JSCDataModel::isDeclared(const std::string& expr) {
 	JSStringRef scriptJS = JSStringCreateWithUTF8CString(expr.c_str());
 	JSValueRef exception = NULL;
diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
index 82882f0..fea2234 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
@@ -49,6 +49,7 @@ public:
 	}
 
 	virtual bool validate(const std::string& location, const std::string& schema);
+	virtual bool isLocation(const std::string& expr);
 	virtual void setEvent(const Event& event);
 	virtual Data getStringAsData(const std::string& content);