summaryrefslogtreecommitdiffstats
path: root/src/uscxml/plugins/datamodel
diff options
context:
space:
mode:
authorStefan Radomski <sradomski@mintwerk.de>2016-04-28 11:00:10 (GMT)
committerStefan Radomski <sradomski@mintwerk.de>2016-04-28 11:00:10 (GMT)
commit4750623a631e72c7a8be8d4172b33c83f20113a6 (patch)
tree64d626708595d3fe5438d75af1616870db724800 /src/uscxml/plugins/datamodel
parent454fa66e503e41465cba75a6bea00463a93a20ef (diff)
downloaduscxml-4750623a631e72c7a8be8d4172b33c83f20113a6.zip
uscxml-4750623a631e72c7a8be8d4172b33c83f20113a6.tar.gz
uscxml-4750623a631e72c7a8be8d4172b33c83f20113a6.tar.bz2
Fixed issue 64 and beautified code again
Diffstat (limited to 'src/uscxml/plugins/datamodel')
-rw-r--r--src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/dom/JSCTypedArrayCustom.cpp4
-rw-r--r--src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp10
-rw-r--r--src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp4
-rw-r--r--src/uscxml/plugins/datamodel/promela/parser/promela.lex.yy.cpp2
-rw-r--r--src/uscxml/plugins/datamodel/promela/parser/promela.tab.cpp2
5 files changed, 11 insertions, 11 deletions
diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/dom/JSCTypedArrayCustom.cpp b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/dom/JSCTypedArrayCustom.cpp
index 1738899..b5122e8 100644
--- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/dom/JSCTypedArrayCustom.cpp
+++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/dom/JSCTypedArrayCustom.cpp
@@ -36,7 +36,7 @@ char* name##Buffer = new char[name##MaxSize];\
JSStringGetUTF8CString(name, name##Buffer, name##MaxSize);\
std::string stringName(name##Buffer);\
free(name##Buffer);\
-
+
#define JSC_TYPED_ARRAY_GET_PROP_RETURN(type)\
size_t propMaxSize = JSStringGetMaximumUTF8CStringSize(propertyName);\
@@ -129,7 +129,7 @@ unsigned long index = boost::lexical_cast<unsigned long>(propName);\
if (array->getLength() > index)\
return true;\
return false;\
-
+
namespace Arabica {
namespace DOM {
diff --git a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp
index 77f4ef3..f6cb570 100644
--- a/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/lua/LuaDataModel.cpp
@@ -267,11 +267,11 @@ void LuaDataModel::setEvent(const Event& event) {
ERROR_EXECUTION_THROW(e.what());
}
} else {
- // some error events have a dom node attached - do not throw for them
- // issue65
- if (!nameMatch("error.*", event.name)) {
- ERROR_EXECUTION_THROW("No DOM support in Lua datamodel");
- }
+ // some error events have a dom node attached - do not throw for them
+ // issue65
+ if (!nameMatch("error.*", event.name)) {
+ ERROR_EXECUTION_THROW("No DOM support in Lua datamodel");
+ }
}
} else if (event.content.length() > 0) {
// _event.data is a string or JSON
diff --git a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp
index 2ec9fea..8b120c8 100644
--- a/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp
+++ b/src/uscxml/plugins/datamodel/prolog/swi/SWIDataModel.cpp
@@ -41,10 +41,10 @@ extern "C" {
catch (PlException plex) { \
ERROR_EXECUTION_THROW((char*)plex); \
} \
-
+
#define PL_MODULE \
_interpreter.getSessionId().c_str() \
-
+
#define SET_PL_ENGINE(dm) \
assert(_swiEngines.find(dm) != _swiEngines.end()); \
int rc = PL_set_engine(_swiEngines[dm], NULL); \
diff --git a/src/uscxml/plugins/datamodel/promela/parser/promela.lex.yy.cpp b/src/uscxml/plugins/datamodel/promela/parser/promela.lex.yy.cpp
index 50e9776..3a99921 100644
--- a/src/uscxml/plugins/datamodel/promela/parser/promela.lex.yy.cpp
+++ b/src/uscxml/plugins/datamodel/promela/parser/promela.lex.yy.cpp
@@ -644,7 +644,7 @@ static yyconst flex_int16_t yy_rule_linenum[46] = {
#define YY_USER_INIT \
yycolumn = yylloc->first_line = yylloc->first_column = 0; \
yylineno = yylloc->last_line = yylloc->last_column = 0; \
-
+
//int yycolumn = 1;
#define YY_USER_ACTION \
diff --git a/src/uscxml/plugins/datamodel/promela/parser/promela.tab.cpp b/src/uscxml/plugins/datamodel/promela/parser/promela.tab.cpp
index 05ca549..098c890 100644
--- a/src/uscxml/plugins/datamodel/promela/parser/promela.tab.cpp
+++ b/src/uscxml/plugins/datamodel/promela/parser/promela.tab.cpp
@@ -1596,7 +1596,7 @@ yysetstate:
{
yytype_int16 *yyss1 = yyss;
union yyalloc *yyptr =
- (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+ (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
if (! yyptr)
goto yyexhaustedlab;
YYSTACK_RELOCATE (yyss_alloc, yyss);