diff options
| author | Stefan Radomski <sradomski@mintwerk.de> | 2016-02-23 11:28:18 (GMT) |
|---|---|---|
| committer | Stefan Radomski <sradomski@mintwerk.de> | 2016-02-23 11:28:18 (GMT) |
| commit | 7212d5a3dbbd2845d09df96b2c345132c8a24931 (patch) | |
| tree | 194bf3525bc7b607013301b79dde6c9950ccbf2e /src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore | |
| parent | 8e62f3801b98bf4b7f7f85b848b2fe6339c99162 (diff) | |
| download | uscxml-7212d5a3dbbd2845d09df96b2c345132c8a24931.zip uscxml-7212d5a3dbbd2845d09df96b2c345132c8a24931.tar.gz uscxml-7212d5a3dbbd2845d09df96b2c345132c8a24931.tar.bz2 | |
Some refactoring for improved compile times
Diffstat (limited to 'src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore')
3 files changed, 9 insertions, 6 deletions
diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDOM.h b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDOM.h index cb196ff..0b49c92 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDOM.h +++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDOM.h @@ -20,7 +20,7 @@ #ifndef JSCDOM_H_1RC5LCG8 #define JSCDOM_H_1RC5LCG8 -#include "uscxml/Interpreter.h" +#include "uscxml/InterpreterInfo.h" #include <JavaScriptCore/JavaScriptCore.h> #include <XPath/XPath.hpp> #include "../Storage.h" diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp index 86bafd3..d3eb0ef 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp +++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp @@ -19,6 +19,8 @@ #include "uscxml/Common.h" #include "uscxml/config.h" +#include "uscxml/URL.h" +#include "uscxml/util/String.h" #include "JSCDataModel.h" #include "JSCDOM.h" @@ -41,7 +43,7 @@ #include "dom/JSCDataView.h" #include "uscxml/Message.h" -#include "uscxml/DOMUtils.h" +#include "uscxml/dom/DOMUtils.h" #include <glog/logging.h> #ifdef BUILD_AS_PLUGINS @@ -94,7 +96,7 @@ void JSCDataModel::addExtension(DataModelExtension* ext) { _extensions.insert(ext); JSObjectRef currScope = JSContextGetGlobalObject(_ctx); - std::list<std::string> locPath = InterpreterImpl::tokenize(ext->provides(), '.'); + std::list<std::string> locPath = tokenize(ext->provides(), '.'); std::list<std::string>::iterator locIter = locPath.begin(); while(true) { std::string pathComp = *locIter; @@ -309,7 +311,7 @@ void JSCDataModel::setEvent(const Event& event) { handleException(exception); } else { JSStringRef propName = JSStringCreateWithUTF8CString("data"); - JSStringRef contentStr = JSStringCreateWithUTF8CString(InterpreterImpl::spaceNormalize(event.content).c_str()); + JSStringRef contentStr = JSStringCreateWithUTF8CString(spaceNormalize(event.content).c_str()); JSObjectSetProperty(_ctx, eventObj, propName, JSValueMakeString(_ctx, contentStr), 0, &exception); JSStringRelease(propName); JSStringRelease(contentStr); @@ -701,7 +703,7 @@ void JSCDataModel::assign(const Element<std::string>& assignElem, throw Event(); assign(key, Data(d, Data::INTERPRETED)); } catch (Event e) { - assign(key, Data("\"" + InterpreterImpl::spaceNormalize(content) + "\"", Data::INTERPRETED)); + assign(key, Data("\"" + spaceNormalize(content) + "\"", Data::INTERPRETED)); } } else { JSValueRef exception = NULL; diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h index 2a2b1cc..ccadc79 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h +++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h @@ -20,7 +20,8 @@ #ifndef JSCDATAMODEL_H_KN8TWG0V #define JSCDATAMODEL_H_KN8TWG0V -#include "uscxml/Interpreter.h" +#include "uscxml/InterpreterInfo.h" +#include "uscxml/plugins/DataModel.h" #include <list> #include <JavaScriptCore/JavaScriptCore.h> #include "JSCDOM.h" |