diff options
Diffstat (limited to 'src/uscxml/plugins/datamodel')
14 files changed, 24 insertions, 24 deletions
diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp index dc0e281..551b590 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp +++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp @@ -189,18 +189,18 @@ JSClassDefinition JSCDataModel::jsExtensionClassDef = { 0, 0, "Extension", 0, 0, JSClassDefinition JSCDataModel::jsIOProcessorsClassDef = { 0, 0, "ioProcessors", 0, 0, 0, 0, 0, jsIOProcessorHasProp, jsIOProcessorGetProp, 0, 0, jsIOProcessorListProps, 0, 0, 0, 0 }; JSClassDefinition JSCDataModel::jsInvokersClassDef = { 0, 0, "invokers", 0, 0, 0, 0, 0, jsInvokerHasProp, jsInvokerGetProp, 0, 0, jsInvokerListProps, 0, 0, 0, 0 }; -boost::shared_ptr<DataModelImpl> JSCDataModel::create(InterpreterImpl* interpreter) { +boost::shared_ptr<DataModelImpl> JSCDataModel::create(InterpreterInfo* interpreter) { boost::shared_ptr<JSCDataModel> dm = boost::shared_ptr<JSCDataModel>(new JSCDataModel()); dm->_ctx = JSGlobalContextCreate(NULL); dm->_interpreter = interpreter; - dm->_dom = new JSCDOM(); - dm->_dom->xpath = new XPath<std::string>(); - dm->_dom->xpath->setNamespaceContext(*interpreter->getNameSpaceInfo().getNSContext()); - dm->_dom->storage = new Storage(URL::getResourceDir() + PATH_SEPERATOR + interpreter->getName() + ".storage"); - dm->_dom->nsInfo = new NameSpaceInfo(interpreter->getNameSpaceInfo()); - + dm->_dom = new JSCDOM(); + dm->_dom->xpath = new XPath<std::string>(); + dm->_dom->xpath->setNamespaceContext(*interpreter->getNameSpaceInfo().getNSContext()); + dm->_dom->storage = new Storage(URL::getResourceDir() + PATH_SEPERATOR + interpreter->getName() + ".storage"); + dm->_dom->nsInfo = new NameSpaceInfo(interpreter->getNameSpaceInfo()); + // introduce global functions as objects for private data JSClassRef jsInClassRef = JSClassCreate(&jsInClassDef); JSObjectRef jsIn = JSObjectMake(dm->_ctx, jsInClassRef, dm.get()); diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h index c2ba01c..944d185 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h +++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h @@ -40,7 +40,7 @@ class JSCDataModel : public DataModelImpl { public: JSCDataModel(); virtual ~JSCDataModel(); - virtual boost::shared_ptr<DataModelImpl> create(InterpreterImpl* interpreter); + virtual boost::shared_ptr<DataModelImpl> create(InterpreterInfo* interpreter); virtual void addExtension(DataModelExtension* ext); diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp index 5f18414..99df4a7 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp +++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp @@ -153,7 +153,7 @@ v8::Handle<v8::Value> V8DataModel::jsExtension(const v8::Arguments& args) { return v8::Undefined(); } -boost::shared_ptr<DataModelImpl> V8DataModel::create(InterpreterImpl* interpreter) { +boost::shared_ptr<DataModelImpl> V8DataModel::create(InterpreterInfo* interpreter) { boost::shared_ptr<V8DataModel> dm = boost::shared_ptr<V8DataModel>(new V8DataModel()); dm->_interpreter = interpreter; v8::Locker locker; diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h index 9e2ec71..35cc12d 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h +++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h @@ -41,7 +41,7 @@ class V8DataModel : public DataModelImpl { public: V8DataModel(); virtual ~V8DataModel(); - virtual boost::shared_ptr<DataModelImpl> create(InterpreterImpl* interpreter); + virtual boost::shared_ptr<DataModelImpl> create(InterpreterInfo* interpreter); virtual std::list<std::string> getNames() { std::list<std::string> names; diff --git a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp index 6e9b237..c55e143 100644 --- a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp +++ b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp @@ -139,7 +139,7 @@ static int luaInFunction(lua_State * l) { return 1; } -boost::shared_ptr<DataModelImpl> LuaDataModel::create(InterpreterImpl* interpreter) { +boost::shared_ptr<DataModelImpl> LuaDataModel::create(InterpreterInfo* interpreter) { boost::shared_ptr<LuaDataModel> dm = boost::shared_ptr<LuaDataModel>(new LuaDataModel()); dm->_interpreter = interpreter; dm->_luaState = luaL_newstate(); diff --git a/src/uscxml/plugins/datamodel/lua/LuaDataModel.h b/src/uscxml/plugins/datamodel/lua/LuaDataModel.h index 39990c6..bce1d62 100644 --- a/src/uscxml/plugins/datamodel/lua/LuaDataModel.h +++ b/src/uscxml/plugins/datamodel/lua/LuaDataModel.h @@ -44,7 +44,7 @@ class LuaDataModel : public DataModelImpl { public: LuaDataModel(); virtual ~LuaDataModel(); - virtual boost::shared_ptr<DataModelImpl> create(InterpreterImpl* interpreter); + virtual boost::shared_ptr<DataModelImpl> create(InterpreterInfo* interpreter); virtual std::list<std::string> getNames() { std::list<std::string> names; diff --git a/src/uscxml/plugins/datamodel/null/NULLDataModel.cpp b/src/uscxml/plugins/datamodel/null/NULLDataModel.cpp index ae75c88..c9f0d5a 100644 --- a/src/uscxml/plugins/datamodel/null/NULLDataModel.cpp +++ b/src/uscxml/plugins/datamodel/null/NULLDataModel.cpp @@ -43,7 +43,7 @@ bool pluginConnect(pluma::Host& host) { NULLDataModel::NULLDataModel() { } -boost::shared_ptr<DataModelImpl> NULLDataModel::create(InterpreterImpl* interpreter) { +boost::shared_ptr<DataModelImpl> NULLDataModel::create(InterpreterInfo* interpreter) { boost::shared_ptr<NULLDataModel> dm = boost::shared_ptr<NULLDataModel>(new NULLDataModel()); dm->_interpreter = interpreter; return dm; diff --git a/src/uscxml/plugins/datamodel/null/NULLDataModel.h b/src/uscxml/plugins/datamodel/null/NULLDataModel.h index da0374e..db5fa28 100644 --- a/src/uscxml/plugins/datamodel/null/NULLDataModel.h +++ b/src/uscxml/plugins/datamodel/null/NULLDataModel.h @@ -38,7 +38,7 @@ class NULLDataModel : public DataModelImpl { public: NULLDataModel(); virtual ~NULLDataModel(); - virtual boost::shared_ptr<DataModelImpl> create(InterpreterImpl* interpreter); + virtual boost::shared_ptr<DataModelImpl> create(InterpreterInfo* interpreter); virtual std::list<std::string> getNames() { std::list<std::string> names; diff --git a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp index 21b390a..09b5e15 100644 --- a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp +++ b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp @@ -89,7 +89,7 @@ SWIDataModel::~SWIDataModel() { RETHROW_PLEX_AS_EVENT; } -boost::shared_ptr<DataModelImpl> SWIDataModel::create(InterpreterImpl* interpreter) { +boost::shared_ptr<DataModelImpl> SWIDataModel::create(InterpreterInfo* interpreter) { try { boost::shared_ptr<SWIDataModel> dm = boost::shared_ptr<SWIDataModel>(new SWIDataModel()); dm->_interpreter = interpreter; diff --git a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h index b53afba..398e24c 100644 --- a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h +++ b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.h @@ -53,7 +53,7 @@ public: SWIDataModel(); virtual ~SWIDataModel(); - virtual boost::shared_ptr<DataModelImpl> create(InterpreterImpl* interpreter); + virtual boost::shared_ptr<DataModelImpl> create(InterpreterInfo* interpreter); virtual std::list<std::string> getNames() { std::list<std::string> names; diff --git a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp index 2ca2bb3..6e82b55 100644 --- a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp +++ b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.cpp @@ -59,7 +59,7 @@ PromelaDataModel::PromelaDataModel() { PromelaDataModel::~PromelaDataModel() { } -boost::shared_ptr<DataModelImpl> PromelaDataModel::create(InterpreterImpl* interpreter) { +boost::shared_ptr<DataModelImpl> PromelaDataModel::create(InterpreterInfo* interpreter) { boost::shared_ptr<PromelaDataModel> dm = boost::shared_ptr<PromelaDataModel>(new PromelaDataModel()); dm->_interpreter = interpreter; diff --git a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h index 25fe536..060560d 100644 --- a/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h +++ b/src/uscxml/plugins/datamodel/promela/PromelaDataModel.h @@ -33,7 +33,7 @@ class PromelaDataModel : public DataModelImpl { public: PromelaDataModel(); virtual ~PromelaDataModel(); - virtual boost::shared_ptr<DataModelImpl> create(InterpreterImpl* interpreter); + virtual boost::shared_ptr<DataModelImpl> create(InterpreterInfo* interpreter); virtual std::list<std::string> getNames() { std::list<std::string> names; diff --git a/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp b/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp index 8822579..de8eecb 100644 --- a/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp +++ b/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp @@ -46,7 +46,7 @@ bool pluginConnect(pluma::Host& host) { XPathDataModel::XPathDataModel() { } -boost::shared_ptr<DataModelImpl> XPathDataModel::create(InterpreterImpl* interpreter) { +boost::shared_ptr<DataModelImpl> XPathDataModel::create(InterpreterInfo* interpreter) { boost::shared_ptr<XPathDataModel> dm = boost::shared_ptr<XPathDataModel>(new XPathDataModel()); dm->_interpreter = interpreter; diff --git a/src/uscxml/plugins/datamodel/xpath/XPathDataModel.h b/src/uscxml/plugins/datamodel/xpath/XPathDataModel.h index fe454b3..9a71b79 100644 --- a/src/uscxml/plugins/datamodel/xpath/XPathDataModel.h +++ b/src/uscxml/plugins/datamodel/xpath/XPathDataModel.h @@ -39,14 +39,14 @@ public: XPathFunctionIn(int minArgs, int maxArgs, const std::vector<Arabica::XPath::XPathExpression<std::string> >& args, - InterpreterImpl* interpreter) : + InterpreterInfo* interpreter) : Arabica::XPath::BooleanXPathFunction<std::string>(minArgs, maxArgs, args), _interpreter(interpreter) {} protected: bool doEvaluate(const Arabica::DOM::Node<std::string>& context, const Arabica::XPath::ExecutionContext<std::string>& executionContext) const; - InterpreterImpl* _interpreter; + InterpreterInfo* _interpreter; }; class XPathFunctionResolver : public Arabica::XPath::FunctionResolver<std::string> { @@ -59,12 +59,12 @@ public: const std::vector<Arabica::XPath::XPathExpression<std::string> >& argExprs) const; virtual std::vector<std::pair<std::string, std::string> > validNames() const; - void setInterpreter(InterpreterImpl* interpreter) { + void setInterpreter(InterpreterInfo* interpreter) { _interpreter = interpreter; } protected: Arabica::XPath::StandardXPathFunctionResolver<std::string> _xpathFuncRes; - InterpreterImpl* _interpreter; + InterpreterInfo* _interpreter; }; class NodeSetVariableResolver : public Arabica::XPath::VariableResolver<std::string> { @@ -83,7 +83,7 @@ class XPathDataModel : public DataModelImpl { public: XPathDataModel(); virtual ~XPathDataModel(); - virtual boost::shared_ptr<DataModelImpl> create(InterpreterImpl* interpreter); + virtual boost::shared_ptr<DataModelImpl> create(InterpreterInfo* interpreter); virtual std::list<std::string> getNames() { std::list<std::string> names; |