diff options
Diffstat (limited to 'src/uscxml/plugins/datamodel/ecmascript')
8 files changed, 17 insertions, 14 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" diff --git a/src/uscxml/plugins/datamodel/ecmascript/Storage.cpp b/src/uscxml/plugins/datamodel/ecmascript/Storage.cpp index edab33c..980fc5d 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/Storage.cpp +++ b/src/uscxml/plugins/datamodel/ecmascript/Storage.cpp @@ -19,6 +19,8 @@ #include "Storage.h" #include <iostream> +#include <fstream> +#include <istream> namespace uscxml { diff --git a/src/uscxml/plugins/datamodel/ecmascript/Storage.h b/src/uscxml/plugins/datamodel/ecmascript/Storage.h index 6ec62dd..35bde86 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/Storage.h +++ b/src/uscxml/plugins/datamodel/ecmascript/Storage.h @@ -22,8 +22,6 @@ #include <string> #include <map> -#include <fstream> -#include <istream> namespace uscxml { diff --git a/src/uscxml/plugins/datamodel/ecmascript/TypedArray.h b/src/uscxml/plugins/datamodel/ecmascript/TypedArray.h index 7509390..a49410c 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/TypedArray.h +++ b/src/uscxml/plugins/datamodel/ecmascript/TypedArray.h @@ -21,7 +21,7 @@ #define TYPEDARRAY_H_99815BLY #include "uscxml/Common.h" -#include "uscxml/Message.h" +#include "uscxml/messages/Blob.h" #include <string> #include <vector> diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp index 3004b91..85ae0cd 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp +++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp @@ -46,7 +46,7 @@ #include "dom/V8DataView.h" #include "uscxml/Message.h" -#include "uscxml/DOMUtils.h" +#include "uscxml/dom/DOMUtils.h" #include <glog/logging.h> #ifdef BUILD_AS_PLUGINS @@ -102,7 +102,7 @@ void V8DataModel::addExtension(DataModelExtension* ext) { v8::Context::Scope contextScope(_contexts.front()); v8::Handle<v8::Object> currScope = _contexts.front()->Global(); - 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; @@ -317,7 +317,7 @@ void V8DataModel::setEvent(const Event& event) { if (!json.empty()) { eventObj->Set(v8::String::New("data"), getDataAsValue(json)); } else { - eventObj->Set(v8::String::New("data"), v8::String::New(InterpreterImpl::spaceNormalize(event.content).c_str())); + eventObj->Set(v8::String::New("data"), v8::String::New(spaceNormalize(event.content).c_str())); } } else { // _event.data is KVP @@ -716,7 +716,7 @@ void V8DataModel::assign(const Element<std::string>& assignElem, try { evalAsValue(key + " = " + content); } catch (...) { - evalAsValue(key + " = " + "\"" + InterpreterImpl::spaceNormalize(content) + "\""); + evalAsValue(key + " = " + "\"" + spaceNormalize(content) + "\""); } } else { global->Set(v8::String::New(key.c_str()), v8::Undefined()); diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h index 35cc12d..8e665b7 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h +++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h @@ -20,7 +20,7 @@ #ifndef V8DATAMODEL_H_KN8TWG0V #define V8DATAMODEL_H_KN8TWG0V -#include "uscxml/Interpreter.h" +#include "uscxml/InterpreterInfo.h" #include <list> #include <v8.h> #include "V8DOM.h" |