summaryrefslogtreecommitdiffstats
path: root/src/uscxml/plugins/datamodel/ecmascript
diff options
context:
space:
mode:
authorStefan Radomski <sradomski@mintwerk.de>2016-01-10 02:40:12 (GMT)
committerStefan Radomski <sradomski@mintwerk.de>2016-01-10 02:40:12 (GMT)
commit613cf9fb6fe4b24bc7852d5a31953f6ff419e43c (patch)
tree8459365c5a6a00503063b0bf1d516fce5ea4d891 /src/uscxml/plugins/datamodel/ecmascript
parentc699a4057a65a9a09f78310d8e12588f2dc072cd (diff)
downloaduscxml-613cf9fb6fe4b24bc7852d5a31953f6ff419e43c.zip
uscxml-613cf9fb6fe4b24bc7852d5a31953f6ff419e43c.tar.gz
uscxml-613cf9fb6fe4b24bc7852d5a31953f6ff419e43c.tar.bz2
Beautified code
Diffstat (limited to 'src/uscxml/plugins/datamodel/ecmascript')
-rw-r--r--src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp24
-rw-r--r--src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h6
-rw-r--r--src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp12
3 files changed, 21 insertions, 21 deletions
diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
index 40b6cc2..fd4da3c 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp
@@ -89,10 +89,10 @@ JSCDataModel::~JSCDataModel() {
void JSCDataModel::addExtension(DataModelExtension* ext) {
if (_extensions.find(ext) != _extensions.end())
return;
-
+
ext->dm = this;
_extensions.insert(ext);
-
+
JSObjectRef currScope = JSContextGetGlobalObject(_ctx);
std::list<std::string> locPath = InterpreterImpl::tokenize(ext->provides(), '.');
std::list<std::string>::iterator locIter = locPath.begin();
@@ -108,7 +108,7 @@ void JSCDataModel::addExtension(DataModelExtension* ext) {
JSValueRef newScope = JSObjectGetProperty(_ctx, currScope, pathCompJS, NULL);
JSStringRelease(pathCompJS);
-
+
if (JSValueIsObject(_ctx, newScope)) {
currScope = JSValueToObject(_ctx, newScope, NULL);
} else {
@@ -129,10 +129,10 @@ void JSCDataModel::addExtension(DataModelExtension* ext) {
JSValueRef JSCDataModel::jsExtension(JSContextRef ctx, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception) {
DataModelExtension* extension = (DataModelExtension*)JSObjectGetPrivate(function);
-
+
JSStringRef memberRef;
std::string memberName;
-
+
if (argumentCount > 0 && JSValueIsString(ctx, arguments[0])) {
memberRef = JSValueToStringCopy(ctx, arguments[0], exception);
size_t maxSize = JSStringGetMaximumUTF8CStringSize(memberRef);
@@ -192,16 +192,16 @@ JSClassDefinition JSCDataModel::jsInvokersClassDef = { 0, 0, "invokers", 0, 0, 0
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 9bc39d6..2a2b1cc 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
+++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h
@@ -105,7 +105,7 @@ protected:
static bool jsInvokerHasProp(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName);
static JSValueRef jsInvokerGetProp(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception);
static void jsInvokerListProps(JSContextRef ctx, JSObjectRef object, JSPropertyNameAccumulatorRef propertyNames);
-
+
JSValueRef getNodeAsValue(const Arabica::DOM::Node<std::string>& node);
JSValueRef getDataAsValue(const Data& data);
Data getValueAsData(const JSValueRef value);
@@ -117,10 +117,10 @@ protected:
std::string _name;
std::set<DataModelExtension*> _extensions;
-
+
Event _event;
JSGlobalContextRef _ctx;
-
+
};
#ifdef BUILD_AS_PLUGINS
diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
index 99df4a7..3004b91 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp
@@ -93,7 +93,7 @@ V8DataModel::~V8DataModel() {
void V8DataModel::addExtension(DataModelExtension* ext) {
if (_extensions.find(ext) != _extensions.end())
return;
-
+
ext->dm = this;
_extensions.insert(ext);
@@ -107,13 +107,13 @@ void V8DataModel::addExtension(DataModelExtension* ext) {
while(true) {
std::string pathComp = *locIter;
v8::Local<v8::String> pathCompJS = v8::String::New(locIter->c_str());
-
+
if (++locIter != locPath.end()) {
// just another intermediate step
if (!currScope->Has(pathCompJS)) {
currScope->Set(pathCompJS, v8::Object::New());
}
-
+
v8::Local<v8::Value> newScope = currScope->Get(pathCompJS);
if (newScope->IsObject()) {
currScope = newScope->ToObject();
@@ -133,19 +133,19 @@ v8::Handle<v8::Value> V8DataModel::jsExtension(const v8::Arguments& args) {
v8::Local<v8::String> memberJS;
std::string memberName;
-
+
if (args.Length() > 0 && args[0]->IsString()) {
memberJS = args[0]->ToString();
memberName = *v8::String::AsciiValue(memberJS);
}
-
+
if (args.Length() > 1) {
// setter
Data data = ((V8DataModel*)(extension->dm))->getValueAsData(args[1]);
extension->setValueOf(memberName, data);
return v8::Undefined();
}
-
+
if (args.Length() == 1) {
// getter
return ((V8DataModel*)(extension->dm))->getDataAsValue(extension->getValueOf(memberName));