diff options
Diffstat (limited to 'src/uscxml/plugins/datamodel')
| -rw-r--r-- | src/uscxml/plugins/datamodel/CMakeLists.txt | 54 | ||||
| -rw-r--r-- | src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp | 13 |
2 files changed, 33 insertions, 34 deletions
diff --git a/src/uscxml/plugins/datamodel/CMakeLists.txt b/src/uscxml/plugins/datamodel/CMakeLists.txt index 0634984..8acbcf7 100644 --- a/src/uscxml/plugins/datamodel/CMakeLists.txt +++ b/src/uscxml/plugins/datamodel/CMakeLists.txt @@ -3,13 +3,13 @@ if (APPLE AND IOS AND OFF) FIND_LIBRARY(JSC_LIBRARY JavaScriptCore) set(JSC_FOUND ON) file(GLOB JSC_DATAMODEL - src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/*.cpp - src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/*.h + ecmascript/JavaScriptCore/*.cpp + ecmascript/JavaScriptCore/*.h ) source_group("Datamodel\\jsc" FILES ${JSC_DATAMODEL}) file(GLOB_RECURSE JSC_DOM - src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/dom/*.cpp - src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/dom/*.h + ecmascript/JavaScriptCore/dom/*.cpp + ecmascript/JavaScriptCore/dom/*.h ) source_group("Datamodel\\DOM" FILES ${JSC_DOM}) if (BUILD_AS_PLUGINS) @@ -33,8 +33,8 @@ endif() # NULL datamodel file(GLOB NULL_DATAMODEL - src/uscxml/plugins/datamodel/null/*.cpp - src/uscxml/plugins/datamodel/null/*.h + null/*.cpp + null/*.h ) source_group("Datamodel\\null" FILES ${NULL_DATAMODEL}) if (BUILD_AS_PLUGINS) @@ -49,8 +49,8 @@ endif() # XPath datamodel file(GLOB XPATH_DATAMODEL - src/uscxml/plugins/datamodel/xpath/*.cpp - src/uscxml/plugins/datamodel/xpath/*.h + xpath/*.cpp + xpath/*.h ) source_group("Datamodel\\xpath" FILES ${XPATH_DATAMODEL}) if (BUILD_AS_PLUGINS) @@ -66,17 +66,15 @@ endif() #if (NOT APPLE OR IOS) # set(ENV{V8_SRC} ${CMAKE_SOURCE_DIR}/../v8) - find_package(V8) if (V8_FOUND) - list (APPEND USCXML_INCLUDE_DIRS ${V8_INCLUDE_DIR}) file(GLOB V8_DATAMODEL - src/uscxml/plugins/datamodel/ecmascript/v8/*.cpp - src/uscxml/plugins/datamodel/ecmascript/v8/*.h + ecmascript/v8/*.cpp + ecmascript/v8/*.h ) source_group("Datamodel\\v8" FILES ${V8_DATAMODEL}) file(GLOB_RECURSE V8_DOM - src/uscxml/plugins/datamodel/ecmascript/v8/dom/*.cpp - src/uscxml/plugins/datamodel/ecmascript/v8/dom/*.h + ecmascript/v8/dom/*.cpp + ecmascript/v8/dom/*.h ) source_group("Datamodel\\v8\\DOM" FILES ${V8_DOM}) @@ -92,7 +90,6 @@ endif() else() list (APPEND USCXML_FILES ${V8_DATAMODEL}) list (APPEND USCXML_FILES ${V8_DOM}) - list (APPEND USCXML_OPT_LIBS ${V8_LIBRARY}) endif() endif() #endif() @@ -100,19 +97,18 @@ endif() # SWI PROLOG datamodel -#set(SWI_INCLUDE_HINT ${CMAKE_SOURCE_DIR}/../pl-devel/include) -#set(SWI_LIBRARY_HINT ${CMAKE_SOURCE_DIR}/../pl-devel/lib/x86_64-darwin12.2.0) -find_package(SWI) -#find_package(GMP) -#find_package(CURSES) if (SWI_FOUND) - list (APPEND USCXML_INCLUDE_DIRS ${SWI_INCLUDE_DIR}) # message(FATAL_ERROR "SWI_INCLUDE_DIR: ${SWI_INCLUDE_DIR}") -# include_directories(${GMP_INCLUDE_DIR}) -# include_directories(${CURSES_INCLUDE_DIR}) + + # if(${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang") + # set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -read_only_relocs suppress") + # set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -read_only_relocs suppress") + # set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -read_only_relocs suppress") + # set(CMAKE_LINKER_FLAGS "${CMAKE_LINKER_FLAGS} -read_only_relocs suppress") + # endif() file(GLOB_RECURSE SWI_DATAMODEL - src/uscxml/plugins/datamodel/prolog/swi/*.cpp - src/uscxml/plugins/datamodel/prolog/swi/*.h + prolog/swi/*.cpp + prolog/swi/*.h ) source_group("Datamodel\\swi" FILES ${SWI_DATAMODEL}) if (BUILD_AS_PLUGINS) @@ -121,12 +117,14 @@ if (SWI_FOUND) ${SWI_DATAMODEL}) target_link_libraries(datamodel_swi uscxml -# ${GMP_LIBRARY} -# ${CURSES_LIBRARIES} + ${GMP_LIBRARY} + ${CURSES_LIBRARIES} ${SWI_LIBRARY}) set_target_properties(datamodel_swi PROPERTIES FOLDER "Plugin DataModel") else() list (APPEND USCXML_FILES ${SWI_DATAMODEL}) - list (APPEND USCXML_OPT_LIBS ${SWI_LIBRARY}) # ${GMP_LIBRARY} ${CURSES_LIBRARIES}) endif() endif() + +set(USCXML_INCLUDE_DIRS ${USCXML_INCLUDE_DIRS} PARENT_SCOPE) +set(USCXML_FILES ${USCXML_FILES} PARENT_SCOPE)
\ No newline at end of file diff --git a/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp b/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp index 1af56b5..6b2f039 100644 --- a/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp +++ b/src/uscxml/plugins/datamodel/xpath/XPathDataModel.cpp @@ -338,7 +338,7 @@ std::string XPathDataModel::evalAsString(const std::string& expr) { case STRING: return result.asString(); break; - case BOOL: + case Arabica::XPath::BOOL: // MSVC croaks with ambiguous symbol without qualified name return (result.asBool() ? "true" : "false"); break; case NUMBER: @@ -482,10 +482,11 @@ void XPathDataModel::init(const Element<std::string>& dataElem, case STRING: container.appendChild(_doc.createTextNode(expr.asString())); break; - case NUMBER: + case NUMBER: { container.appendChild(_doc.createTextNode(toStr(expr.asNumber()))); break; - case BOOL: + } + case Arabica::XPath::BOOL: case ANY: throw Event("error.execution", Event::PLATFORM); } @@ -531,7 +532,7 @@ void XPathDataModel::assign(const XPathValue<std::string>& key, case STRING: assign(key.asNodeSet(), value.asString(), assignElem); break; - case BOOL: + case Arabica::XPath::BOOL: assign(key.asNodeSet(), value.asBool(), assignElem); break; case NUMBER: @@ -546,7 +547,7 @@ void XPathDataModel::assign(const XPathValue<std::string>& key, break; } case STRING: - case BOOL: + case Arabica::XPath::BOOL: case NUMBER: case ANY: throw Event("error.execution", Event::PLATFORM); @@ -564,7 +565,7 @@ void XPathDataModel::assign(const XPathValue<std::string>& key, break; } case STRING: - case BOOL: + case Arabica::XPath::BOOL: case NUMBER: case ANY: throw Event("error.execution", Event::PLATFORM); |