diff options
86 files changed, 6033 insertions, 970 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 757aece..bbf30bb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,7 +9,7 @@ ELSE() SET(CMAKE_BUILD_TYPE Release CACHE STRING ${BUILD_TYPE_HELP}) ENDIF() -PROJECT(uscxml) +PROJECT(uSCXML) ################################################# # General Setup @@ -236,10 +236,22 @@ if (HAS_MODULE_XercesC) find_package(XercesC) else() message(STATUS "Could NOT find XercesC (your CMake distribution does not include the FindXercesC module)") + + # make a quick attempt to find xerces + INCLUDE(FindPackageHandleStandardArgs) + find_path(XercesC_INCLUDE_DIR NAMES "xercesc/util/PlatformUtils.hpp") + find_library(XercesC_LIBRARY NAMES "xerces-c" "xerces-c_3") + mark_as_advanced(XercesC_LIBRARY) + mark_as_advanced(XercesC_INCLUDE_DIR) + if (XercesC_INCLUDE_DIR AND XercesC_LIBRARY) + set(XercesC_FOUND ON) + endif() endif() + if (XercesC_FOUND) include_directories(${XercesC_INCLUDE_DIRS}) list (APPEND USCXML_CORE_LIBS ${XercesC_LIBRARIES}) + set(XERCESC_NS "xercesc_3_1") else() message(STATUS "--> will download and compile") include("${CMAKE_MODULE_PATH}/BuildXercesC.cmake") @@ -247,6 +259,7 @@ else() include_directories(${XercesC_INCLUDE_DIRS}) list (APPEND USCXML_CORE_LIBS ${XercesC_LIBRARIES}) list (APPEND USCXML_PREREQS xerces-c) + set(XERCESC_NS "xercesc_3_1") else() message(FATAL_ERROR "Could neither find nor build XercesC") endif() @@ -378,6 +391,11 @@ set_property(TARGET uscxml-transform PROPERTY CXX_STANDARD_REQUIRED ON) install_executable(TARGETS uscxml-transform COMPONENT tools) target_link_libraries(uscxml-transform uscxml uscxml_transform) +############################################################ +# Documentation +############################################################ + +add_subdirectory(docs) ############################################################ # Create config.h diff --git a/apps/uscxml-browser.cpp b/apps/uscxml-browser.cpp index cf666c9..cbbb21f 100644 --- a/apps/uscxml-browser.cpp +++ b/apps/uscxml-browser.cpp @@ -1,5 +1,7 @@ #include "uscxml/config.h" #include "uscxml/Interpreter.h" +#include "uscxml/debug/InterpreterIssue.h" +#include "uscxml/interpreter/InterpreterMonitor.h" #include "uscxml/util/DOM.h" #include <easylogging++.h> @@ -70,7 +72,7 @@ int main(int argc, char** argv) { } if (options.verbose) { - StateTransitionMonitor* vm = new StateTransitionMonitor(interpreter); + StateTransitionMonitor* vm = new StateTransitionMonitor(); vm->copyToInvokers(true); interpreter.setMonitor(vm); } diff --git a/config.h.in b/config.h.in index a9f29a2..ebbb98a 100644 --- a/config.h.in +++ b/config.h.in @@ -44,6 +44,8 @@ #cmakedefine USCXML_VERSION_PATCH "@USCXML_VERSION_PATCH@" #cmakedefine USCXML_VERSION "@USCXML_VERSION@" +#cmakedefine XERCESC_NS @XERCESC_NS@ + /** build type */ #cmakedefine CMAKE_BUILD_TYPE "@CMAKE_BUILD_TYPE@" #cmakedefine CMAKE_BUILD_TYPE_DEBUG diff --git a/contrib/cmake/CPackUSCXML.cmake b/contrib/cmake/CPackUSCXML.cmake index 1e61b1b..0f850f4 100644 --- a/contrib/cmake/CPackUSCXML.cmake +++ b/contrib/cmake/CPackUSCXML.cmake @@ -29,8 +29,8 @@ endforeach() file(GLOB_RECURSE USCXML_HEADERS ${PROJECT_SOURCE_DIR}/src/*.h - ${PROJECT_SOURCE_DIR}/src/*.hpp) -list(APPEND CMAKE_BINARY_DIR "${CMAKE_BINARY_DIR}/uscxml/config.h") + ${PROJECT_SOURCE_DIR}/src/*.hpp + ${CMAKE_BINARY_DIR}/uscxml/) INSTALL_HEADERS(HEADERS ${USCXML_HEADERS} COMPONENT headers) diff --git a/docs/BUILDING.md b/docs/BUILDING.md new file mode 100644 index 0000000..fe2a532 --- /dev/null +++ b/docs/BUILDING.md @@ -0,0 +1,388 @@ +# Building from Source {#building} + +<!-- https://sourceforge.net/p/doxygen/discussion/markdown_syntax --> + +[TOC] + +@brief This page describes how to build uSCXML from source, starting with either a git checkout or from a downloaded archive. +The source code is built using CMake, the process of building uscxml is +essentially the same on every platform: + +1. Read the <b>[Platform Notes](#platform-notes)</b> below to prepare your system. +2. Checkout uscxml into a convenient directory. +3. Create a new directory for an *out-of-source* build. I usually create sub-directories in <tt><USCXML_SRC>/build/</tt>. +4. Run cmake (or ccmake / CMake-GUI) to create the files required by your actual build-system. +5. Use your actual build-system or development environment to build uscxml. +6. Optionally build the [language bindings](#language-bindings) to embed the SCXML interpreter in another language. +7. Read the SCXML draft and have a look at the tests to get started. + +For **Makefiles on Unices**, these steps essentially boil down to: + + $ git clone git://github.com/tklab-tud/uscxml.git + $ mkdir uscxml/build && cd uscxml/build + $ cmake .. + $ make + +On **NMake on Windows**, you may have luck to run the following from a VS2013 or VS2015 command prompt: + + $ git clone git://github.com/tklab-tud/uscxml.git + $ mkdir uscxml/build && cd uscxml/build + $ cmake -G"NMake Makefiles" .. + $ nmake + +<b>Note:</b> If you want to build for another IDE or build-system, just create +a new *out-of-source* build directory and start over with CMake. To get an idea +of supported IDEs and build-environments on your platform, type <tt>cmake +--help</tt> or run the CMake-GUI and look for the *Generators* section at the +end of the output. + +<b>Note:</b> If you plan to use the Eclipse CDT generator, you cannot have a +build directory anywhere under the source directory - just create the build +directory anywhere else. This only applies to the Eclipse CDT project generator. + +<b>Note:</b> I could not build the language bindings with the Visual Studio +generator as it croaks when calling SWIG, just have another build directory +with the "NMake Makefiles" project generator. + +\section deps Build Dependencies + +Overview of the uSCXML dependencies. See the [Platform Notes](#platform-notes) for details. + +<b>Note:</b> We no longer maintain and download pre-compiled versions of the dependencies at configure-time. Instead, the build process is using [<tt>external_project_add</tt>](http://www.kitware.com/media/html/BuildingExternalProjectsWithCMake2.8.html) to download and compile the required dependencies on your machine. + +<table> + <tr><th>Platform</th><th>Dependency</th><th>Version</th><th>Comment</th></tr> + <tr> + <td rowspan="7"><b>Everyone</b></td> + <td><a href="https://cmake.org/download/">CMake</a><br>required</td> + <td>>= 2.8.6</td> + <td>The build-system used for uSCXML.</td> + </tr> + <tr> + <td><a href="http://libevent.org">libevent</a><br>required / auto-build</td> + <td>>= 2.0.22</td> + <td>Delayed event queues with timed callbacks and the HTTP server.</td> + </tr> + <tr> + <td><a href="http://curl.haxx.se">curl</a><br>required / auto-build</td> + <td>>= 7.48.0</td> + <td>URL downloads.</td> + </tr> + <tr> + <td><a href="https://github.com/jezhiggins/arabica">Xerces-C++</a><br />required / auto-build</td> + <td>>= 3.1.3</td> + <td>XML Document Object Model</td> + </tr> + <tr> + <td><a href="http://uriparser.sourceforge.net">uriparser</a><br />required / auto-build</td> + <td>>= 0.8.4</td> + <td>URL resolving, referring and other operations</td> + </tr> + <tr> + <td><a href="http://www.swig.org">SWIG</a><br />optional</td> + <td>>= 2.0.6</td> + <td>Generates language bindings to embed uSCXML in other target languages.</td> + </tr> + <tr> + <td><a href="http://www.stack.nl/~dimitri/doxygen/">Doxygen</a><br />optional</td> + <td>>= 1.8</td> + <td>Used by <tt>make docs</tt> to generate this documentation from source comments.</td></tr> + </tr> + <tr bgcolor="grey"><td bgcolor="#dddddd" colspan="4"></td></tr> + + <tr> + <td rowspan="2"><b>Mac OSX</b></td> + <td><a href="http://developer.apple.com/xcode/">XCode</a><br />required</td> + <td>4.2 works</td> + <td>Apple's SDK with all the toolchains.</td> + </tr> + <tr> + <td><a href="http://www.macports.org/">MacPorts</a><br />recommended</td> + <td>>= 2.0.3</td> + <td>Build system for a wide selection of open-source packages.</td> + </tr> + </tr> + + <tr> + <td rowspan="1"><b>Linux</b></td> + <td><a href="https://gcc.gnu.org">gcc</a> / <a href="http://clang.llvm.org">clang</a><br />required</td> + <td>>= 4.8 / 3.3</td> + <td>C++ compiler with sufficient C++11 support.</td></tr> + </tr> + + <tr> + <td rowspan="1"><b>Windows</b></td> + <td><a href="http://www.microsoft.com/visualstudio/en-us">Visual Studio / MSVC</a><br />required</td> + <td>>= 2012</td> + <td>You *need* a C++ compiler that understands C++11.</td></tr> + </tr> +</table> + +\subsection optional-functionality Optional Functionality + +At configure time, CMake will search for various libraries and conditionally +compile only those components of uSCXML for which respective libraries have been found (e.g. the Lua or ECMAScript data-model implementations). On unices, it is straight forward to add libraries and CMake will usually pick them up. + +On Windows, however, the process is more complicated. We primarily rely on the official CMake Modules to find the header files and libraries for various packages. This will, usually, take the file system destinations of popular installers into account. When you have trouble getting CMake to find some particular library, have a look at the <tt>Find*</tt> modules from the CMake distribution and the modules distributed with uSCXML in <tt>contrib/cmake/</tt> to get an idea where the files are expected. + +\section platform-notes Platform Notes + +The following sections will detail the preparation of the respective platforms to ultimately compile uscxml. + +\subsection macosx Mac OSX + +You will have to install <tt>CMake</tt> via Macports: + + # required dependencies + $ sudo port install cmake + + # optional dependencies for language bindings + $ sudo port install apache-ant swig-java swig-php swig-csharp + + # other optional dependencies + $ sudo port install lua v8 + +The rest is pre-installed or downloaded and built at configure-time. Just +download the source and invoke CMake to create Makefiles or a Xcode project. + +\subsubsection console-make Console / Make + + $ cd <USCXML_SRCDIR> + $ mkdir -p build/cli && cd build/cli + $ cmake ../.. + [...] + -- Build files have been written to: .../build/cli + $ make + +You can test whether everything works by starting the uscxml-browser with a test.scxml file: + + $ ./bin/uscxml-browser ../../test/w3c/null/test436.scxml + +\subsubsection xcode Xcode + + $ cd <USCXML_SRCDIR> + $ mkdir -p build/xcode && cd build/xcode + $ cmake -G Xcode ../.. + [...] + -- Build files have been written to: .../build/xcode + $ open uscxml.xcodeproj + +You can of course reuse the same source directory for many build directories. + +\subsection linux Linux + +Depending on your distribution, you will most likely have apt-get or yum +available as package managers. If you do not, I'll have to assume that you are +knowledgable enough to resolve build dependencies on your own. + +<b>Note:</b> If you need the ECMAscript +data-model, we advise to use one of the <tt>javascriptcoregtk</tt> +packages as the JavaScriptCore API is far more stable than V8. uSCXML will build with version 3.23 of V8 as it is currently distributed with MacPorts. + +\subsubsection apt-get Preparing apt-get based distributions + +This would be all distributions based on Debian, like Ubuntu, Linux Mint and the like. + + # build system and compiler + $ sudo apt-get install git cmake cmake-curses-gui make g++ + + # uscxml required dependencies (built if not installed) + $ sudo apt-get install libxerces-c-dev libevent-dev libcurl4-openssl-dev + +There may still be packages missing due to the set of dependencies among +packages in the various distributons. Try to run CMake and resolve dependencies +until you are satisfied. + +\subsubsection yum Preparing yum based distributions + +This would be all distributions based on Redhat, e.g. Fedora. + + # build system and compiler + $ sudo yum install git cmake cmake-gui gcc-c++ + + # uscxml required dependencies + $ sudo yum install xerces-c-devel libevent-devel libcurl-devel + +\subsubsection console-make2 Console / Make + +Instructions are a literal copy of building uscxml for MacOSX on the console from above: + + $ cd <USCXML_SRCDIR> + $ mkdir -p build/cli && cd build/cli + $ cmake ../.. + [...] + -- Build files have been written to: .../build/cli + $ make + +You can test whether everything works by starting the uscxml-browser with a test.scxml file: + + $ ./bin/uscxml-browser ../../test/w3c/null/test436.scxml + +\subsubsection eclipse-cdt Eclipse CDT + +<b>Note:</b> Eclipse does not like the project to be a subdirectory in the +source. You have to choose your build directory with the generated project +accordingly. + + $ mkdir -p ~/Desktop/build/uscxml/eclipse && cd ~/Desktop/build/uscxml/eclipse + $ cmake -G "Eclipse CDT4 - Unix Makefiles" <USCXML_SRCDIR> + [...] + -- Build files have been written to: .../build/uscxml/eclipse + +Now open Eclipse CDT and import the out-of-source directory as an existing project into workspace, leaving the "Copy projects +into workspace" checkbox unchecked. There are some more [detailed instruction](http://www.cmake.org/Wiki/Eclipse_CDT4_Generator) available +in the CMake wiki as well. + +\subsection windows Windows + +Building from source on windows is somewhat more involved and instructions are +necessarily in prose form. These instructions were created using Windows 7 and +MS Visual Studio 2012. + +\subsubsection prepare-windows Prepare compilation + +1. Use git to **checkout** the source from <tt>git://github.com/tklab-tud/uscxml.git</tt> + into any convenient directory. + +2. Start the **CMake-GUI** and enter the checkout directory in the "Where is the source code" text field. Choose any convenient directory to build the binaries in. + +3. Hit **Configure** and choose your toolchain and compiler - I only tested with Visual Studio 12. Hit **Configure** again until there are no more red items in the list. If these instructions are still correct and you did as described above, you should be able to "Generate" the Visual Project Solution. + +Now you can generate the MS Visual Studio project file <tt><USCXML_BUILDIR>/uscxml.sln</tt>. +Just open it up to continue in your IDE. + +<b>Note:</b> We only tested with the MSVC compiler. You can try to compile +with MinGW but you would have to conditionalize the [build scripts](https://github.com/tklab-tud/uscxml/tree/master/contrib/cmake) for e.g. MinGW. + +<!-- +\subsection ios iOS + +We provide prebuilts and CMake toolchain files for iOS and the iOS simulator. The easiest way to get iOS binaries is +to run: + + $ pwd + <USCXML_SRC> + $ ./contrib/build-scripts/build-uscxml-ios.sh + +This will build uSCXML with the latest iOS SDK that is installed on your system. If you prefer an older SDK, you can +<tt>export IOS_SDK_VERSION=6.1</tt> but you have to make sure it's actually installed. Have a look at the build +script and the toolchain files at <tt>contrib/cmake/CrossCompile-*</tt> if you run into issues. + +The build script above will build a universal binary for simulator and device, both in release and debug configuration. +If you just want a specific configuration for e.g. the simulator, you can invoke CMake yourself: + + $ pwd + <USCXML_SRC> + $ mkdir build/iossim && cd build/iossim + $ cmake -DCMAKE_TOOLCHAIN_FILE=../../contrib/cmake/CrossCompile-iOS-Sim.cmake ../.. + $ make -j4 + +<b>Note</b>: We did not compile the prebuilts for iOS with 64Bit yet. As such, you will not get binaries build for +arm64. The main culprit is, again, curl which assumes the size of an int to be the identical. +--> + +\subsection raspberry Raspberry Pi + +To compile uSCXML on Raspberry Pi you will need to, at a minimum, install the following packages. This assumes that +you run Raspberry, the Debian variant. + + $ sudo apt-get install cmake libxerces-c libcurl4-gnutls-dev + +Now you can compile uSCXML like on any other platform: + + $ git clone --depth 1 https://github.com/tklab-tud/uscxml.git + $ mkdir -p uscxml/build/raspberry && cd uscxml/build/raspberry + $ cmake ../.. + $ make + +If you want an ECMAScript datamodel or LUA, you will need to install additional packages: + + # additional datamodels: ECMAScript, LUA + $ sudo apt-get install libjavascriptcoregtk-3.0-dev liblua5.2-dev + +Finally, to get the language bindings install SWIG and the developer kits of +the respective language. Older Java versions will work as well (>= 1.5), just +make sure <tt>JAVA_HOME</tt> is set correctly. + + # language bindings: Java, CSharp + $ sudo apt-get install swig ant oracle-java8-jdk mono-mcs + $ echo $JAVA_HOME + /usr/lib/jvm/jdk-8-oracle-arm-vfp-hflt + +\section language-bindings Language Bindings + +In order to build any language bindings, you will need to have SWIG and the development kit of your target language +installed. The set of available language bindings is printed at the end of the CMake invocation: + + $ cmake <USCXML_SRC> + ... + -- Available custom elements ...... : respond file postpone fetch + -- Available language bindings .... : csharp java + -- General information: + ... + +\subsection java Java + +We are relying on CMake's [FindJNI.CMake](http://www.cmake.org/cmake/help/v2.8.12/cmake.html#module:FindJNI) module +to find the JNI headers and respective libraries. On unices, it's easiest to check whether <tt>jni.h</tt> is available +in <tt>JAVA_HOME</tt>: + + $ find $JAVA_HOME -name jni.h + /usr/lib/jvm/java-7-openjdk-i386/include/jni.h + +In addition, you will need apache's <tt>ant</tt> in the path or in <tt>$ENV{ANT_HOME}/bin</tt>: + + $ ant -version + Apache Ant(TM) version 1.8.2 compiled on September 22 2011 + +If both of these are given, you ought to get <tt>java</tt> as an available language binding and a new target called +<tt>java</tt> for your build system. If you used plain Makefiles (default on unices), you will get everything you need via: + + $ make && make java + $ ls lib/*.jnilib lib/*.jar + lib/libuscxmlNativeJava64.jnilib lib/uscxml.jar + +The <tt>uscxml.jar</tt> is to be added to your project's classpath, while the <tt>libuscxmlNativeJava64.jnilib</tt> +(or .so, .dll) needs to be loaded <b>once</b> via <tt>System.load()</tt> before you can use native objects. + +\subsection csharp CSharp + +For the CSharp bindings, we need to find either <tt>csc.exe</tt> from the Microsoft.NET framework or <tt>dmcs</tt> +from the mono project. We search the following places for these: + + $ENV{CSC_HOME}; $ENV{DMCS_HOME} + "C:/Windows/Microsoft.NET/Framework/v3.5" + "C:/Windows/Microsoft.NET/Framework/v4.0.30319" + +If we find one of those binaries (and SWIG obviously), we will enable the language bindings. + + $ which dmcs + /opt/local/bin/dmcs + +Again, if you used plain Makefiles, you will get everything you need via: + + $ make && make csharp + $ find lib -type f -iname *csharp* + lib/csharp/libuscxmlNativeCSharp.so + lib/uscxmlCSharp.dll + +The <tt>libuscxmlNativeCSharp.so</tt> has to be available to your C# runtime, either by installing it in +<tt>/usr/local/lib</tt> or (preferred) by using <tt>LD_PRELOAD</tt> or <tt>SetDllDirectory</tt>. See the +embedding examples. The <tt>uscxmlCSharp.dll</tt> contains the managed code portion and needs to be added +to your C# project as a reference. + +<b>Note:</b> You cannot use uSCXML with Xamarin Studio / Mono on Mac out of the box, as they <emph>still</emph> +have no 64Bit support. The last Macintosh without 64Bit support was the (late 2006) Mac Mini with an Intel Core Duo. + +\subsection important-windows Important Note for Windows + +You cannot use CMake projects generated for Visual Studio to build the target language specific part of the +various bindings - you have to use <tt>nmake</tt> at a command prompt. Open a <tt>Visual Studio [x64 Win64] +Command Prompt (2012)</tt> and type: + + > cd c:\path\to\build\dir + > cmake -G"NMake Makefiles" c:\path\to\uscxml\source + ... + > nmake && nmake csharp && nmake java + ... + diff --git a/docs/CMakeLists.txt b/docs/CMakeLists.txt new file mode 100644 index 0000000..50d6625 --- /dev/null +++ b/docs/CMakeLists.txt @@ -0,0 +1,22 @@ +############################################################ +# Build documentation +############################################################ + +# see https://tty1.net/blog/2014/cmake-doxygen_en.html +find_package(Doxygen) +option(BUILD_DOCS "Create API documentation (requires doxygen)" ${DOXYGEN_FOUND}) + +if(BUILD_DOCS) + configure_file( + ${CMAKE_CURRENT_SOURCE_DIR}/Doxyfile.in + ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile + @ONLY) + + add_custom_target(docs + COMMAND ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMENT "Generating API documentation with Doxygen" + VERBATIM) + + install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html DESTINATION share/doc) +endif() diff --git a/docs/DEVELOPERS.md b/docs/DEVELOPERS.md new file mode 100644 index 0000000..01e5792 --- /dev/null +++ b/docs/DEVELOPERS.md @@ -0,0 +1,5 @@ +# DEVELOPING with uSCXML + +## Getting Started + +Did only work on structure and layout of documentation so far diff --git a/docs/Doxyfile.in b/docs/Doxyfile.in new file mode 100644 index 0000000..def8570 --- /dev/null +++ b/docs/Doxyfile.in @@ -0,0 +1,2405 @@ +# see https://github.com/Velron/doxygen-bootstrapped + +# Doxyfile 1.8.9.1 + +# This file describes the settings to be used by the documentation system +# doxygen (www.doxygen.org) for a project. +# +# All text after a double hash (##) is considered a comment and is placed in +# front of the TAG it is preceding. +# +# All text after a single hash (#) is considered a comment and will be ignored. +# The format is: +# TAG = value [value, ...] +# For lists, items can also be appended using: +# TAG += value [value, ...] +# Values that contain spaces should be placed between quotes (\" \"). + +#--------------------------------------------------------------------------- +# Project related configuration options +#--------------------------------------------------------------------------- + +# This tag specifies the encoding used for all characters in the config file +# that follow. The default is UTF-8 which is also the encoding used for all text +# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv +# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv +# for the list of possible encodings. +# The default value is: UTF-8. + +DOXYFILE_ENCODING = UTF-8 + +# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by +# double-quotes, unless you are using Doxywizard) that should identify the +# project for which the documentation is generated. This name is used in the +# title of most generated pages and in a few other places. +# The default value is: My Project. + +PROJECT_NAME = "@CMAKE_PROJECT_NAME@" + +# The PROJECT_NUMBER tag can be used to enter a project or revision number. This +# could be handy for archiving the generated documentation or if some version +# control system is used. + +PROJECT_NUMBER = @USCXML_VERSION@ + +# Using the PROJECT_BRIEF tag one can provide an optional one line description +# for a project that appears at the top of each page and should give viewer a +# quick idea about the purpose of the project. Keep the description short. + +PROJECT_BRIEF = + +# With the PROJECT_LOGO tag one can specify a logo or an icon that is included +# in the documentation. The maximum height of the logo should not exceed 55 +# pixels and the maximum width should not exceed 200 pixels. Doxygen will copy +# the logo to the output directory. + +PROJECT_LOGO = + +# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path +# into which the generated documentation will be written. If a relative path is +# entered, it will be relative to the location where doxygen was started. If +# left blank the current directory will be used. + +OUTPUT_DIRECTORY = + +# If the CREATE_SUBDIRS tag is set to YES then doxygen will create 4096 sub- +# directories (in 2 levels) under the output directory of each output format and +# will distribute the generated files over these directories. Enabling this +# option can be useful when feeding doxygen a huge amount of source files, where +# putting all generated files in the same directory would otherwise causes +# performance problems for the file system. +# The default value is: NO. + +CREATE_SUBDIRS = NO + +# If the ALLOW_UNICODE_NAMES tag is set to YES, doxygen will allow non-ASCII +# characters to appear in the names of generated files. If set to NO, non-ASCII +# characters will be escaped, for example _xE3_x81_x84 will be used for Unicode +# U+3044. +# The default value is: NO. + +ALLOW_UNICODE_NAMES = NO + +# The OUTPUT_LANGUAGE tag is used to specify the language in which all +# documentation generated by doxygen is written. Doxygen will use this +# information to generate all constant output in the proper language. +# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese, +# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States), +# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian, +# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages), +# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian, +# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian, +# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish, +# Ukrainian and Vietnamese. +# The default value is: English. + +OUTPUT_LANGUAGE = English + +# If the BRIEF_MEMBER_DESC tag is set to YES, doxygen will include brief member +# descriptions after the members that are listed in the file and class +# documentation (similar to Javadoc). Set to NO to disable this. +# The default value is: YES. + +BRIEF_MEMBER_DESC = YES + +# If the REPEAT_BRIEF tag is set to YES, doxygen will prepend the brief +# description of a member or function before the detailed description +# +# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the +# brief descriptions will be completely suppressed. +# The default value is: YES. + +REPEAT_BRIEF = YES + +# This tag implements a quasi-intelligent brief description abbreviator that is +# used to form the text in various listings. Each string in this list, if found +# as the leading text of the brief description, will be stripped from the text +# and the result, after processing the whole list, is used as the annotated +# text. Otherwise, the brief description is used as-is. If left blank, the +# following values are used ($name is automatically replaced with the name of +# the entity):The $name class, The $name widget, The $name file, is, provides, +# specifies, contains, represents, a, an and the. + +ABBREVIATE_BRIEF = "The $name class" \ + "The $name widget" \ + "The $name file" \ + is \ + provides \ + specifies \ + contains \ + represents \ + a \ + an \ + the + +# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then +# doxygen will generate a detailed section even if there is only a brief +# description. +# The default value is: NO. + +ALWAYS_DETAILED_SEC = NO + +# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all +# inherited members of a class in the documentation of that class as if those +# members were ordinary class members. Constructors, destructors and assignment +# operators of the base classes will not be shown. +# The default value is: NO. + +INLINE_INHERITED_MEMB = NO + +# If the FULL_PATH_NAMES tag is set to YES, doxygen will prepend the full path +# before files name in the file list and in the header files. If set to NO the +# shortest path that makes the file name unique will be used +# The default value is: YES. + +FULL_PATH_NAMES = YES + +# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path. +# Stripping is only done if one of the specified strings matches the left-hand +# part of the path. The tag can be used to show relative paths in the file list. +# If left blank the directory from which doxygen is run is used as the path to +# strip. +# +# Note that you can specify absolute paths here, but also relative paths, which +# will be relative from the directory where doxygen is started. +# This tag requires that the tag FULL_PATH_NAMES is set to YES. + +STRIP_FROM_PATH = @PROJECT_SOURCE_DIR@/src/uscxml + +# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the +# path mentioned in the documentation of a class, which tells the reader which +# header file to include in order to use a class. If left blank only the name of +# the header file containing the class definition is used. Otherwise one should +# specify the list of include paths that are normally passed to the compiler +# using the -I flag. + +STRIP_FROM_INC_PATH = + +# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but +# less readable) file names. This can be useful is your file systems doesn't +# support long names like on DOS, Mac, or CD-ROM. +# The default value is: NO. + +SHORT_NAMES = NO + +# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the +# first line (until the first dot) of a Javadoc-style comment as the brief +# description. If set to NO, the Javadoc-style will behave just like regular Qt- +# style comments (thus requiring an explicit @brief command for a brief +# description.) +# The default value is: NO. + +JAVADOC_AUTOBRIEF = YES + +# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first +# line (until the first dot) of a Qt-style comment as the brief description. If +# set to NO, the Qt-style will behave just like regular Qt-style comments (thus +# requiring an explicit \brief command for a brief description.) +# The default value is: NO. + +QT_AUTOBRIEF = YES + +# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a +# multi-line C++ special comment block (i.e. a block of //! or /// comments) as +# a brief description. This used to be the default behavior. The new default is +# to treat a multi-line C++ comment block as a detailed description. Set this +# tag to YES if you prefer the old behavior instead. +# +# Note that setting this tag to YES also means that rational rose comments are +# not recognized any more. +# The default value is: NO. + +MULTILINE_CPP_IS_BRIEF = NO + +# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the +# documentation from any documented member that it re-implements. +# The default value is: YES. + +INHERIT_DOCS = YES + +# If the SEPARATE_MEMBER_PAGES tag is set to YES then doxygen will produce a new +# page for each member. If set to NO, the documentation of a member will be part +# of the file/class/namespace that contains it. +# The default value is: NO. + +SEPARATE_MEMBER_PAGES = NO + +# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen +# uses this value to replace tabs by spaces in code fragments. +# Minimum value: 1, maximum value: 16, default value: 4. + +TAB_SIZE = 4 + +# This tag can be used to specify a number of aliases that act as commands in +# the documentation. An alias has the form: +# name=value +# For example adding +# "sideeffect=@par Side Effects:\n" +# will allow you to put the command \sideeffect (or @sideeffect) in the +# documentation, which will result in a user-defined paragraph with heading +# "Side Effects:". You can put \n's in the value part of an alias to insert +# newlines. + +ALIASES = + +# This tag can be used to specify a number of word-keyword mappings (TCL only). +# A mapping has the form "name=value". For example adding "class=itcl::class" +# will allow you to use the command class in the itcl::class meaning. + +TCL_SUBST = + +# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources +# only. Doxygen will then generate output that is more tailored for C. For +# instance, some of the names that are used will be different. The list of all +# members will be omitted, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_FOR_C = NO + +# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or +# Python sources only. Doxygen will then generate output that is more tailored +# for that language. For instance, namespaces will be presented as packages, +# qualified scopes will look different, etc. +# The default value is: NO. + +OPTIMIZE_OUTPUT_JAVA = NO + +# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran +# sources. Doxygen will then generate output that is tailored for Fortran. +# The default value is: NO. + +OPTIMIZE_FOR_FORTRAN = NO + +# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL +# sources. Doxygen will then generate output that is tailored for VHDL. +# The default value is: NO. + +OPTIMIZE_OUTPUT_VHDL = NO + +# Doxygen selects the parser to use depending on the extension of the files it +# parses. With this tag you can assign which parser to use for a given +# extension. Doxygen has a built-in mapping, but you can override or extend it +# using this tag. The format is ext=language, where ext is a file extension, and +# language is one of the parsers supported by doxygen: IDL, Java, Javascript, +# C#, C, C++, D, PHP, Objective-C, Python, Fortran (fixed format Fortran: +# FortranFixed, free formatted Fortran: FortranFree, unknown formatted Fortran: +# Fortran. In the later case the parser tries to guess whether the code is fixed +# or free formatted code, this is the default for Fortran type files), VHDL. For +# instance to make doxygen treat .inc files as Fortran files (default is PHP), +# and .f files as C (default is Fortran), use: inc=Fortran f=C. +# +# Note: For files without extension you can use no_extension as a placeholder. +# +# Note that for custom extensions you also need to set FILE_PATTERNS otherwise +# the files are not read by doxygen. + +EXTENSION_MAPPING = + +# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments +# according to the Markdown format, which allows for more readable +# documentation. See http://daringfireball.net/projects/markdown/ for details. +# The output of markdown processing is further processed by doxygen, so you can +# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in +# case of backward compatibilities issues. +# The default value is: YES. + +MARKDOWN_SUPPORT = YES + +# When enabled doxygen tries to link words that correspond to documented +# classes, or namespaces to their corresponding documentation. Such a link can +# be prevented in individual cases by putting a % sign in front of the word or +# globally by setting AUTOLINK_SUPPORT to NO. +# The default value is: YES. + +AUTOLINK_SUPPORT = YES + +# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want +# to include (a tag file for) the STL sources as input, then you should set this +# tag to YES in order to let doxygen match functions declarations and +# definitions whose arguments contain STL classes (e.g. func(std::string); +# versus func(std::string) {}). This also make the inheritance and collaboration +# diagrams that involve STL classes more complete and accurate. +# The default value is: NO. + +BUILTIN_STL_SUPPORT = NO + +# If you use Microsoft's C++/CLI language, you should set this option to YES to +# enable parsing support. +# The default value is: NO. + +CPP_CLI_SUPPORT = YES + +# Set the SIP_SUPPORT tag to YES if your project consists of sip (see: +# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen +# will parse them like normal C++ but will assume all classes use public instead +# of private inheritance when no explicit protection keyword is present. +# The default value is: NO. + +SIP_SUPPORT = NO + +# For Microsoft's IDL there are propget and propput attributes to indicate +# getter and setter methods for a property. Setting this option to YES will make +# doxygen to replace the get and set methods by a property in the documentation. +# This will only work if the methods are indeed getting or setting a simple +# type. If this is not the case, or you want to show the methods anyway, you +# should set this option to NO. +# The default value is: YES. + +IDL_PROPERTY_SUPPORT = YES + +# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC +# tag is set to YES then doxygen will reuse the documentation of the first +# member in the group (if any) for the other members of the group. By default +# all members of a group must be documented explicitly. +# The default value is: NO. + +DISTRIBUTE_GROUP_DOC = NO + +# Set the SUBGROUPING tag to YES to allow class member groups of the same type +# (for instance a group of public functions) to be put as a subgroup of that +# type (e.g. under the Public Functions section). Set it to NO to prevent +# subgrouping. Alternatively, this can be done per class using the +# \nosubgrouping command. +# The default value is: YES. + +SUBGROUPING = YES + +# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions +# are shown inside the group in which they are included (e.g. using \ingroup) +# instead of on a separate page (for HTML and Man pages) or section (for LaTeX +# and RTF). +# +# Note that this feature does not work in combination with +# SEPARATE_MEMBER_PAGES. +# The default value is: NO. + +INLINE_GROUPED_CLASSES = NO + +# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions +# with only public data fields or simple typedef fields will be shown inline in +# the documentation of the scope in which they are defined (i.e. file, +# namespace, or group documentation), provided this scope is documented. If set +# to NO, structs, classes, and unions are shown on a separate page (for HTML and +# Man pages) or section (for LaTeX and RTF). +# The default value is: NO. + +INLINE_SIMPLE_STRUCTS = NO + +# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or +# enum is documented as struct, union, or enum with the name of the typedef. So +# typedef struct TypeS {} TypeT, will appear in the documentation as a struct +# with name TypeT. When disabled the typedef will appear as a member of a file, +# namespace, or class. And the struct will be named TypeS. This can typically be +# useful for C code in case the coding convention dictates that all compound +# types are typedef'ed and only the typedef is referenced, never the tag name. +# The default value is: NO. + +TYPEDEF_HIDES_STRUCT = NO + +# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This +# cache is used to resolve symbols given their name and scope. Since this can be +# an expensive process and often the same symbol appears multiple times in the +# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small +# doxygen will become slower. If the cache is too large, memory is wasted. The +# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range +# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536 +# symbols. At the end of a run doxygen will report the cache usage and suggest +# the optimal cache size from a speed point of view. +# Minimum value: 0, maximum value: 9, default value: 0. + +LOOKUP_CACHE_SIZE = 0 + +#--------------------------------------------------------------------------- +# Build related configuration options +#--------------------------------------------------------------------------- + +# If the EXTRACT_ALL tag is set to YES, doxygen will assume all entities in +# documentation are documented, even if no documentation was available. Private +# class members and static file members will be hidden unless the +# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES. +# Note: This will also disable the warnings about undocumented members that are +# normally produced when WARNINGS is set to YES. +# The default value is: NO. + +EXTRACT_ALL = NO + +# If the EXTRACT_PRIVATE tag is set to YES, all private members of a class will +# be included in the documentation. +# The default value is: NO. + +EXTRACT_PRIVATE = NO + +# If the EXTRACT_PACKAGE tag is set to YES, all members with package or internal +# scope will be included in the documentation. +# The default value is: NO. + +EXTRACT_PACKAGE = NO + +# If the EXTRACT_STATIC tag is set to YES, all static members of a file will be +# included in the documentation. +# The default value is: NO. + +EXTRACT_STATIC = YES + +# If the EXTRACT_LOCAL_CLASSES tag is set to YES, classes (and structs) defined +# locally in source files will be included in the documentation. If set to NO, +# only classes defined in header files are included. Does not have any effect +# for Java sources. +# The default value is: YES. + +EXTRACT_LOCAL_CLASSES = YES + +# This flag is only useful for Objective-C code. If set to YES, local methods, +# which are defined in the implementation section but not in the interface are +# included in the documentation. If set to NO, only methods in the interface are +# included. +# The default value is: NO. + +EXTRACT_LOCAL_METHODS = NO + +# If this flag is set to YES, the members of anonymous namespaces will be +# extracted and appear in the documentation as a namespace called +# 'anonymous_namespace{file}', where file will be replaced with the base name of +# the file that contains the anonymous namespace. By default anonymous namespace +# are hidden. +# The default value is: NO. + +EXTRACT_ANON_NSPACES = NO + +# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all +# undocumented members inside documented classes or files. If set to NO these +# members will be included in the various overviews, but no documentation +# section is generated. This option has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_MEMBERS = NO + +# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all +# undocumented classes that are normally visible in the class hierarchy. If set +# to NO, these classes will be included in the various overviews. This option +# has no effect if EXTRACT_ALL is enabled. +# The default value is: NO. + +HIDE_UNDOC_CLASSES = NO + +# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend +# (class|struct|union) declarations. If set to NO, these declarations will be +# included in the documentation. +# The default value is: NO. + +HIDE_FRIEND_COMPOUNDS = NO + +# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any +# documentation blocks found inside the body of a function. If set to NO, these +# blocks will be appended to the function's detailed documentation block. +# The default value is: NO. + +HIDE_IN_BODY_DOCS = NO + +# The INTERNAL_DOCS tag determines if documentation that is typed after a +# \internal command is included. If the tag is set to NO then the documentation +# will be excluded. Set it to YES to include the internal documentation. +# The default value is: NO. + +INTERNAL_DOCS = NO + +# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file +# names in lower-case letters. If set to YES, upper-case letters are also +# allowed. This is useful if you have classes or files whose names only differ +# in case and if your file system supports case sensitive file names. Windows +# and Mac users are advised to set this option to NO. +# The default value is: system dependent. + +CASE_SENSE_NAMES = NO + +# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with +# their full class and namespace scopes in the documentation. If set to YES, the +# scope will be hidden. +# The default value is: NO. + +HIDE_SCOPE_NAMES = NO + +# If the HIDE_COMPOUND_REFERENCE tag is set to NO (default) then doxygen will +# append additional text to a page's title, such as Class Reference. If set to +# YES the compound reference will be hidden. +# The default value is: NO. + +HIDE_COMPOUND_REFERENCE= NO + +# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of +# the files that are included by a file in the documentation of that file. +# The default value is: YES. + +SHOW_INCLUDE_FILES = YES + +# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each +# grouped member an include statement to the documentation, telling the reader +# which file to include in order to use the member. +# The default value is: NO. + +SHOW_GROUPED_MEMB_INC = NO + +# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include +# files with double quotes in the documentation rather than with sharp brackets. +# The default value is: NO. + +FORCE_LOCAL_INCLUDES = NO + +# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the +# documentation for inline members. +# The default value is: YES. + +INLINE_INFO = YES + +# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the +# (detailed) documentation of file and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. +# The default value is: YES. + +SORT_MEMBER_DOCS = YES + +# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief +# descriptions of file, namespace and class members alphabetically by member +# name. If set to NO, the members will appear in declaration order. Note that +# this will also influence the order of the classes in the class list. +# The default value is: NO. + +SORT_BRIEF_DOCS = NO + +# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the +# (brief and detailed) documentation of class members so that constructors and +# destructors are listed first. If set to NO the constructors will appear in the +# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS. +# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief +# member documentation. +# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting +# detailed member documentation. +# The default value is: NO. + +SORT_MEMBERS_CTORS_1ST = NO + +# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy +# of group names into alphabetical order. If set to NO the group names will +# appear in their defined order. +# The default value is: NO. + +SORT_GROUP_NAMES = NO + +# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by +# fully-qualified names, including namespaces. If set to NO, the class list will +# be sorted only by class name, not including the namespace part. +# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES. +# Note: This option applies only to the class list, not to the alphabetical +# list. +# The default value is: NO. + +SORT_BY_SCOPE_NAME = NO + +# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper +# type resolution of all parameters of a function it will reject a match between +# the prototype and the implementation of a member function even if there is +# only one candidate or it is obvious which candidate to choose by doing a +# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still +# accept a match between prototype and implementation in such cases. +# The default value is: NO. + +STRICT_PROTO_MATCHING = NO + +# The GENERATE_TODOLIST tag can be used to enable (YES) or disable (NO) the todo +# list. This list is created by putting \todo commands in the documentation. +# The default value is: YES. + +GENERATE_TODOLIST = YES + +# The GENERATE_TESTLIST tag can be used to enable (YES) or disable (NO) the test +# list. This list is created by putting \test commands in the documentation. +# The default value is: YES. + +GENERATE_TESTLIST = YES + +# The GENERATE_BUGLIST tag can be used to enable (YES) or disable (NO) the bug +# list. This list is created by putting \bug commands in the documentation. +# The default value is: YES. + +GENERATE_BUGLIST = YES + +# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or disable (NO) +# the deprecated list. This list is created by putting \deprecated commands in +# the documentation. +# The default value is: YES. + +GENERATE_DEPRECATEDLIST= YES + +# The ENABLED_SECTIONS tag can be used to enable conditional documentation +# sections, marked by \if <section_label> ... \endif and \cond <section_label> +# ... \endcond blocks. + +ENABLED_SECTIONS = + +# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the +# initial value of a variable or macro / define can have for it to appear in the +# documentation. If the initializer consists of more lines than specified here +# it will be hidden. Use a value of 0 to hide initializers completely. The +# appearance of the value of individual variables and macros / defines can be +# controlled using \showinitializer or \hideinitializer command in the +# documentation regardless of this setting. +# Minimum value: 0, maximum value: 10000, default value: 30. + +MAX_INITIALIZER_LINES = 30 + +# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at +# the bottom of the documentation of classes and structs. If set to YES, the +# list will mention the files that were used to generate the documentation. +# The default value is: YES. + +SHOW_USED_FILES = YES + +# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This +# will remove the Files entry from the Quick Index and from the Folder Tree View +# (if specified). +# The default value is: YES. + +SHOW_FILES = YES + +# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces +# page. This will remove the Namespaces entry from the Quick Index and from the +# Folder Tree View (if specified). +# The default value is: YES. + +SHOW_NAMESPACES = YES + +# The FILE_VERSION_FILTER tag can be used to specify a program or script that +# doxygen should invoke to get the current version for each file (typically from +# the version control system). Doxygen will invoke the program by executing (via +# popen()) the command command input-file, where command is the value of the +# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided +# by doxygen. Whatever the program writes to standard output is used as the file +# version. For an example see the documentation. + +FILE_VERSION_FILTER = + +# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed +# by doxygen. The layout file controls the global structure of the generated +# output files in an output format independent way. To create the layout file +# that represents doxygen's defaults, run doxygen with the -l option. You can +# optionally specify a file name after the option, if omitted DoxygenLayout.xml +# will be used as the name of the layout file. +# +# Note that if you run doxygen from a directory containing a file called +# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE +# tag is left empty. + +LAYOUT_FILE = + +# The CITE_BIB_FILES tag can be used to specify one or more bib files containing +# the reference definitions. This must be a list of .bib files. The .bib +# extension is automatically appended if omitted. This requires the bibtex tool +# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info. +# For LaTeX the style of the bibliography can be controlled using +# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the +# search path. See also \cite for info how to create references. + +CITE_BIB_FILES = + +#--------------------------------------------------------------------------- +# Configuration options related to warning and progress messages +#--------------------------------------------------------------------------- + +# The QUIET tag can be used to turn on/off the messages that are generated to +# standard output by doxygen. If QUIET is set to YES this implies that the +# messages are off. +# The default value is: NO. + +QUIET = NO + +# The WARNINGS tag can be used to turn on/off the warning messages that are +# generated to standard error (stderr) by doxygen. If WARNINGS is set to YES +# this implies that the warnings are on. +# +# Tip: Turn warnings on while writing the documentation. +# The default value is: YES. + +WARNINGS = YES + +# If the WARN_IF_UNDOCUMENTED tag is set to YES then doxygen will generate +# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag +# will automatically be disabled. +# The default value is: YES. + +WARN_IF_UNDOCUMENTED = YES + +# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for +# potential errors in the documentation, such as not documenting some parameters +# in a documented function, or documenting parameters that don't exist or using +# markup commands wrongly. +# The default value is: YES. + +WARN_IF_DOC_ERROR = YES + +# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that +# are documented, but have no documentation for their parameters or return +# value. If set to NO, doxygen will only warn about wrong or incomplete +# parameter documentation, but not about the absence of documentation. +# The default value is: NO. + +WARN_NO_PARAMDOC = NO + +# The WARN_FORMAT tag determines the format of the warning messages that doxygen +# can produce. The string should contain the $file, $line, and $text tags, which +# will be replaced by the file and line number from which the warning originated +# and the warning text. Optionally the format may contain $version, which will +# be replaced by the version of the file (if it could be obtained via +# FILE_VERSION_FILTER) +# The default value is: $file:$line: $text. + +WARN_FORMAT = "$file:$line: $text" + +# The WARN_LOGFILE tag can be used to specify a file to which warning and error +# messages should be written. If left blank the output is written to standard +# error (stderr). + +WARN_LOGFILE = + +#--------------------------------------------------------------------------- +# Configuration options related to the input files +#--------------------------------------------------------------------------- + +# The INPUT tag is used to specify the files and/or directories that contain +# documented source files. You may enter file names like myfile.cpp or +# directories like /usr/src/myproject. Separate the files or directories with +# spaces. +# Note: If this tag is empty the current directory is searched. + +INPUT = @PROJECT_SOURCE_DIR@/docs \ + @PROJECT_SOURCE_DIR@/src/uscxml + +# This tag can be used to specify the character encoding of the source files +# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses +# libiconv (or the iconv built into libc) for the transcoding. See the libiconv +# documentation (see: http://www.gnu.org/software/libiconv) for the list of +# possible encodings. +# The default value is: UTF-8. + +INPUT_ENCODING = UTF-8 + +# If the value of the INPUT tag contains directories, you can use the +# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank the +# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii, +# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp, +# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown, +# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf, +# *.qsf, *.as and *.js. + +FILE_PATTERNS = *.c \ + *.cpp \ + *.h \ + *.hpp \ + *.inc \ + *.md \ + *.mm \ + *.dox \ + *.vhdl + +# The RECURSIVE tag can be used to specify whether or not subdirectories should +# be searched for input files as well. +# The default value is: NO. + +RECURSIVE = YES + +# The EXCLUDE tag can be used to specify files and/or directories that should be +# excluded from the INPUT source files. This way you can easily exclude a +# subdirectory from a directory tree whose root is specified with the INPUT tag. +# +# Note that relative paths are relative to the directory from which doxygen is +# run. + +EXCLUDE = + +# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or +# directories that are symbolic links (a Unix file system feature) are excluded +# from the input. +# The default value is: NO. + +EXCLUDE_SYMLINKS = NO + +# If the value of the INPUT tag contains directories, you can use the +# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude +# certain files from those directories. +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories for example use the pattern */test/* + +EXCLUDE_PATTERNS = + +# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names +# (namespaces, classes, functions, etc.) that should be excluded from the +# output. The symbol name can be a fully qualified name, a word, or if the +# wildcard * is used, a substring. Examples: ANamespace, AClass, +# AClass::ANamespace, ANamespace::*Test +# +# Note that the wildcards are matched against the file with absolute path, so to +# exclude all test directories use the pattern */test/* + +EXCLUDE_SYMBOLS = + +# The EXAMPLE_PATH tag can be used to specify one or more files or directories +# that contain example code fragments that are included (see the \include +# command). + +EXAMPLE_PATH = + +# If the value of the EXAMPLE_PATH tag contains directories, you can use the +# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and +# *.h) to filter out the source-files in the directories. If left blank all +# files are included. + +EXAMPLE_PATTERNS = * + +# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be +# searched for input files to be used with the \include or \dontinclude commands +# irrespective of the value of the RECURSIVE tag. +# The default value is: NO. + +EXAMPLE_RECURSIVE = NO + +# The IMAGE_PATH tag can be used to specify one or more files or directories +# that contain images that are to be included in the documentation (see the +# \image command). + +IMAGE_PATH = + +# The INPUT_FILTER tag can be used to specify a program that doxygen should +# invoke to filter for each input file. Doxygen will invoke the filter program +# by executing (via popen()) the command: +# +# <filter> <input-file> +# +# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the +# name of an input file. Doxygen will then use the output that the filter +# program writes to standard output. If FILTER_PATTERNS is specified, this tag +# will be ignored. +# +# Note that the filter must not add or remove lines; it is applied before the +# code is scanned, but not when the output code is generated. If lines are added +# or removed, the anchors will not be placed correctly. + +INPUT_FILTER = + +# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern +# basis. Doxygen will compare the file name with each pattern and apply the +# filter if there is a match. The filters are a list of the form: pattern=filter +# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how +# filters are used. If the FILTER_PATTERNS tag is empty or if none of the +# patterns match the file name, INPUT_FILTER is applied. + +FILTER_PATTERNS = + +# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using +# INPUT_FILTER) will also be used to filter the input files that are used for +# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES). +# The default value is: NO. + +FILTER_SOURCE_FILES = NO + +# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file +# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and +# it is also possible to disable source filtering for a specific pattern using +# *.ext= (so without naming a filter). +# This tag requires that the tag FILTER_SOURCE_FILES is set to YES. + +FILTER_SOURCE_PATTERNS = + +# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that +# is part of the input, its contents will be placed on the main page +# (index.html). This can be useful if you have a project on for instance GitHub +# and want to reuse the introduction page also for the doxygen output. + +USE_MDFILE_AS_MAINPAGE = @PROJECT_SOURCE_DIR@/docs/DEVELOPERS.md + +#--------------------------------------------------------------------------- +# Configuration options related to source browsing +#--------------------------------------------------------------------------- + +# If the SOURCE_BROWSER tag is set to YES then a list of source files will be +# generated. Documented entities will be cross-referenced with these sources. +# +# Note: To get rid of all source code in the generated output, make sure that +# also VERBATIM_HEADERS is set to NO. +# The default value is: NO. + +SOURCE_BROWSER = NO + +# Setting the INLINE_SOURCES tag to YES will include the body of functions, +# classes and enums directly into the documentation. +# The default value is: NO. + +INLINE_SOURCES = NO + +# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any +# special comment blocks from generated source code fragments. Normal C, C++ and +# Fortran comments will always remain visible. +# The default value is: YES. + +STRIP_CODE_COMMENTS = YES + +# If the REFERENCED_BY_RELATION tag is set to YES then for each documented +# function all documented functions referencing it will be listed. +# The default value is: NO. + +REFERENCED_BY_RELATION = NO + +# If the REFERENCES_RELATION tag is set to YES then for each documented function +# all documented entities called/used by that function will be listed. +# The default value is: NO. + +REFERENCES_RELATION = NO + +# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set +# to YES then the hyperlinks from functions in REFERENCES_RELATION and +# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will +# link to the documentation. +# The default value is: YES. + +REFERENCES_LINK_SOURCE = YES + +# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the +# source code will show a tooltip with additional information such as prototype, +# brief description and links to the definition and documentation. Since this +# will make the HTML file larger and loading of large files a bit slower, you +# can opt to disable this feature. +# The default value is: YES. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +SOURCE_TOOLTIPS = YES + +# If the USE_HTAGS tag is set to YES then the references to source code will +# point to the HTML generated by the htags(1) tool instead of doxygen built-in +# source browser. The htags tool is part of GNU's global source tagging system +# (see http://www.gnu.org/software/global/global.html). You will need version +# 4.8.6 or higher. +# +# To use it do the following: +# - Install the latest version of global +# - Enable SOURCE_BROWSER and USE_HTAGS in the config file +# - Make sure the INPUT points to the root of the source tree +# - Run doxygen as normal +# +# Doxygen will invoke htags (and that will in turn invoke gtags), so these +# tools must be available from the command line (i.e. in the search path). +# +# The result: instead of the source browser generated by doxygen, the links to +# source code will now point to the output of htags. +# The default value is: NO. +# This tag requires that the tag SOURCE_BROWSER is set to YES. + +USE_HTAGS = NO + +# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a +# verbatim copy of the header file for each class for which an include is +# specified. Set to NO to disable this. +# See also: Section \class. +# The default value is: YES. + +VERBATIM_HEADERS = YES + +# If the CLANG_ASSISTED_PARSING tag is set to YES then doxygen will use the +# clang parser (see: http://clang.llvm.org/) for more accurate parsing at the +# cost of reduced performance. This can be particularly helpful with template +# rich C++ code for which doxygen's built-in parser lacks the necessary type +# information. +# Note: The availability of this option depends on whether or not doxygen was +# compiled with the --with-libclang option. +# The default value is: NO. + +CLANG_ASSISTED_PARSING = NO + +# If clang assisted parsing is enabled you can provide the compiler with command +# line options that you would normally use when invoking the compiler. Note that +# the include paths will already be set by doxygen for the files and directories +# specified with INPUT and INCLUDE_PATH. +# This tag requires that the tag CLANG_ASSISTED_PARSING is set to YES. + +CLANG_OPTIONS = + +#--------------------------------------------------------------------------- +# Configuration options related to the alphabetical class index +#--------------------------------------------------------------------------- + +# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all +# compounds will be generated. Enable this if the project contains a lot of +# classes, structs, unions or interfaces. +# The default value is: YES. + +ALPHABETICAL_INDEX = YES + +# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in +# which the alphabetical index list will be split. +# Minimum value: 1, maximum value: 20, default value: 5. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +COLS_IN_ALPHA_INDEX = 2 + +# In case all classes in a project start with a common prefix, all classes will +# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag +# can be used to specify a prefix (or a list of prefixes) that should be ignored +# while generating the index headers. +# This tag requires that the tag ALPHABETICAL_INDEX is set to YES. + +IGNORE_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the HTML output +#--------------------------------------------------------------------------- + +# If the GENERATE_HTML tag is set to YES, doxygen will generate HTML output +# The default value is: YES. + +GENERATE_HTML = YES + +# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_OUTPUT = html + +# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each +# generated HTML page (for example: .htm, .php, .asp). +# The default value is: .html. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FILE_EXTENSION = .html + +# The HTML_HEADER tag can be used to specify a user-defined HTML header file for +# each generated HTML page. If the tag is left blank doxygen will generate a +# standard header. +# +# To get valid HTML the header file that includes any scripts and style sheets +# that doxygen needs, which is dependent on the configuration options used (e.g. +# the setting GENERATE_TREEVIEW). It is highly recommended to start with a +# default header using +# doxygen -w html new_header.html new_footer.html new_stylesheet.css +# YourConfigFile +# and then modify the file new_header.html. See also section "Doxygen usage" +# for information on how to generate the default header that doxygen normally +# uses. +# Note: The header is subject to change so you typically have to regenerate the +# default header when upgrading to a newer version of doxygen. For a description +# of the possible markers and block names see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_HEADER = @PROJECT_SOURCE_DIR@/docs/bootstrap/header.html + +# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each +# generated HTML page. If the tag is left blank doxygen will generate a standard +# footer. See HTML_HEADER for more information on how to generate a default +# footer and what special commands can be used inside the footer. See also +# section "Doxygen usage" for information on how to generate the default footer +# that doxygen normally uses. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_FOOTER = @PROJECT_SOURCE_DIR@/docs/bootstrap/footer.html + +# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style +# sheet that is used by each HTML page. It can be used to fine-tune the look of +# the HTML output. If left blank doxygen will generate a default style sheet. +# See also section "Doxygen usage" for information on how to generate the style +# sheet that doxygen normally uses. +# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as +# it is more robust and this tag (HTML_STYLESHEET) will in the future become +# obsolete. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_STYLESHEET = + +# The HTML_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# cascading style sheets that are included after the standard style sheets +# created by doxygen. Using this option one can overrule certain style aspects. +# This is preferred over using HTML_STYLESHEET since it does not replace the +# standard style sheet and is therefore more robust against future updates. +# Doxygen will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). For an example see the documentation. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_STYLESHEET = @PROJECT_SOURCE_DIR@/docs/bootstrap/customdoxygen.css + +# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the HTML output directory. Note +# that these files will be copied to the base HTML output directory. Use the +# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these +# files. In the HTML_STYLESHEET file, use the file name only. Also note that the +# files will be copied as-is; there are no commands or markers available. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_EXTRA_FILES = @PROJECT_SOURCE_DIR@/docs/bootstrap/doxy-boot.js + +# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen +# will adjust the colors in the style sheet and background images according to +# this color. Hue is specified as an angle on a colorwheel, see +# http://en.wikipedia.org/wiki/Hue for more information. For instance the value +# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300 +# purple, and 360 is red again. +# Minimum value: 0, maximum value: 359, default value: 220. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_HUE = 360 + +# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors +# in the HTML output. For a value of 0 the output will use grayscales only. A +# value of 255 will produce the most vivid colors. +# Minimum value: 0, maximum value: 255, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_SAT = 100 + +# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the +# luminance component of the colors in the HTML output. Values below 100 +# gradually make the output lighter, whereas values above 100 make the output +# darker. The value divided by 100 is the actual gamma applied, so 80 represents +# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not +# change the gamma. +# Minimum value: 40, maximum value: 240, default value: 80. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_COLORSTYLE_GAMMA = 80 + +# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML +# page will contain the date and time when the page was generated. Setting this +# to YES can help to show when doxygen was last run and thus if the +# documentation is up to date. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_TIMESTAMP = YES + +# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML +# documentation will contain sections that can be hidden and shown after the +# page has loaded. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_DYNAMIC_SECTIONS = NO + +# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries +# shown in the various tree structured indices initially; the user can expand +# and collapse entries dynamically later on. Doxygen will expand the tree to +# such a level that at most the specified number of entries are visible (unless +# a fully collapsed tree already exceeds this amount). So setting the number of +# entries 1 will produce a full collapsed tree by default. 0 is a special value +# representing an infinite number of entries and will result in a full expanded +# tree by default. +# Minimum value: 0, maximum value: 9999, default value: 100. +# This tag requires that the tag GENERATE_HTML is set to YES. + +HTML_INDEX_NUM_ENTRIES = 100 + +# If the GENERATE_DOCSET tag is set to YES, additional index files will be +# generated that can be used as input for Apple's Xcode 3 integrated development +# environment (see: http://developer.apple.com/tools/xcode/), introduced with +# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a +# Makefile in the HTML output directory. Running make will produce the docset in +# that directory and running make install will install the docset in +# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at +# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html +# for more information. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_DOCSET = NO + +# This tag determines the name of the docset feed. A documentation feed provides +# an umbrella under which multiple documentation sets from a single provider +# (such as a company or product suite) can be grouped. +# The default value is: Doxygen generated docs. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_FEEDNAME = "Doxygen generated docs" + +# This tag specifies a string that should uniquely identify the documentation +# set bundle. This should be a reverse domain-name style string, e.g. +# com.mycompany.MyDocSet. Doxygen will append .docset to the name. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_BUNDLE_ID = org.doxygen.Project + +# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify +# the documentation publisher. This should be a reverse domain-name style +# string, e.g. com.mycompany.MyDocSet.documentation. +# The default value is: org.doxygen.Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_ID = org.doxygen.Publisher + +# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher. +# The default value is: Publisher. +# This tag requires that the tag GENERATE_DOCSET is set to YES. + +DOCSET_PUBLISHER_NAME = Publisher + +# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three +# additional HTML index files: index.hhp, index.hhc, and index.hhk. The +# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop +# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on +# Windows. +# +# The HTML Help Workshop contains a compiler that can convert all HTML output +# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML +# files are now used as the Windows 98 help format, and will replace the old +# Windows help format (.hlp) on all Windows platforms in the future. Compressed +# HTML files also contain an index, a table of contents, and you can search for +# words in the documentation. The HTML workshop also contains a viewer for +# compressed HTML files. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_HTMLHELP = NO + +# The CHM_FILE tag can be used to specify the file name of the resulting .chm +# file. You can add a path in front of the file if the result should not be +# written to the html output directory. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_FILE = + +# The HHC_LOCATION tag can be used to specify the location (absolute path +# including file name) of the HTML help compiler (hhc.exe). If non-empty, +# doxygen will try to run the HTML help compiler on the generated index.hhp. +# The file has to be specified with full path. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +HHC_LOCATION = + +# The GENERATE_CHI flag controls if a separate .chi index file is generated +# (YES) or that it should be included in the master .chm file (NO). +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +GENERATE_CHI = NO + +# The CHM_INDEX_ENCODING is used to encode HtmlHelp index (hhk), content (hhc) +# and project file content. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +CHM_INDEX_ENCODING = + +# The BINARY_TOC flag controls whether a binary table of contents is generated +# (YES) or a normal table of contents (NO) in the .chm file. Furthermore it +# enables the Previous and Next buttons. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +BINARY_TOC = NO + +# The TOC_EXPAND flag can be set to YES to add extra items for group members to +# the table of contents of the HTML help documentation and to the tree view. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTMLHELP is set to YES. + +TOC_EXPAND = NO + +# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and +# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that +# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help +# (.qch) of the generated HTML documentation. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_QHP = NO + +# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify +# the file name of the resulting .qch file. The path specified is relative to +# the HTML output folder. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QCH_FILE = + +# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help +# Project output. For more information please see Qt Help Project / Namespace +# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace). +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_NAMESPACE = org.doxygen.Project + +# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt +# Help Project output. For more information please see Qt Help Project / Virtual +# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual- +# folders). +# The default value is: doc. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_VIRTUAL_FOLDER = doc + +# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom +# filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_NAME = + +# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the +# custom filter to add. For more information please see Qt Help Project / Custom +# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom- +# filters). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_CUST_FILTER_ATTRS = + +# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this +# project's filter section matches. Qt Help Project / Filter Attributes (see: +# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes). +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHP_SECT_FILTER_ATTRS = + +# The QHG_LOCATION tag can be used to specify the location of Qt's +# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the +# generated .qhp file. +# This tag requires that the tag GENERATE_QHP is set to YES. + +QHG_LOCATION = + +# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be +# generated, together with the HTML files, they form an Eclipse help plugin. To +# install this plugin and make it available under the help contents menu in +# Eclipse, the contents of the directory containing the HTML and XML files needs +# to be copied into the plugins directory of eclipse. The name of the directory +# within the plugins directory should be the same as the ECLIPSE_DOC_ID value. +# After copying Eclipse needs to be restarted before the help appears. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_ECLIPSEHELP = NO + +# A unique identifier for the Eclipse help plugin. When installing the plugin +# the directory name containing the HTML and XML files should also have this +# name. Each documentation set should have its own identifier. +# The default value is: org.doxygen.Project. +# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES. + +ECLIPSE_DOC_ID = org.doxygen.Project + +# If you want full control over the layout of the generated HTML pages it might +# be necessary to disable the index and replace it with your own. The +# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top +# of each HTML page. A value of NO enables the index and the value YES disables +# it. Since the tabs in the index contain the same information as the navigation +# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +DISABLE_INDEX = NO + +# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index +# structure should be generated to display hierarchical information. If the tag +# value is set to YES, a side panel will be generated containing a tree-like +# index structure (just like the one that is generated for HTML Help). For this +# to work a browser that supports JavaScript, DHTML, CSS and frames is required +# (i.e. any modern browser). Windows users are probably better off using the +# HTML help feature. Via custom style sheets (see HTML_EXTRA_STYLESHEET) one can +# further fine-tune the look of the index. As an example, the default style +# sheet generated by doxygen has an example that shows how to put an image at +# the root of the tree instead of the PROJECT_NAME. Since the tree basically has +# the same information as the tab index, you could consider setting +# DISABLE_INDEX to YES when enabling this option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +GENERATE_TREEVIEW = NO + +# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that +# doxygen will group on one line in the generated HTML documentation. +# +# Note that a value of 0 will completely suppress the enum values from appearing +# in the overview section. +# Minimum value: 0, maximum value: 20, default value: 4. +# This tag requires that the tag GENERATE_HTML is set to YES. + +ENUM_VALUES_PER_LINE = 4 + +# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used +# to set the initial width (in pixels) of the frame in which the tree is shown. +# Minimum value: 0, maximum value: 1500, default value: 250. +# This tag requires that the tag GENERATE_HTML is set to YES. + +TREEVIEW_WIDTH = 250 + +# If the EXT_LINKS_IN_WINDOW option is set to YES, doxygen will open links to +# external symbols imported via tag files in a separate window. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +EXT_LINKS_IN_WINDOW = NO + +# Use this tag to change the font size of LaTeX formulas included as images in +# the HTML documentation. When you change the font size after a successful +# doxygen run you need to manually remove any form_*.png images from the HTML +# output directory to force them to be regenerated. +# Minimum value: 8, maximum value: 50, default value: 10. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_FONTSIZE = 10 + +# Use the FORMULA_TRANPARENT tag to determine whether or not the images +# generated for formulas are transparent PNGs. Transparent PNGs are not +# supported properly for IE 6.0, but are supported on all modern browsers. +# +# Note that when changing this option you need to delete any form_*.png files in +# the HTML output directory before the changes have effect. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +FORMULA_TRANSPARENT = YES + +# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see +# http://www.mathjax.org) which uses client side Javascript for the rendering +# instead of using pre-rendered bitmaps. Use this if you do not have LaTeX +# installed or if you want to formulas look prettier in the HTML output. When +# enabled you may also need to install MathJax separately and configure the path +# to it using the MATHJAX_RELPATH option. +# The default value is: NO. +# This tag requires that the tag GENERATE_HTML is set to YES. + +USE_MATHJAX = NO + +# When MathJax is enabled you can set the default output format to be used for +# the MathJax output. See the MathJax site (see: +# http://docs.mathjax.org/en/latest/output.html) for more details. +# Possible values are: HTML-CSS (which is slower, but has the best +# compatibility), NativeMML (i.e. MathML) and SVG. +# The default value is: HTML-CSS. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_FORMAT = HTML-CSS + +# When MathJax is enabled you need to specify the location relative to the HTML +# output directory using the MATHJAX_RELPATH option. The destination directory +# should contain the MathJax.js script. For instance, if the mathjax directory +# is located at the same level as the HTML output directory, then +# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax +# Content Delivery Network so you can quickly see the result without installing +# MathJax. However, it is strongly recommended to install a local copy of +# MathJax from http://www.mathjax.org before deployment. +# The default value is: http://cdn.mathjax.org/mathjax/latest. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest + +# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax +# extension names that should be enabled during MathJax rendering. For example +# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_EXTENSIONS = + +# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces +# of code that will be used on startup of the MathJax code. See the MathJax site +# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an +# example see the documentation. +# This tag requires that the tag USE_MATHJAX is set to YES. + +MATHJAX_CODEFILE = + +# When the SEARCHENGINE tag is enabled doxygen will generate a search box for +# the HTML output. The underlying search engine uses javascript and DHTML and +# should work on any modern browser. Note that when using HTML help +# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET) +# there is already a search function so this one should typically be disabled. +# For large projects the javascript based search engine can be slow, then +# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to +# search using the keyboard; to jump to the search box use <access key> + S +# (what the <access key> is depends on the OS and browser, but it is typically +# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down +# key> to jump into the search results window, the results can be navigated +# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel +# the search. The filter options can be selected when the cursor is inside the +# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys> +# to select a filter and <Enter> or <escape> to activate or cancel the filter +# option. +# The default value is: YES. +# This tag requires that the tag GENERATE_HTML is set to YES. + +SEARCHENGINE = YES + +# When the SERVER_BASED_SEARCH tag is enabled the search engine will be +# implemented using a web server instead of a web client using Javascript. There +# are two flavors of web server based searching depending on the EXTERNAL_SEARCH +# setting. When disabled, doxygen will generate a PHP script for searching and +# an index file used by the script. When EXTERNAL_SEARCH is enabled the indexing +# and searching needs to be provided by external tools. See the section +# "External Indexing and Searching" for details. +# The default value is: NO. +# This tag requires that the tag SEARCHENGINE is set to YES. + +SERVER_BASED_SEARCH = NO + +# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP +# script for searching. Instead the search results are written to an XML file +# which needs to be processed by an external indexer. Doxygen will invoke an +# external search engine pointed to by the SEARCHENGINE_URL option to obtain the +# search results. +# +# Doxygen ships with an example indexer (doxyindexer) and search engine +# (doxysearch.cgi) which are based on the open source search engine library +# Xapian (see: http://xapian.org/). +# +# See the section "External Indexing and Searching" for details. +# The default value is: NO. +# This tag requires that the tag SEARCHENGINE is set to YES. + +EXTERNAL_SEARCH = NO + +# The SEARCHENGINE_URL should point to a search engine hosted by a web server +# which will return the search results when EXTERNAL_SEARCH is enabled. +# +# Doxygen ships with an example indexer (doxyindexer) and search engine +# (doxysearch.cgi) which are based on the open source search engine library +# Xapian (see: http://xapian.org/). See the section "External Indexing and +# Searching" for details. +# This tag requires that the tag SEARCHENGINE is set to YES. + +SEARCHENGINE_URL = + +# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed +# search data is written to a file for indexing by an external tool. With the +# SEARCHDATA_FILE tag the name of this file can be specified. +# The default file is: searchdata.xml. +# This tag requires that the tag SEARCHENGINE is set to YES. + +SEARCHDATA_FILE = searchdata.xml + +# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the +# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is +# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple +# projects and redirect the results back to the right project. +# This tag requires that the tag SEARCHENGINE is set to YES. + +EXTERNAL_SEARCH_ID = + +# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen +# projects other than the one defined by this configuration file, but that are +# all added to the same external search index. Each project needs to have a +# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of +# to a relative location where the documentation can be found. The format is: +# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ... +# This tag requires that the tag SEARCHENGINE is set to YES. + +EXTRA_SEARCH_MAPPINGS = + +#--------------------------------------------------------------------------- +# Configuration options related to the LaTeX output +#--------------------------------------------------------------------------- + +# If the GENERATE_LATEX tag is set to YES, doxygen will generate LaTeX output. +# The default value is: YES. + +GENERATE_LATEX = NO + +# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: latex. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_OUTPUT = latex + +# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be +# invoked. +# +# Note that when enabling USE_PDFLATEX this option is only used for generating +# bitmaps for formulas in the HTML output, but not in the Makefile that is +# written to the output directory. +# The default file is: latex. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_CMD_NAME = latex + +# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate +# index for LaTeX. +# The default file is: makeindex. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +MAKEINDEX_CMD_NAME = makeindex + +# If the COMPACT_LATEX tag is set to YES, doxygen generates more compact LaTeX +# documents. This may be useful for small projects and may help to save some +# trees in general. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +COMPACT_LATEX = NO + +# The PAPER_TYPE tag can be used to set the paper type that is used by the +# printer. +# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x +# 14 inches) and executive (7.25 x 10.5 inches). +# The default value is: a4. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +PAPER_TYPE = a4 + +# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names +# that should be included in the LaTeX output. To get the times font for +# instance you can specify +# EXTRA_PACKAGES=times +# If left blank no extra packages will be included. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +EXTRA_PACKAGES = + +# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the +# generated LaTeX document. The header should contain everything until the first +# chapter. If it is left blank doxygen will generate a standard header. See +# section "Doxygen usage" for information on how to let doxygen write the +# default header to a separate file. +# +# Note: Only use a user-defined header if you know what you are doing! The +# following commands have a special meaning inside the header: $title, +# $datetime, $date, $doxygenversion, $projectname, $projectnumber, +# $projectbrief, $projectlogo. Doxygen will replace $title with the empty +# string, for the replacement values of the other commands the user is referred +# to HTML_HEADER. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_HEADER = + +# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the +# generated LaTeX document. The footer should contain everything after the last +# chapter. If it is left blank doxygen will generate a standard footer. See +# LATEX_HEADER for more information on how to generate a default footer and what +# special commands can be used inside the footer. +# +# Note: Only use a user-defined footer if you know what you are doing! +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_FOOTER = + +# The LATEX_EXTRA_STYLESHEET tag can be used to specify additional user-defined +# LaTeX style sheets that are included after the standard style sheets created +# by doxygen. Using this option one can overrule certain style aspects. Doxygen +# will copy the style sheet files to the output directory. +# Note: The order of the extra style sheet files is of importance (e.g. the last +# style sheet in the list overrules the setting of the previous ones in the +# list). +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_EXTRA_STYLESHEET = + +# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or +# other source files which should be copied to the LATEX_OUTPUT output +# directory. Note that the files will be copied as-is; there are no commands or +# markers available. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_EXTRA_FILES = + +# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is +# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will +# contain links (just like the HTML output) instead of page references. This +# makes the output suitable for online browsing using a PDF viewer. +# The default value is: YES. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +PDF_HYPERLINKS = YES + +# If the USE_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate +# the PDF file directly from the LaTeX files. Set this option to YES, to get a +# higher quality PDF documentation. +# The default value is: YES. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +USE_PDFLATEX = YES + +# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode +# command to the generated LaTeX files. This will instruct LaTeX to keep running +# if errors occur, instead of asking the user for help. This option is also used +# when generating formulas in HTML. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_BATCHMODE = NO + +# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the +# index chapters (such as File Index, Compound Index, etc.) in the output. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_HIDE_INDICES = NO + +# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source +# code with syntax highlighting in the LaTeX output. +# +# Note that which sources are shown also depends on other settings such as +# SOURCE_BROWSER. +# The default value is: NO. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_SOURCE_CODE = NO + +# The LATEX_BIB_STYLE tag can be used to specify the style to use for the +# bibliography, e.g. plainnat, or ieeetr. See +# http://en.wikipedia.org/wiki/BibTeX and \cite for more info. +# The default value is: plain. +# This tag requires that the tag GENERATE_LATEX is set to YES. + +LATEX_BIB_STYLE = plain + +#--------------------------------------------------------------------------- +# Configuration options related to the RTF output +#--------------------------------------------------------------------------- + +# If the GENERATE_RTF tag is set to YES, doxygen will generate RTF output. The +# RTF output is optimized for Word 97 and may not look too pretty with other RTF +# readers/editors. +# The default value is: NO. + +GENERATE_RTF = NO + +# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: rtf. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_OUTPUT = rtf + +# If the COMPACT_RTF tag is set to YES, doxygen generates more compact RTF +# documents. This may be useful for small projects and may help to save some +# trees in general. +# The default value is: NO. +# This tag requires that the tag GENERATE_RTF is set to YES. + +COMPACT_RTF = NO + +# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will +# contain hyperlink fields. The RTF file will contain links (just like the HTML +# output) instead of page references. This makes the output suitable for online +# browsing using Word or some other Word compatible readers that support those +# fields. +# +# Note: WordPad (write) and others do not support links. +# The default value is: NO. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_HYPERLINKS = NO + +# Load stylesheet definitions from file. Syntax is similar to doxygen's config +# file, i.e. a series of assignments. You only have to provide replacements, +# missing definitions are set to their default value. +# +# See also section "Doxygen usage" for information on how to generate the +# default style sheet that doxygen normally uses. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_STYLESHEET_FILE = + +# Set optional variables used in the generation of an RTF document. Syntax is +# similar to doxygen's config file. A template extensions file can be generated +# using doxygen -e rtf extensionFile. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_EXTENSIONS_FILE = + +# If the RTF_SOURCE_CODE tag is set to YES then doxygen will include source code +# with syntax highlighting in the RTF output. +# +# Note that which sources are shown also depends on other settings such as +# SOURCE_BROWSER. +# The default value is: NO. +# This tag requires that the tag GENERATE_RTF is set to YES. + +RTF_SOURCE_CODE = NO + +#--------------------------------------------------------------------------- +# Configuration options related to the man page output +#--------------------------------------------------------------------------- + +# If the GENERATE_MAN tag is set to YES, doxygen will generate man pages for +# classes and files. +# The default value is: NO. + +GENERATE_MAN = NO + +# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. A directory man3 will be created inside the directory specified by +# MAN_OUTPUT. +# The default directory is: man. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_OUTPUT = man + +# The MAN_EXTENSION tag determines the extension that is added to the generated +# man pages. In case the manual section does not start with a number, the number +# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is +# optional. +# The default value is: .3. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_EXTENSION = .3 + +# The MAN_SUBDIR tag determines the name of the directory created within +# MAN_OUTPUT in which the man pages are placed. If defaults to man followed by +# MAN_EXTENSION with the initial . removed. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_SUBDIR = + +# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it +# will generate one additional man file for each entity documented in the real +# man page(s). These additional files only source the real man page, but without +# them the man command would be unable to find the correct page. +# The default value is: NO. +# This tag requires that the tag GENERATE_MAN is set to YES. + +MAN_LINKS = NO + +#--------------------------------------------------------------------------- +# Configuration options related to the XML output +#--------------------------------------------------------------------------- + +# If the GENERATE_XML tag is set to YES, doxygen will generate an XML file that +# captures the structure of the code including all documentation. +# The default value is: NO. + +GENERATE_XML = NO + +# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a +# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of +# it. +# The default directory is: xml. +# This tag requires that the tag GENERATE_XML is set to YES. + +XML_OUTPUT = xml + +# If the XML_PROGRAMLISTING tag is set to YES, doxygen will dump the program +# listings (including syntax highlighting and cross-referencing information) to +# the XML output. Note that enabling this will significantly increase the size +# of the XML output. +# The default value is: YES. +# This tag requires that the tag GENERATE_XML is set to YES. + +XML_PROGRAMLISTING = YES + +#--------------------------------------------------------------------------- +# Configuration options related to the DOCBOOK output +#--------------------------------------------------------------------------- + +# If the GENERATE_DOCBOOK tag is set to YES, doxygen will generate Docbook files +# that can be used to generate PDF. +# The default value is: NO. + +GENERATE_DOCBOOK = NO + +# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put. +# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in +# front of it. +# The default directory is: docbook. +# This tag requires that the tag GENERATE_DOCBOOK is set to YES. + +DOCBOOK_OUTPUT = docbook + +# If the DOCBOOK_PROGRAMLISTING tag is set to YES, doxygen will include the +# program listings (including syntax highlighting and cross-referencing +# information) to the DOCBOOK output. Note that enabling this will significantly +# increase the size of the DOCBOOK output. +# The default value is: NO. +# This tag requires that the tag GENERATE_DOCBOOK is set to YES. + +DOCBOOK_PROGRAMLISTING = NO + +#--------------------------------------------------------------------------- +# Configuration options for the AutoGen Definitions output +#--------------------------------------------------------------------------- + +# If the GENERATE_AUTOGEN_DEF tag is set to YES, doxygen will generate an +# AutoGen Definitions (see http://autogen.sf.net) file that captures the +# structure of the code including all documentation. Note that this feature is +# still experimental and incomplete at the moment. +# The default value is: NO. + +GENERATE_AUTOGEN_DEF = NO + +#--------------------------------------------------------------------------- +# Configuration options related to the Perl module output +#--------------------------------------------------------------------------- + +# If the GENERATE_PERLMOD tag is set to YES, doxygen will generate a Perl module +# file that captures the structure of the code including all documentation. +# +# Note that this feature is still experimental and incomplete at the moment. +# The default value is: NO. + +GENERATE_PERLMOD = NO + +# If the PERLMOD_LATEX tag is set to YES, doxygen will generate the necessary +# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI +# output from the Perl module output. +# The default value is: NO. +# This tag requires that the tag GENERATE_PERLMOD is set to YES. + +PERLMOD_LATEX = NO + +# If the PERLMOD_PRETTY tag is set to YES, the Perl module output will be nicely +# formatted so it can be parsed by a human reader. This is useful if you want to +# understand what is going on. On the other hand, if this tag is set to NO, the +# size of the Perl module output will be much smaller and Perl will parse it +# just the same. +# The default value is: YES. +# This tag requires that the tag GENERATE_PERLMOD is set to YES. + +PERLMOD_PRETTY = YES + +# The names of the make variables in the generated doxyrules.make file are +# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful +# so different doxyrules.make files included by the same Makefile don't +# overwrite each other's variables. +# This tag requires that the tag GENERATE_PERLMOD is set to YES. + +PERLMOD_MAKEVAR_PREFIX = + +#--------------------------------------------------------------------------- +# Configuration options related to the preprocessor +#--------------------------------------------------------------------------- + +# If the ENABLE_PREPROCESSING tag is set to YES, doxygen will evaluate all +# C-preprocessor directives found in the sources and include files. +# The default value is: YES. + +ENABLE_PREPROCESSING = YES + +# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names +# in the source code. If set to NO, only conditional compilation will be +# performed. Macro expansion can be done in a controlled way by setting +# EXPAND_ONLY_PREDEF to YES. +# The default value is: NO. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +MACRO_EXPANSION = NO + +# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then +# the macro expansion is limited to the macros specified with the PREDEFINED and +# EXPAND_AS_DEFINED tags. +# The default value is: NO. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +EXPAND_ONLY_PREDEF = NO + +# If the SEARCH_INCLUDES tag is set to YES, the include files in the +# INCLUDE_PATH will be searched if a #include is found. +# The default value is: YES. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +SEARCH_INCLUDES = YES + +# The INCLUDE_PATH tag can be used to specify one or more directories that +# contain include files that are not input files but should be processed by the +# preprocessor. +# This tag requires that the tag SEARCH_INCLUDES is set to YES. + +INCLUDE_PATH = + +# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard +# patterns (like *.h and *.hpp) to filter out the header-files in the +# directories. If left blank, the patterns specified with FILE_PATTERNS will be +# used. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +INCLUDE_FILE_PATTERNS = + +# The PREDEFINED tag can be used to specify one or more macro names that are +# defined before the preprocessor is started (similar to the -D option of e.g. +# gcc). The argument of the tag is a list of macros of the form: name or +# name=definition (no spaces). If the definition and the "=" are omitted, "=1" +# is assumed. To prevent a macro definition from being undefined via #undef or +# recursively expanded use the := operator instead of the = operator. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +PREDEFINED = + +# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this +# tag can be used to specify a list of macro names that should be expanded. The +# macro definition that is found in the sources will be used. Use the PREDEFINED +# tag if you want to use a different macro definition that overrules the +# definition found in the source code. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +EXPAND_AS_DEFINED = + +# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will +# remove all references to function-like macros that are alone on a line, have +# an all uppercase name, and do not end with a semicolon. Such function macros +# are typically used for boiler-plate code, and will confuse the parser if not +# removed. +# The default value is: YES. +# This tag requires that the tag ENABLE_PREPROCESSING is set to YES. + +SKIP_FUNCTION_MACROS = NO + +#--------------------------------------------------------------------------- +# Configuration options related to external references +#--------------------------------------------------------------------------- + +# The TAGFILES tag can be used to specify one or more tag files. For each tag +# file the location of the external documentation should be added. The format of +# a tag file without this location is as follows: +# TAGFILES = file1 file2 ... +# Adding location for the tag files is done as follows: +# TAGFILES = file1=loc1 "file2 = loc2" ... +# where loc1 and loc2 can be relative or absolute paths or URLs. See the +# section "Linking to external documentation" for more information about the use +# of tag files. +# Note: Each tag file must have a unique name (where the name does NOT include +# the path). If a tag file is not located in the directory in which doxygen is +# run, you must also specify the path to the tagfile here. + +TAGFILES = + +# When a file name is specified after GENERATE_TAGFILE, doxygen will create a +# tag file that is based on the input files it reads. See section "Linking to +# external documentation" for more information about the usage of tag files. + +GENERATE_TAGFILE = + +# If the ALLEXTERNALS tag is set to YES, all external class will be listed in +# the class index. If set to NO, only the inherited external classes will be +# listed. +# The default value is: NO. + +ALLEXTERNALS = NO + +# If the EXTERNAL_GROUPS tag is set to YES, all external groups will be listed +# in the modules index. If set to NO, only the current project's groups will be +# listed. +# The default value is: YES. + +EXTERNAL_GROUPS = YES + +# If the EXTERNAL_PAGES tag is set to YES, all external pages will be listed in +# the related pages index. If set to NO, only the current project's pages will +# be listed. +# The default value is: YES. + +EXTERNAL_PAGES = YES + +# The PERL_PATH should be the absolute path and name of the perl script +# interpreter (i.e. the result of 'which perl'). +# The default file (with absolute path) is: /usr/bin/perl. + +PERL_PATH = /usr/bin/perl + +#--------------------------------------------------------------------------- +# Configuration options related to the dot tool +#--------------------------------------------------------------------------- + +# If the CLASS_DIAGRAMS tag is set to YES, doxygen will generate a class diagram +# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to +# NO turns the diagrams off. Note that this option also works with HAVE_DOT +# disabled, but it is recommended to install and use dot, since it yields more +# powerful graphs. +# The default value is: YES. + +CLASS_DIAGRAMS = YES + +# You can define message sequence charts within doxygen comments using the \msc +# command. Doxygen will then run the mscgen tool (see: +# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the +# documentation. The MSCGEN_PATH tag allows you to specify the directory where +# the mscgen tool resides. If left empty the tool is assumed to be found in the +# default search path. + +MSCGEN_PATH = + +# You can include diagrams made with dia in doxygen documentation. Doxygen will +# then run dia to produce the diagram and insert it in the documentation. The +# DIA_PATH tag allows you to specify the directory where the dia binary resides. +# If left empty dia is assumed to be found in the default search path. + +DIA_PATH = + +# If set to YES the inheritance and collaboration graphs will hide inheritance +# and usage relations if the target is undocumented or is not a class. +# The default value is: YES. + +HIDE_UNDOC_RELATIONS = YES + +# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is +# available from the path. This tool is part of Graphviz (see: +# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent +# Bell Labs. The other options in this section have no effect if this option is +# set to NO +# The default value is: YES. + +HAVE_DOT = YES + +# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed +# to run in parallel. When set to 0 doxygen will base this on the number of +# processors available in the system. You can set it explicitly to a value +# larger than 0 to get control over the balance between CPU load and processing +# speed. +# Minimum value: 0, maximum value: 32, default value: 0. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_NUM_THREADS = 0 + +# When you want a differently looking font in the dot files that doxygen +# generates you can specify the font name using DOT_FONTNAME. You need to make +# sure dot is able to find the font, which can be done by putting it in a +# standard location or by setting the DOTFONTPATH environment variable or by +# setting DOT_FONTPATH to the directory containing the font. +# The default value is: Helvetica. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_FONTNAME = Helvetica + +# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of +# dot graphs. +# Minimum value: 4, maximum value: 24, default value: 10. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_FONTSIZE = 10 + +# By default doxygen will tell dot to use the default font as specified with +# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set +# the path where dot can find it using this tag. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_FONTPATH = + +# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for +# each documented class showing the direct and indirect inheritance relations. +# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +CLASS_GRAPH = YES + +# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a +# graph for each documented class showing the direct and indirect implementation +# dependencies (inheritance, containment, and class references variables) of the +# class with other documented classes. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +COLLABORATION_GRAPH = YES + +# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for +# groups, showing the direct groups dependencies. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +GROUP_GRAPHS = YES + +# If the UML_LOOK tag is set to YES, doxygen will generate inheritance and +# collaboration diagrams in a style similar to the OMG's Unified Modeling +# Language. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +UML_LOOK = NO + +# If the UML_LOOK tag is enabled, the fields and methods are shown inside the +# class node. If there are many fields or methods and many nodes the graph may +# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the +# number of items for each type to make the size more manageable. Set this to 0 +# for no limit. Note that the threshold may be exceeded by 50% before the limit +# is enforced. So when you set the threshold to 10, up to 15 fields may appear, +# but if the number exceeds 15, the total amount of fields shown is limited to +# 10. +# Minimum value: 0, maximum value: 100, default value: 10. +# This tag requires that the tag HAVE_DOT is set to YES. + +UML_LIMIT_NUM_FIELDS = 10 + +# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and +# collaboration graphs will show the relations between templates and their +# instances. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +TEMPLATE_RELATIONS = NO + +# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to +# YES then doxygen will generate a graph for each documented file showing the +# direct and indirect include dependencies of the file with other documented +# files. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +INCLUDE_GRAPH = YES + +# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are +# set to YES then doxygen will generate a graph for each documented file showing +# the direct and indirect include dependencies of the file with other documented +# files. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +INCLUDED_BY_GRAPH = YES + +# If the CALL_GRAPH tag is set to YES then doxygen will generate a call +# dependency graph for every global function or class method. +# +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable call graphs for selected +# functions only using the \callgraph command. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +CALL_GRAPH = NO + +# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller +# dependency graph for every global function or class method. +# +# Note that enabling this option will significantly increase the time of a run. +# So in most cases it will be better to enable caller graphs for selected +# functions only using the \callergraph command. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +CALLER_GRAPH = NO + +# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical +# hierarchy of all classes instead of a textual one. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +GRAPHICAL_HIERARCHY = YES + +# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the +# dependencies a directory has on other directories in a graphical way. The +# dependency relations are determined by the #include relations between the +# files in the directories. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +DIRECTORY_GRAPH = YES + +# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images +# generated by dot. +# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order +# to make the SVG files visible in IE 9+ (other browsers do not have this +# requirement). +# Possible values are: png, png:cairo, png:cairo:cairo, png:cairo:gd, png:gd, +# png:gd:gd, jpg, jpg:cairo, jpg:cairo:gd, jpg:gd, jpg:gd:gd, gif, gif:cairo, +# gif:cairo:gd, gif:gd, gif:gd:gd and svg. +# The default value is: png. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_IMAGE_FORMAT = svg + +# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to +# enable generation of interactive SVG images that allow zooming and panning. +# +# Note that this requires a modern browser other than Internet Explorer. Tested +# and working are Firefox, Chrome, Safari, and Opera. +# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make +# the SVG files visible. Older versions of IE do not have SVG support. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +INTERACTIVE_SVG = YES + +# The DOT_PATH tag can be used to specify the path where the dot tool can be +# found. If left blank, it is assumed the dot tool can be found in the path. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_PATH = + +# The DOTFILE_DIRS tag can be used to specify one or more directories that +# contain dot files that are included in the documentation (see the \dotfile +# command). +# This tag requires that the tag HAVE_DOT is set to YES. + +DOTFILE_DIRS = + +# The MSCFILE_DIRS tag can be used to specify one or more directories that +# contain msc files that are included in the documentation (see the \mscfile +# command). + +MSCFILE_DIRS = + +# The DIAFILE_DIRS tag can be used to specify one or more directories that +# contain dia files that are included in the documentation (see the \diafile +# command). + +DIAFILE_DIRS = + +# When using plantuml, the PLANTUML_JAR_PATH tag should be used to specify the +# path where java can find the plantuml.jar file. If left blank, it is assumed +# PlantUML is not used or called during a preprocessing step. Doxygen will +# generate a warning when it encounters a \startuml command in this case and +# will not generate output for the diagram. + +PLANTUML_JAR_PATH = + +# When using plantuml, the specified paths are searched for files specified by +# the !include statement in a plantuml block. + +PLANTUML_INCLUDE_PATH = + +# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes +# that will be shown in the graph. If the number of nodes in a graph becomes +# larger than this value, doxygen will truncate the graph, which is visualized +# by representing a node as a red box. Note that doxygen if the number of direct +# children of the root node in a graph is already larger than +# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that +# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH. +# Minimum value: 0, maximum value: 10000, default value: 50. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_GRAPH_MAX_NODES = 50 + +# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs +# generated by dot. A depth value of 3 means that only nodes reachable from the +# root by following a path via at most 3 edges will be shown. Nodes that lay +# further from the root node will be omitted. Note that setting this option to 1 +# or 2 may greatly reduce the computation time needed for large code bases. Also +# note that the size of a graph can be further restricted by +# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction. +# Minimum value: 0, maximum value: 1000, default value: 0. +# This tag requires that the tag HAVE_DOT is set to YES. + +MAX_DOT_GRAPH_DEPTH = 0 + +# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent +# background. This is disabled by default, because dot on Windows does not seem +# to support this out of the box. +# +# Warning: Depending on the platform used, enabling this option may lead to +# badly anti-aliased labels on the edges of a graph (i.e. they become hard to +# read). +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_TRANSPARENT = NO + +# Set the DOT_MULTI_TARGETS tag to YES to allow dot to generate multiple output +# files in one run (i.e. multiple -o and -T options on the command line). This +# makes dot run faster, but since only newer versions of dot (>1.8.10) support +# this, this feature is disabled by default. +# The default value is: NO. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_MULTI_TARGETS = NO + +# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page +# explaining the meaning of the various boxes and arrows in the dot generated +# graphs. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +GENERATE_LEGEND = YES + +# If the DOT_CLEANUP tag is set to YES, doxygen will remove the intermediate dot +# files that are used to generate the various graphs. +# The default value is: YES. +# This tag requires that the tag HAVE_DOT is set to YES. + +DOT_CLEANUP = YES
\ No newline at end of file diff --git a/docs/bootstrap/LICENSE b/docs/bootstrap/LICENSE new file mode 100755 index 0000000..e06d208 --- /dev/null +++ b/docs/bootstrap/LICENSE @@ -0,0 +1,202 @@ +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + diff --git a/docs/bootstrap/customdoxygen.css b/docs/bootstrap/customdoxygen.css new file mode 100755 index 0000000..6c71e58 --- /dev/null +++ b/docs/bootstrap/customdoxygen.css @@ -0,0 +1,461 @@ +div.h1 { + font-weight: bold !important; + font-size: 2.25em; +} + +h1 { + font-weight: bold !important; + font-size: 1.75em; +} + +h2, div.h2 { + font-weight: bold !important; + font-size: 1.5em; +} + +h3, div.h3 { + font-weight: bold !important; + font-size: 1.2em; +} + +h4, div.h4 { + font-style: italic; + font-size: 1.2em; +} + + +#navrow1, #navrow2, #navrow3, #navrow4, #navrow5{ + border-bottom: 1px solid #EEEEEE; +} + +.adjust-right { +margin-left: 30px !important; +font-size: 1.15em !important; +} +.navbar{ + border: 0px solid #222 !important; +} + +/*table{ + white-space:pre-wrap !important; +} +*/ + +/* + =========================== + */ + + +/* Sticky footer styles +-------------------------------------------------- */ +html, +body { + height: 100%; + /* The html and body elements cannot have any padding or margin. */ +} + +/* Wrapper for page content to push down footer */ +#wrap { + min-height: 100%; + height: auto; + /* Negative indent footer by its height */ + margin: 0 auto -60px; + /* Pad bottom by footer height */ + padding: 0 0 60px; +} + +/* Set the fixed height of the footer here */ +#footer { + font-size: 0.9em; + padding: 8px 0px; + background-color: #f5f5f5; +} + +.footer-row { + line-height: 44px; +} + +#footer > .container { + padding-left: 15px; + padding-right: 15px; +} + +.footer-follow-icon { + margin-left: 3px; + text-decoration: none !important; +} + +.footer-follow-icon img { + width: 20px; +} + +.footer-link { + padding-top: 5px; + display: inline-block; + color: #999999; + text-decoration: none; +} + +.footer-copyright { + text-align: center; +} + + +@media (min-width: 992px) { + .footer-row { + text-align: left; + } + + .footer-icons { + text-align: right; + } +} +@media (max-width: 991px) { + .footer-row { + text-align: center; + } + + .footer-icons { + text-align: center; + } +} + +/* DOXYGEN Code Styles +----------------------------------- */ + + +a.qindex { + font-weight: bold; +} + +a.qindexHL { + font-weight: bold; + background-color: #9CAFD4; + color: #ffffff; + border: 1px double #869DCA; +} + +.contents a.qindexHL:visited { + color: #ffffff; +} + +a.code, a.code:visited, a.line, a.line:visited { + color: #4665A2; +} + +a.codeRef, a.codeRef:visited, a.lineRef, a.lineRef:visited { + color: #4665A2; +} + +/* @end */ + +dl.el { + margin-left: -1cm; +} + +pre.fragment { + border: 0px solid #C4CFE5; + background-color: #f7f7f7; + border-radius: 3px; + padding: 16px; + margin: 16px; + overflow: auto; + word-wrap: break-word; + font-size: 9pt; + line-height: 125%; + font-family: monospace, fixed; + font-size: 105%; +} + +div.fragment { + padding: 4px 6px; + margin: 4px 8px 4px 2px; + border: 1px solid #C4CFE5; +} + +div.line { + font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace; + font-size: 12px; + min-height: 13px; + line-height: 1.0; + text-wrap: unrestricted; + white-space: -moz-pre-wrap; /* Moz */ + white-space: -pre-wrap; /* Opera 4-6 */ + white-space: -o-pre-wrap; /* Opera 7 */ + white-space: pre-wrap; /* CSS3 */ + word-wrap: normal; /* IE 5.5+ */ + text-indent: -53px; + padding-left: 53px; + padding-bottom: 0px; + margin: 0px; + -webkit-transition-property: background-color, box-shadow; + -webkit-transition-duration: 0.5s; + -moz-transition-property: background-color, box-shadow; + -moz-transition-duration: 0.5s; + -ms-transition-property: background-color, box-shadow; + -ms-transition-duration: 0.5s; + -o-transition-property: background-color, box-shadow; + -o-transition-duration: 0.5s; + transition-property: background-color, box-shadow; + transition-duration: 0.5s; +} +div.line:hover{ + background-color: #FBFF00; +} + +div.line.glow { + background-color: cyan; + box-shadow: 0 0 10px cyan; +} + + +span.lineno { + padding-right: 4px; + text-align: right; + color:rgba(0,0,0,0.3); + border-right: 1px solid #EEE; + border-left: 1px solid #EEE; + background-color: #FFF; + white-space: pre; + font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace ; +} +span.lineno a { + background-color: #FAFAFA; + cursor:pointer; +} + +span.lineno a:hover { + background-color: #EFE200; + color: #1e1e1e; +} + +div.groupHeader { + margin-left: 16px; + margin-top: 12px; + font-weight: bold; +} + +div.groupText { + margin-left: 16px; + font-style: italic; +} + +/* OWN */ + +div.mbrief { + padding: 0px 8px; + margin: 5px 0px; + border-left: 4px solid #DDD; +} + +div.toc, div.toc li { + font: 400 10px/22px Roboto, sans-serif; + line-height: 1.2; +} + +div.toc { + border-radius: 3px; + padding: 10px 15px; + margin-left: 30px; + border: 0px solid #D8DFEE; +} + +div.toc li.level2 { + margin-left: 10px; +} +div.toc li.level3 { + margin-left: 10px; +} +div.toc li.level4 { + margin-left: 10px; +} + +/* doxygen has nested small's in its output :( */ +h1 small, .h1 small, +h2 small, .h2 small, +h3 small, .h3 small, +h1 .small, .h1 .small, +h2 .small, .h2 .small, +h3 .small, .h3 .small { + font-size: 10pt; +} + +div.ingroups { + font-size: 10pt; +} + +.row .nav > li > a { + padding: 5px 8px; + margin: 2px 3px; +} + +/* @group Code Colorization */ + +span.keyword { + color: #008000 +} + +span.keywordtype { + color: #604020 +} + +span.keywordflow { + color: #e08000 +} + +span.comment { + color: #800000 +} + +span.preprocessor { + color: #806020 +} + +span.stringliteral { + color: #002080 +} + +span.charliteral { + color: #008080 +} + +span.vhdldigit { + color: #ff00ff +} + +span.vhdlchar { + color: #000000 +} + +span.vhdlkeyword { + color: #700070 +} + +span.vhdllogic { + color: #ff0000 +} + +blockquote { + background-color: #F7F8FB; + border-left: 2px solid #9CAFD4; + margin: 0 24px 0 4px; + padding: 0 12px 0 16px; +} + +/*---------------- Search Box */ + +#search-box { + margin: 10px 0px; +} +#search-box .close { + display: none; + position: absolute; + right: 0px; + padding: 6px 12px; + z-index: 5; +} + +/*---------------- Search results window */ + +#search-results-window { + display: none; +} + +iframe#MSearchResults { + width: 100%; + height: 15em; +} + +.SRChildren { + padding-left: 3ex; padding-bottom: .5em +} +.SRPage .SRChildren { + display: none; +} +a.SRScope { + display: block; +} +a.SRSymbol:focus, a.SRSymbol:active, +a.SRScope:focus, a.SRScope:active { + text-decoration: underline; +} +span.SRScope { + padding-left: 4px; +} +.SRResult { + display: none; +} + +/* class and file list */ +.directory .icona, +.directory .arrow { + height: auto; +} +.directory .icona .icon { + height: 16px; +} +.directory .icondoc { + background-position: 0px 0px; + height: 20px; +} +.directory .iconfopen { + background-position: 0px 0px; +} +.directory td.entry { + padding: 7px 8px 6px 8px; +} + +.table > tbody > tr > td.memSeparator { + line-height: 0; + .table-hover; + padding: 3px; +/* border-bottom: 2px solid #e0e0e0;*/ +} + +.table > tbody > tr > td.memItemLeft { + border-top: 1px solid #e0e0e0; +} +.table > tbody > tr > td.mdescRight { + border-bottom: 1px solid #e0e0e0; +} + +.table > tbody > tr > td.memItemLeft, +.table > tbody > tr > td.mdescRight, +.table > tbody > tr > td.memItemRight { + border-left: 1px solid #e0e0e0; + border-right: 1px solid #e0e0e0; +/* width: auto;*/ +} + +.memItemLeft, .memTemplItemLeft { + white-space: normal; +} + +/* enumerations */ +.panel-body thead > tr { + background-color: #e0e0e0; +} + +/* todo lists */ +.todoname, +.todoname a { + font-weight: bold; +} + +/* Class title */ +.summary { + margin-top: 25px; +} +.page-header { + margin: 20px 0px !important; +} +.page-header .title { + display: inline-block; +} +.page-header .pull-right { + margin-top: 0.3em; + margin-left: 0.5em; +} +.page-header .label { + font-size: 50%; +}
\ No newline at end of file diff --git a/docs/bootstrap/doxy-boot.js b/docs/bootstrap/doxy-boot.js new file mode 100755 index 0000000..39c6a5d --- /dev/null +++ b/docs/bootstrap/doxy-boot.js @@ -0,0 +1,331 @@ +$( document ).ready(function() { + $("div.headertitle").addClass("page-header"); + $("div.title").addClass("h1"); + + $('li > a[href="index.html"] > span').before("<i class='fa fa-cog'></i> "); + $('li > a[href="modules.html"] > span').before("<i class='fa fa-square'></i> "); + $('li > a[href="namespaces.html"] > span').before("<i class='fa fa-bars'></i> "); + $('li > a[href="annotated.html"] > span').before("<i class='fa fa-list-ul'></i> "); + $('li > a[href="classes.html"] > span').before("<i class='fa fa-book'></i> "); + $('li > a[href="inherits.html"] > span').before("<i class='fa fa-sitemap'></i> "); + $('li > a[href="functions.html"] > span').before("<i class='fa fa-list'></i> "); + $('li > a[href="functions_func.html"] > span').before("<i class='fa fa-list'></i> "); + $('li > a[href="functions_vars.html"] > span').before("<i class='fa fa-list'></i> "); + $('li > a[href="functions_enum.html"] > span').before("<i class='fa fa-list'></i> "); + $('li > a[href="functions_eval.html"] > span').before("<i class='fa fa-list'></i> "); + $('img[src="ftv2ns.png"]').replaceWith('<span class="label label-danger">N</span> '); + $('img[src="ftv2cl.png"]').replaceWith('<span class="label label-danger">C</span> '); + + $("ul.tablist").addClass("nav nav-pills nav-justified"); + $("ul.tablist").css("margin-top", "0.5em"); + $("ul.tablist").css("margin-bottom", "0.5em"); + $("li.current").addClass("active"); + $("iframe").attr("scrolling", "yes"); + + $("#nav-path > ul").addClass("breadcrumb"); + + $("table.params").addClass("table"); + $("div.ingroups").wrapInner("<small></small>"); + $("div.levels").css("margin", "0.5em"); + $("div.levels > span").addClass("btn btn-default btn-xs"); + $("div.levels > span").css("margin-right", "0.25em"); + + $("table.directory").addClass("table table-striped"); + $("div.summary > a").addClass("btn btn-default btn-xs"); + $("table.fieldtable").addClass("table"); + $(".fragment").addClass("well"); + $(".memitem").addClass("panel panel-default"); + $(".memproto").addClass("panel-heading"); + $(".memdoc").addClass("panel-body"); + $("span.mlabel").addClass("label label-info"); + + $("table.memberdecls").addClass("table"); + $("[class^=memitem]").addClass("active"); + + $("div.ah").addClass("btn btn-default"); + $("span.mlabels").addClass("pull-right"); + $("table.mlabels").css("width", "100%") + $("td.mlabels-right").addClass("pull-right"); + + $("div.ttc").addClass("panel panel-primary"); + $("div.ttname").addClass("panel-heading"); + $("div.ttname a").css("color", 'white'); + $("div.ttdef,div.ttdoc,div.ttdeci").addClass("panel-body"); + + $('div.fragment.well div.line:first').css('margin-top', '2px'); + $('div.fragment.well div.line:last').css('margin-bottom', '2px'); + + $('table.doxtable').removeClass('doxtable').addClass('table table-striped table-bordered').each(function(){ + $(this).prepend('<thead></thead>'); + $(this).find('tbody > tr:first').prependTo($(this).find('thead')); + + $(this).find('td > span.success').parent().addClass('success'); + $(this).find('td > span.warning').parent().addClass('warning'); + $(this).find('td > span.danger').parent().addClass('danger'); + }); + + + + if($('div.fragment.well div.ttc').length > 0) + { + $('div.fragment.well div.line:first').parent().removeClass('fragment well'); + } + + // this mangles the member lists + // $('table.memberdecls').find('.memItemRight').each(function(){ + // $(this).contents().appendTo($(this).siblings('.memItemLeft')); + // $(this).siblings('.memItemLeft').attr('align', 'left'); + // }); + + function getOriginalWidthOfImg(img_element) { + var t = new Image(); + t.src = (img_element.getAttribute ? img_element.getAttribute("src") : false) || img_element.src; + return t.width; + } + + $('div.dyncontent').find('img').each(function(){ + if(getOriginalWidthOfImg($(this)[0]) > $('#content>div.container').width()) + $(this).css('width', '100%'); + }); + $("div.headertitle").addClass("page-header"); + $("div.title").addClass("h1"); + + $('li > a[href="index.html"] > span').before("<i class='fa fa-cog'></i> "); + //$('li > a[href="index.html"] > span').text("CoActionOS"); + $('li > a[href="modules.html"] > span').before("<i class='fa fa-square'></i> "); + $('li > a[href="namespaces.html"] > span').before("<i class='fa fa-bars'></i> "); + $('li > a[href="annotated.html"] > span').before("<i class='fa fa-list-ul'></i> "); + $('li > a[href="classes.html"] > span').before("<i class='fa fa-book'></i> "); + $('li > a[href="inherits.html"] > span').before("<i class='fa fa-sitemap'></i> "); + $('li > a[href="functions.html"] > span').before("<i class='fa fa-list'></i> "); + $('li > a[href="functions_func.html"] > span').before("<i class='fa fa-list'></i> "); + $('li > a[href="functions_vars.html"] > span').before("<i class='fa fa-list'></i> "); + $('li > a[href="functions_enum.html"] > span').before("<i class='fa fa-list'></i> "); + $('li > a[href="functions_eval.html"] > span').before("<i class='fa fa-list'></i> "); + $('img[src="ftv2ns.png"]').replaceWith('<span class="label label-danger">N</span> '); + $('img[src="ftv2cl.png"]').replaceWith('<span class="label label-danger">C</span> '); + + $("ul.tablist").addClass("nav nav-pills nav-justified"); + $("ul.tablist").css("margin-top", "0.5em"); + $("ul.tablist").css("margin-bottom", "0.5em"); + $("li.current").addClass("active"); + $("iframe").attr("scrolling", "yes"); + + $("#nav-path > ul").addClass("breadcrumb"); + + $("table.params").addClass("table"); + $("div.ingroups").wrapInner("<small></small>"); + $("div.levels").css("margin", "0.5em"); + $("div.levels > span").addClass("btn btn-default btn-xs"); + $("div.levels > span").css("margin-right", "0.25em"); + + $("table.directory").addClass("table table-striped"); + $("div.summary > a").addClass("btn btn-default btn-xs"); + $("table.fieldtable").addClass("table"); + $(".fragment").addClass("well"); + $(".memitem").addClass("panel panel-default"); + $(".memproto").addClass("panel-heading"); + $(".memdoc").addClass("panel-body"); + $("span.mlabel").addClass("label label-info"); + + $("table.memberdecls").addClass("table"); + $("[class^=memitem]").addClass("active"); + + $("div.ah").addClass("btn btn-default"); + $("span.mlabels").addClass("pull-right"); + $("table.mlabels").css("width", "100%") + $("td.mlabels-right").addClass("pull-right"); + + $("div.ttc").addClass("panel panel-info"); + $("div.ttname").addClass("panel-heading"); + $("div.ttdef,div.ttdoc,div.ttdeci").addClass("panel-body"); +// $("table").addClass("table table-stripped"); + /* responsive search box */ + + $('#MSearchBox').parent().remove(); + + var nav_container = $('<div class="row"></div>'); + $('#navrow1').parent().prepend(nav_container); + + var left_nav = $('<div class="col-md-9"></div>'); + for (i = 0; i < 6; i++) { + var navrow = $('#navrow' + i + ' > ul.tablist').detach(); + left_nav.append(navrow); + $('#navrow' + i).remove(); + } + var right_nav = $('<div class="col-md-3"></div>').append('\ + <div id="search-box" class="input-group">\ + <div class="input-group-btn">\ + <button aria-expanded="false" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">\ + <span class="glyphicon glyphicon-search"></span> <span class="caret"></span>\ + </button>\ + <ul class="dropdown-menu">\ + </ul>\ + </div>\ + <button id="search-close" type="button" class="close" aria-label="Close"><span aria-hidden="true">×</span></button>\ + <input id="search-field" class="form-control" accesskey="S" onkeydown="searchBox.OnSearchFieldChange(event);" placeholder="Search ..." type="text">\ + </div>'); + $(nav_container).append(left_nav); + $(nav_container).append(right_nav); + + $('#MSearchSelectWindow .SelectionMark').remove(); + var search_selectors = $('#MSearchSelectWindow .SelectItem'); + for (var i = 0; i < search_selectors.length; i += 1) { + var element_a = $('<a href="#"></a>').text($(search_selectors[i]).text()); + + element_a.click(function(){ + $('#search-box .dropdown-menu li').removeClass('active'); + $(this).parent().addClass('active'); + searchBox.OnSelectItem($('#search-box li a').index(this)); + searchBox.Search(); + return false; + }); + + var element = $('<li></li>').append(element_a); + $('#search-box .dropdown-menu').append(element); + } + $('#MSearchSelectWindow').remove(); + + $('#search-box .close').click(function (){ + searchBox.CloseResultsWindow(); + }); + + $('body').append('<div id="MSearchClose"></div>'); + $('body').append('<div id="MSearchBox"></div>'); + $('body').append('<div id="MSearchSelectWindow"></div>'); + + searchBox.searchLabel = ''; + searchBox.DOMSearchField = function() { + return document.getElementById("search-field"); + } + searchBox.DOMSearchClose = function(){ + return document.getElementById("search-close"); + } + + + /* search results */ + var results_iframe = $('#MSearchResults').detach(); + $('#MSearchResultsWindow') + .attr('id', 'search-results-window') + .addClass('panel panel-default') + .append( + '<div class="panel-heading">\ + <h3 class="panel-title">Search Results</h3>\ + </div>\ + <div class="panel-body"></div>' + ); + $('#search-results-window .panel-body').append(results_iframe); + + searchBox.DOMPopupSearchResultsWindow = function() { + return document.getElementById("search-results-window"); + } + + function update_search_results_window() { + $('#search-results-window').removeClass('panel-default panel-success panel-warning panel-danger') + var status = $('#MSearchResults').contents().find('.SRStatus:visible'); + if (status.length > 0) { + switch(status.attr('id')) { + case 'Loading': + case 'Searching': + $('#search-results-window').addClass('panel-warning'); + break; + case 'NoMatches': + $('#search-results-window').addClass('panel-danger'); + break; + default: + $('#search-results-window').addClass('panel-default'); + } + } else { + $('#search-results-window').addClass('panel-success'); + } + } + $('#MSearchResults').load(function() { + $('#MSearchResults').contents().find('link[href="search.css"]').attr('href','../doxygen.css'); + $('#MSearchResults').contents().find('head').append( + '<link href="../customdoxygen.css" rel="stylesheet" type="text/css">'); + + update_search_results_window(); + + // detect status changes (only for search with external search backend) + var observer = new MutationObserver(function(mutations) { + update_search_results_window(); + }); + var config = { attributes: true}; + + var targets = $('#MSearchResults').contents().find('.SRStatus'); + for (i = 0; i < targets.length; i++) { + observer.observe(targets[i], config); + } + }); + + + /* enumerations */ + $('table.fieldtable').removeClass('fieldtable').addClass('table table-striped table-bordered').each(function(){ + $(this).prepend('<thead></thead>'); + $(this).find('tbody > tr:first').prependTo($(this).find('thead')); + + $(this).find('td > span.success').parent().addClass('success'); + $(this).find('td > span.warning').parent().addClass('warning'); + $(this).find('td > span.danger').parent().addClass('danger'); + }); + + /* todo list */ + var todoelements = $('.contents > .textblock > dl.reflist > dt, .contents > .textblock > dl.reflist > dd'); + + for (var i = 0; i < todoelements.length; i += 2) { + $('.contents > .textblock').append( + '<div class="panel panel-default active">' + + "<div class=\"panel-heading todoname\">" + $(todoelements[i]).html() + "</div>" + + "<div class=\"panel-body\">" + $(todoelements[i+1]).html() + "</div>" + + '</div>'); + $(todoelements[i]).parent().remove(); + } + + /* This would remove "see also"! */ + // $('.contents > .textblock > dl').remove(); + + + $(".memitem").removeClass('memitem'); + $(".memproto").removeClass('memproto'); + $(".memdoc").removeClass('memdoc'); + $("span.mlabel").removeClass('mlabel'); + $("table.memberdecls").removeClass('memberdecls'); + $("[class^=memitem]").removeClass('memitem'); + $("span.mlabels").removeClass('mlabels'); + $("table.mlabels").removeClass('mlabels'); + $("td.mlabels-right").removeClass('mlabels-right'); + $(".navpath").removeClass('navpath'); + $("li.navelem").removeClass('navelem'); + $("a.el").removeClass('el'); + $("div.ah").removeClass('ah'); + $("div.header").removeClass("header"); + + $('.mdescLeft').each(function(){ + // $(this).siblings('.mdescRight') + $(this).parent() + .prev('tr') + .children('td') + .last() + .append( + '<div class="mbrief">' + + $(this).siblings('.mdescRight').html() + + '</div>' + ); +// $(this).parent().prev('tr').append($(this).siblings('.mdescRight')); + $(this).parent().remove(); + }); + + // $('.mdescLeft').each(function(){ + // if($(this).html()==" ") { + // $(this).siblings('.mdescRight').attr('colspan', 2); + // $(this).remove(); + // } + // }); + + // $('td.memItemLeft').each(function(){ + // if($(this).siblings('.memItemRight').html()=="") { + // $(this).attr('colspan', 2); + // $(this).siblings('.memItemRight').remove(); + // } + // }); +});
\ No newline at end of file diff --git a/docs/bootstrap/footer.html b/docs/bootstrap/footer.html new file mode 100755 index 0000000..495a7b0 --- /dev/null +++ b/docs/bootstrap/footer.html @@ -0,0 +1,26 @@ +<!-- HTML footer for doxygen 1.8.8--> +<!-- start footer part --> +<!--BEGIN GENERATE_TREEVIEW--> +<div id="nav-path" class="navpath"><!-- id is needed for treeview function! --> + <ul> + $navpath + <li class="footer">$generatedby + <a href="http://www.doxygen.org/index.html"> + <img class="footer" src="$relpath^doxygen.png" alt="doxygen"/></a> $doxygenversion </li> + </ul> +</div> +<!--END GENERATE_TREEVIEW--> +</div> +</div> +</div> +</div> +</div> +<!--BEGIN !GENERATE_TREEVIEW--> +<!-- <hr class="footer"/><address class="footer"><small> +$generatedby  <a href="http://www.doxygen.org/index.html"> +<img class="footer" src="$relpath^doxygen.png" alt="doxygen"/> +</a> $doxygenversion +</small></address> --> +<!--END !GENERATE_TREEVIEW--> +</body> +</html> diff --git a/docs/bootstrap/header.html b/docs/bootstrap/header.html new file mode 100755 index 0000000..c28245d --- /dev/null +++ b/docs/bootstrap/header.html @@ -0,0 +1,42 @@ +<!-- HTML header for doxygen 1.8.8--> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml"> + <head> + <meta http-equiv="X-UA-Compatible" content="IE=edge"> + <!-- For Mobile Devices --> + <meta name="viewport" content="width=device-width, initial-scale=1"> + + <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/> + <meta name="generator" content="Doxygen $doxygenversion"/> + + <script type="text/javascript" src="https://code.jquery.com/jquery-2.1.1.min.js"></script> + + <!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME--> + <!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME--> + <!--<link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>--> + <script type="text/javascript" src="$relpath^dynsections.js"></script> + $treeview + $search + $mathjax + <link href='https://fonts.googleapis.com/css?family=Roboto+Slab' rel='stylesheet' type='text/css'> + <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/css/bootstrap.min.css"> + <link href="$relpath^$stylesheet" rel="stylesheet" type="text/css" /> + $extrastylesheet + <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.1/js/bootstrap.min.js"></script> + <script type="text/javascript" src="$relpath^doxy-boot.js"></script> + </head> + <body> + <nav class="navbar navbar-default" role="navigation"> + <div class="container"> + <div class="navbar-header"> + <a class="navbar-brand">$projectname $projectnumber</a> + </div> + </div> + </nav> + <div id="top"><!-- do not remove this div, it is closed by doxygen! --> + <div class="content" id="content"> + <div class="container"> + <div class="row"> + <div class="col-sm-12 panel " style="padding-bottom: 15px;"> + <div style="margin-bottom: 15px;"> +<!-- end header part -->
\ No newline at end of file diff --git a/docs/doxygen.dox b/docs/doxygen.dox new file mode 100644 index 0000000..5b861fb --- /dev/null +++ b/docs/doxygen.dox @@ -0,0 +1,56 @@ +/** + * @defgroup extension Extension Points + * @brief Available extension points for the uSCXML intepreter. + * + * @{ + * @defgroup ioproc I/O Processors + * @brief Custom In-/Ouput processors. + +I/O processors will allow to send and receive events from and to a running +SCXML instance. + + * @defgroup invoker Invokers + * @brief Types of components for the invoke element to summon. + +Invokers will allow to specify types of external components to instantiate and +communicate with via events. + + * @defgroup datamodel Data-Models + * @brief Additional data-models for embedded scriptings. + +Data-models provide a syntax and semantic for an embedded scripting language. +Within the SCXML standard there are normative descriptions of ECMAScript and an +XPath description that was removed before recommendation status. + + * @defgroup element Executable Content + * @brief Custom XML elements for executable content. + +An extension point to register custom elements as executable content. + + * @} + + * @defgroup interpreter Interpreter + * @brief The components constituting the core of the interpreter. + * @{ + + * @defgroup microstep Microstep + * @brief Implementations of the micro-step(t) algorithm. + + * @defgroup execcontent Content Executor + * @brief Instances to process executable content as part of a micro-step. + + * @defgroup eventqueue Event Queue + * @brief Implementation of proper and delayed event queues. + + * @} + + * @defgroup callback Callbacks + * @brief Callback interfaces. + + * @defgroup facade Facades + * @brief User-facing facades for the implementations. + + * @defgroup abstract Interfaces + * @brief Base classes as interfaces for implementations. + + */ diff --git a/src/uscxml/Common.h b/src/uscxml/Common.h index 5b29427..017a177 100644 --- a/src/uscxml/Common.h +++ b/src/uscxml/Common.h @@ -54,9 +54,11 @@ typedef unsigned __int32 uint32_t; #include <sys/socket.h> #endif +/** + The usual operators as required for the PIMPL pattern. + */ #define PIMPL_OPERATORS(type) \ -\ -type() : _impl() { }\ +type() : _impl() { } \ type(const std::shared_ptr<type##Impl> impl) : _impl(impl) { }\ type(const type& other) : _impl(other._impl) { }\ virtual ~type() { };\ @@ -73,19 +75,18 @@ bool operator==(const type& other) const {\ bool operator!=(const type& other) const {\ return _impl != other._impl;\ }\ -type& operator= (const type& other) {\ +type& operator= (const type& other) {\ _impl = other._impl;\ return *this;\ } -#define PIMPL_OPERATORS2(type, base) \ -\ +#define PIMPL_OPERATORS_INHERIT(type, base) \ type() : _impl() {}\ -type(std::shared_ptr<type##Impl> const impl) : base(impl), _impl(impl) { }\ -type(const type& other) : base(other._impl), _impl(other._impl) { }\ +type(std::shared_ptr<type##Impl> const impl);\ +type(const type& other);\ virtual ~type() {};\ \ -operator bool() const {\ +operator bool() const {\ return !!_impl;\ }\ bool operator< (const type& other) const {\ @@ -97,14 +98,19 @@ bool operator==(const type& other) const {\ bool operator!=(const type& other) const {\ return _impl != other._impl;\ }\ -type& operator= (const type& other) {\ +type& operator= (const type& other); + + +#define PIMPL_OPERATORS_INHERIT_IMPL(type, base) \ +type::type(std::shared_ptr<type##Impl> const impl) : base(impl), _impl(impl) { }\ +type::type(const type& other) : base(other._impl), _impl(other._impl) { }\ +type& type::operator= (const type& other) {\ _impl = other._impl;\ base::_impl = _impl;\ return *this;\ } - #if defined(_WIN32) inline int setenv(const char *name, const char *value, int overwrite) { int errcode = 0; diff --git a/src/uscxml/Interpreter.cpp b/src/uscxml/Interpreter.cpp index d6f61a2..9f2bfbf 100644 --- a/src/uscxml/Interpreter.cpp +++ b/src/uscxml/Interpreter.cpp @@ -20,6 +20,7 @@ #include "uscxml/config.h" #include "uscxml/Common.h" #include "uscxml/Interpreter.h" +#include "uscxml/interpreter/InterpreterImpl.h" #include "uscxml/util/DOM.h" #include "uscxml/util/URL.h" @@ -49,7 +50,7 @@ INITIALIZE_EASYLOGGINGPP namespace uscxml { // msxml.h defines all the DOM types as well -//using namespace xercesc; +//using namespace XERCESC_NS; static URL normalizeURL(const std::string url) { URL absUrl(url); @@ -70,48 +71,48 @@ Interpreter Interpreter::fromXML(const std::string& xml, const std::string& base std::shared_ptr<InterpreterImpl> interpreterImpl(new InterpreterImpl()); Interpreter interpreter(interpreterImpl); - std::unique_ptr<xercesc::XercesDOMParser> parser(new xercesc::XercesDOMParser()); - std::unique_ptr<xercesc::ErrorHandler> errHandler(new xercesc::HandlerBase()); + std::unique_ptr<XERCESC_NS::XercesDOMParser> parser(new XERCESC_NS::XercesDOMParser()); + std::unique_ptr<XERCESC_NS::ErrorHandler> errHandler(new XERCESC_NS::HandlerBase()); try { - parser->setValidationScheme(xercesc::XercesDOMParser::Val_Always); + parser->setValidationScheme(XERCESC_NS::XercesDOMParser::Val_Always); parser->setDoNamespaces(true); - parser->useScanner(xercesc::XMLUni::fgWFXMLScanner); + parser->useScanner(XERCESC_NS::XMLUni::fgWFXMLScanner); parser->setErrorHandler(errHandler.get()); - xercesc::MemBufInputSource is((XMLByte*)xml.c_str(), xml.size(), X("fake")); + XERCESC_NS::MemBufInputSource is((XMLByte*)xml.c_str(), xml.size(), X("fake")); parser->parse(is); interpreterImpl->_document = parser->adoptDocument(); interpreterImpl->_baseURL = absUrl; InterpreterImpl::addInstance(interpreterImpl); - } catch (const xercesc::SAXParseException& toCatch) { + } catch (const XERCESC_NS::SAXParseException& toCatch) { ERROR_PLATFORM_THROW(X(toCatch.getMessage()).str()); - } catch (const xercesc::RuntimeException& toCatch) { + } catch (const XERCESC_NS::RuntimeException& toCatch) { ERROR_PLATFORM_THROW(X(toCatch.getMessage()).str()); - } catch (const xercesc::XMLException& toCatch) { + } catch (const XERCESC_NS::XMLException& toCatch) { ERROR_PLATFORM_THROW(X(toCatch.getMessage()).str()); - } catch (const xercesc::DOMException& toCatch) { + } catch (const XERCESC_NS::DOMException& toCatch) { ERROR_PLATFORM_THROW(X(toCatch.getMessage()).str()); } return interpreter; } -Interpreter Interpreter::fromElement(xercesc::DOMElement* scxml, const std::string& baseURL) { +Interpreter Interpreter::fromElement(XERCESC_NS::DOMElement* scxml, const std::string& baseURL) { URL absUrl = normalizeURL(baseURL); std::shared_ptr<InterpreterImpl> interpreterImpl(new InterpreterImpl()); Interpreter interpreter(interpreterImpl); - // *copy* the given xercesc::DOM to get rid of event listeners - xercesc::DOMImplementation* implementation = xercesc::DOMImplementationRegistry::getDOMImplementation(X("core")); + // *copy* the given XERCESC_NS::DOM to get rid of event listeners + XERCESC_NS::DOMImplementation* implementation = XERCESC_NS::DOMImplementationRegistry::getDOMImplementation(X("core")); interpreterImpl->_document = implementation->createDocument(); // we need to import the parent - to support xpath test150 - xercesc::DOMNode* newNode = interpreterImpl->_document->importNode(scxml, true); + XERCESC_NS::DOMNode* newNode = interpreterImpl->_document->importNode(scxml, true); // interpreterImpl->_document->adoptNode(newNode); interpreterImpl->_document->appendChild(newNode); @@ -123,19 +124,19 @@ Interpreter Interpreter::fromElement(xercesc::DOMElement* scxml, const std::stri return interpreter; } -Interpreter Interpreter::fromDocument(xercesc::DOMDocument* dom, const std::string& baseURL, bool copy) { +Interpreter Interpreter::fromDocument(XERCESC_NS::DOMDocument* dom, const std::string& baseURL, bool copy) { URL absUrl = normalizeURL(baseURL); std::shared_ptr<InterpreterImpl> interpreterImpl(new InterpreterImpl()); Interpreter interpreter(interpreterImpl); if (copy) { - // *copy* the given xercesc::DOM to get rid of event listeners - xercesc::DOMImplementation* implementation = xercesc::DOMImplementationRegistry::getDOMImplementation(X("core")); + // *copy* the given XERCESC_NS::DOM to get rid of event listeners + XERCESC_NS::DOMImplementation* implementation = XERCESC_NS::DOMImplementationRegistry::getDOMImplementation(X("core")); interpreterImpl->_document = implementation->createDocument(); // we need to import the parent - to support xpath test150 - xercesc::DOMNode* newNode = interpreterImpl->_document->importNode(dom->getDocumentElement(), true); + XERCESC_NS::DOMNode* newNode = interpreterImpl->_document->importNode(dom->getDocumentElement(), true); interpreterImpl->_document->appendChild(newNode); } else { @@ -154,14 +155,14 @@ Interpreter Interpreter::fromURL(const std::string& url) { std::shared_ptr<InterpreterImpl> interpreterImpl(new InterpreterImpl()); Interpreter interpreter(interpreterImpl); - std::unique_ptr<xercesc::XercesDOMParser> parser(new xercesc::XercesDOMParser()); - parser->setValidationScheme(xercesc::XercesDOMParser::Val_Always); + std::unique_ptr<XERCESC_NS::XercesDOMParser> parser(new XERCESC_NS::XercesDOMParser()); + parser->setValidationScheme(XERCESC_NS::XercesDOMParser::Val_Always); parser->setDoNamespaces(true); // we do not have a real schema anyway - parser->useScanner(xercesc::XMLUni::fgWFXMLScanner); + parser->useScanner(XERCESC_NS::XMLUni::fgWFXMLScanner); - std::unique_ptr<xercesc::ErrorHandler> errHandler(new xercesc::HandlerBase()); + std::unique_ptr<XERCESC_NS::ErrorHandler> errHandler(new XERCESC_NS::HandlerBase()); parser->setErrorHandler(errHandler.get()); @@ -173,13 +174,13 @@ Interpreter Interpreter::fromURL(const std::string& url) { InterpreterImpl::addInstance(interpreterImpl); } - catch (const xercesc::SAXParseException& toCatch) { + catch (const XERCESC_NS::SAXParseException& toCatch) { LOG(ERROR) << X(toCatch.getMessage()); - } catch (const xercesc::RuntimeException& toCatch) { + } catch (const XERCESC_NS::RuntimeException& toCatch) { LOG(ERROR) << X(toCatch.getMessage()); - } catch (const xercesc::XMLException& toCatch) { + } catch (const XERCESC_NS::XMLException& toCatch) { LOG(ERROR) << X(toCatch.getMessage()); - } catch (const xercesc::DOMException& toCatch) { + } catch (const XERCESC_NS::DOMException& toCatch) { LOG(ERROR) << X(toCatch.getMessage()); } @@ -187,9 +188,49 @@ Interpreter Interpreter::fromURL(const std::string& url) { } +void Interpreter::reset() { + return _impl->reset(); +} + +InterpreterState Interpreter::step(bool blocking) { + return _impl->step(blocking); +}; + +void Interpreter::cancel() { + return _impl->cancel(); +} + +bool Interpreter::isInState(const std::string& stateId) { + return _impl->isInState(stateId); +} + +InterpreterState Interpreter::getState() { + return _impl->getState(); +} + +std::list<XERCESC_NS::DOMElement*> Interpreter::getConfiguration() { + return _impl->getConfiguration(); +} + +void Interpreter::receive(const Event& event) { + _impl->enqueueExternal(event); +} + +void Interpreter::setActionLanguage(ActionLanguage actionLanguage) { + return _impl->setActionLanguage(actionLanguage); +} + +void Interpreter::setMonitor(InterpreterMonitor* monitor) { + return _impl->setMonitor(monitor); +} + +std::list<InterpreterIssue> Interpreter::validate() { + return InterpreterIssue::forInterpreter(_impl.get()); +} + std::recursive_mutex StateTransitionMonitor::_mutex; -static void printNodeSet(const std::list<xercesc::DOMElement*> nodes) { +static void printNodeSet(const std::list<XERCESC_NS::DOMElement*> nodes) { std::string seperator; for (auto nIter = nodes.begin(); nIter != nodes.end(); nIter++) { std::cerr << seperator << (HAS_ATTR(*nIter, "id") ? ATTR(*nIter, "id") : DOMUtils::xPathForNode(*nIter)); @@ -197,7 +238,7 @@ static void printNodeSet(const std::list<xercesc::DOMElement*> nodes) { } } -void StateTransitionMonitor::beforeTakingTransition(const xercesc::DOMElement* transition) { +void StateTransitionMonitor::beforeTakingTransition(const XERCESC_NS::DOMElement* transition) { std::lock_guard<std::recursive_mutex> lock(_mutex); std::cerr << "Transition: " << uscxml::DOMUtils::xPathForNode(transition) << std::endl; } @@ -205,7 +246,7 @@ void StateTransitionMonitor::beforeTakingTransition(const xercesc::DOMElement* t void StateTransitionMonitor::onStableConfiguration() { std::lock_guard<std::recursive_mutex> lock(_mutex); std::cerr << "Stable Config: { "; - printNodeSet(_interpreter.getConfiguration()); +// printNodeSet(_interpreter.getConfiguration()); std::cerr << " }" << std::endl; } @@ -224,17 +265,17 @@ void StateTransitionMonitor::beforeProcessingEvent(const uscxml::Event& event) } } -void StateTransitionMonitor::beforeExecutingContent(const xercesc::DOMElement* element) { +void StateTransitionMonitor::beforeExecutingContent(const XERCESC_NS::DOMElement* element) { std::lock_guard<std::recursive_mutex> lock(_mutex); std::cerr << "Executable Content: " << DOMUtils::xPathForNode(element) << std::endl; } -void StateTransitionMonitor::beforeExitingState(const xercesc::DOMElement* state) { +void StateTransitionMonitor::beforeExitingState(const XERCESC_NS::DOMElement* state) { std::lock_guard<std::recursive_mutex> lock(_mutex); std::cerr << "Exiting: " << (HAS_ATTR(state, "id") ? ATTR(state, "id") : DOMUtils::xPathForNode(state)) << std::endl; } -void StateTransitionMonitor::beforeEnteringState(const xercesc::DOMElement* state) { +void StateTransitionMonitor::beforeEnteringState(const XERCESC_NS::DOMElement* state) { std::lock_guard<std::recursive_mutex> lock(_mutex); std::cerr << "Entering: " << (HAS_ATTR(state, "id") ? ATTR(state, "id") : DOMUtils::xPathForNode(state)) << std::endl; @@ -243,7 +284,7 @@ void StateTransitionMonitor::beforeEnteringState(const xercesc::DOMElement* stat void StateTransitionMonitor::beforeMicroStep() { std::lock_guard<std::recursive_mutex> lock(_mutex); std::cerr << "Config: {"; - printNodeSet(_interpreter.getConfiguration()); +// printNodeSet(_interpreter.getConfiguration()); std::cerr << "}" << std::endl; } diff --git a/src/uscxml/Interpreter.h b/src/uscxml/Interpreter.h index fa5ab05..ae1268f 100644 --- a/src/uscxml/Interpreter.h +++ b/src/uscxml/Interpreter.h @@ -20,20 +20,28 @@ #ifndef INTERPRETER_H_6CD5A168 #define INTERPRETER_H_6CD5A168 + +#include "Common.h" + #include <map> -#include <mutex> #include <string> +#include <vector> -#include "Common.h" -#include "uscxml/interpreter/InterpreterImpl.h" -#include "uscxml/interpreter/InterpreterMonitor.h" // beware cyclic reference! -#include "uscxml/debug/InterpreterIssue.h" // beware cyclic reference! -#include <xercesc/dom/DOM.hpp> +#include "uscxml/interpreter/MicroStep.h" +#include "uscxml/plugins/DataModel.h" +#include "uscxml/interpreter/ContentExecutor.h" +#include "uscxml/interpreter/InterpreterState.h" namespace uscxml { -class InterpreterMonitor; // forward declare +class InterpreterMonitor; +class InterpreterImpl; +class InterpreterIssue; +/** + * @ingroup interpreter + * Options to pass into an interpreter. + */ class USCXML_API InterpreterOptions { public: InterpreterOptions() : @@ -75,60 +83,139 @@ public: }; +/** + * @ingroup interpreter + * Collection of instances for interpreter that constitute its action language. + */ +class USCXML_API ActionLanguage { +public: + MicroStep microStepper; ///< The microstepper instance to use + DataModel dataModel; ///< The datamodel to uses + ContentExecutor execContent; ///< To process executable content elements +}; + +/** + * @ingroup interpreter + * @ingroup facade + * Central class to interpret and process SCXML documents. + + Instances of this class are available from the static constructors. In order + to use an interpreter instance to actually *do* things, you will want to + provide an ActionLanguage and an InterpreterMonitor. + + We did avoid threading primitives within the core interpreter (there is + threading for nested interpeters in the USCXMLInvoker, though). As such, you + will have to call the <step> function continuously. + + */ + class USCXML_API Interpreter { public: - static Interpreter fromDocument(xercesc::DOMDocument* dom, + + /** + * Instantiate an Interpeter with a given XML document. + * @param dom A pointer to the XML document. + * @param baseURL An absolute URL to resolve relative URLs in the document. + * @param copy Whether to make a copy of the document, we deallocate it either way. + */ + static Interpreter fromDocument(XERCESC_NS::DOMDocument* dom, const std::string& baseURL, bool copy = true); - static Interpreter fromElement(xercesc::DOMElement* element, + /** + * Instantiate an Interpeter with a given XML element. + * This constructor will create a new document and copy/import the given element. + * @param element The element to be copies/imported as the new document element. + * @param baseURL An absolute URL to resolve relative URLs in the document. + */ + static Interpreter fromElement(XERCESC_NS::DOMElement* element, const std::string& baseURL); + /** + * Instantiate an Interpeter from a string containined proper XML markup. + * @param xml Textual representation of an SCXML document. + * @param baseURL An absolute URL to resolve relative URLs in the document. + */ static Interpreter fromXML(const std::string& xml, const std::string& baseURL); - static Interpreter fromURL(const std::string& URL); + /** + * Instantiate an Interpeter with a document located at an URL. + * @param url An absolute URL to locate the SCXML document. + */ + static Interpreter fromURL(const std::string& url); + + /** + * Instantiate an Interpeter as a copy of another. + * @param other The other interpreter. + */ static Interpreter fromClone(const Interpreter& other); + /** + * See PIMPL_OPERATORS macro in Common.h + */ PIMPL_OPERATORS(Interpreter); - void reset() { - return _impl->reset(); - } - - InterpreterState step(bool blocking = false) { - return _impl->step(blocking); - }; - - void cancel() { - return _impl->cancel(); - } - - virtual bool isInState(const std::string& stateId) { - return _impl->isInState(stateId); - } - - InterpreterState getState() { - return _impl->getState(); - } - - std::list<xercesc::DOMElement*> getConfiguration() { - return _impl->getConfiguration(); - } - - virtual void receive(const Event& event) { - _impl->enqueueExternal(event); - } - - void setActionLanguage(ActionLanguage actionLanguage) { - return _impl->setActionLanguage(actionLanguage); - } - - void setMonitor(InterpreterMonitor* monitor) { - return _impl->setMonitor(monitor); - } - - std::list<InterpreterIssue> validate() { - return InterpreterIssue::forInterpreter(_impl.get()); - } - + /** + * Perform a single microstep and return. + * @param blocking Whether or not to block the thread when waiting for events + * @return The new state of the interpreter object. + * + * @todo Have Interpreter::step() take a duration to block + */ + InterpreterState step(bool blocking = false); + + /** + * Unblock and mark for finalize. + */ + void cancel(); + + /** + * Finalize and reset interpeter. + */ + void reset(); + + /** + * Get all state elements that constitute the active configuration. + * @return A list of XML elements of the active states. + */ + std::list<XERCESC_NS::DOMElement*> getConfiguration(); + + /** + * Determine whether the state with the given `id` is in the active configuration. + * @param id An identifier for a state from the SCXML document. + * @return Whether the interpreter is in state `id`. + */ + bool isInState(const std::string& stateId); + + /** + * The current state of the interpreter, not to be confused with its configuration. + * @return The current state of the interpreter object. + */ + InterpreterState getState(); + + /** + * Return a list of possible syntactic and semantic issues with the interpreter's state-chart. + * @return A list of InterpreterIssue%s + */ + std::list<InterpreterIssue> validate(); + + /** + * Enqueue an event to the interpreter's external queue. + * @event An event to be enqueued + */ + void receive(const Event& event); + + /** + * Adapt the constituting components for a SCXML interpreter. + */ + void setActionLanguage(ActionLanguage actionLanguage); + + /** + * Attach a monitor to make more details of the interpreter observable. + */ + void setMonitor(InterpreterMonitor* monitor); + + /** + * Return the actual implementation of the Interperter. + */ std::shared_ptr<InterpreterImpl> getImpl() const { return _impl; } @@ -138,24 +225,6 @@ protected: }; -class USCXML_API StateTransitionMonitor : public uscxml::InterpreterMonitor { -public: - StateTransitionMonitor(Interpreter interpreter) : _interpreter(interpreter) {} - virtual ~StateTransitionMonitor() {} - - virtual void beforeTakingTransition(const xercesc::DOMElement* transition); - virtual void beforeExecutingContent(const xercesc::DOMElement* element); - virtual void onStableConfiguration(); - virtual void beforeProcessingEvent(const uscxml::Event& event); - virtual void beforeExitingState(const xercesc::DOMElement* state); - virtual void beforeEnteringState(const xercesc::DOMElement* state); - virtual void beforeMicroStep(); - -protected: - Interpreter _interpreter; - static std::recursive_mutex _mutex; -}; - } #endif /* end of include guard: INTERPRETER_H_6CD5A168 */ diff --git a/src/uscxml/debug/InterpreterIssue.cpp b/src/uscxml/debug/InterpreterIssue.cpp index ce61af6..86947c1 100644 --- a/src/uscxml/debug/InterpreterIssue.cpp +++ b/src/uscxml/debug/InterpreterIssue.cpp @@ -23,15 +23,14 @@ #include "uscxml/util/DOM.h" #include "uscxml/util/String.h" #include "uscxml/util/Predicates.h" -//#include "uscxml/debug/Complexity.h" -#include "uscxml/Interpreter.h" +#include "uscxml/interpreter/InterpreterImpl.h" #include "uscxml/plugins/Factory.h" #include <xercesc/dom/DOMDocument.hpp> -namespace uscxml { +using namespace XERCESC_NS; -using namespace xercesc; +namespace uscxml { InterpreterIssue::InterpreterIssue(const std::string& msg, DOMNode* node, IssueSeverity severity, const std::string& specRef) : message(msg), node(node), severity(severity), specRef(specRef) { if (node) @@ -181,7 +180,7 @@ std::list<InterpreterIssue> InterpreterIssue::forInterpreter(InterpreterImpl* in std::list<DOMElement*> scxmls = nodeSets["scxml"]; scxmls.push_back(_scxml); - std::list<xercesc::DOMElement*> reachable = getReachableStates(_scxml); + std::list<XERCESC_NS::DOMElement*> reachable = getReachableStates(_scxml); std::list<DOMElement*>& states = nodeSets["state"]; std::list<DOMElement*>& parallels = nodeSets["parallel"]; diff --git a/src/uscxml/debug/InterpreterIssue.h b/src/uscxml/debug/InterpreterIssue.h index f72a7a4..c807acc 100644 --- a/src/uscxml/debug/InterpreterIssue.h +++ b/src/uscxml/debug/InterpreterIssue.h @@ -2,6 +2,7 @@ * @file * @author 2012-2014 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) * @copyright Simplified BSD + * @brief Identifies some common problems with SCXML documents * * @cond * This program is free software: you can redistribute it and/or modify @@ -20,32 +21,46 @@ #ifndef INTERPRETERISSUE_H_962CB305 #define INTERPRETERISSUE_H_962CB305 +#include "uscxml/config.h" #include "uscxml/Common.h" + #include <list> #include <iostream> -#include <xercesc/dom/DOMNode.hpp> + +// forward declare +namespace XERCESC_NS { + class DOMNode; +} namespace uscxml { class InterpreterImpl; +/** + * Identify and report syntactic and semantic problems with a SCXML state-charts. + * @see uscxml::Interpreter::validate() + */ class USCXML_API InterpreterIssue { public: enum IssueSeverity { - USCXML_ISSUE_FATAL, - USCXML_ISSUE_WARNING, - USCXML_ISSUE_INFO + USCXML_ISSUE_FATAL, ///< Interpreter can not process such a document + USCXML_ISSUE_WARNING, ///< Document is questionable, but formally ok + USCXML_ISSUE_INFO ///< Indicates a possible problem, but maybe perfectly ok }; - InterpreterIssue(const std::string& msg, xercesc::DOMNode* node, IssueSeverity severity, const std::string& specRef = ""); + std::string xPath; ///< Where did the issue arise + std::string message; ///< What is the issue + XERCESC_NS::DOMNode* node; ///< The DOM node pertaining to the issue + IssueSeverity severity; ///< Severity of the issue + std::string specRef; ///< If applicable, the violated section from the standard - std::string xPath; - std::string message; - xercesc::DOMNode* node; - IssueSeverity severity; - std::string specRef; + /** + * Constructor is solely used to report issues at runtime. + */ + InterpreterIssue(const std::string& msg, XERCESC_NS::DOMNode* node, IssueSeverity severity, const std::string& specRef = ""); private: + static std::list<InterpreterIssue> forInterpreter(InterpreterImpl* interpreter); friend class Interpreter; }; diff --git a/src/uscxml/interpreter/ContentExecutorImpl.cpp b/src/uscxml/interpreter/BasicContentExecutor.cpp index 6a06bec..2010ae2 100644 --- a/src/uscxml/interpreter/ContentExecutorImpl.cpp +++ b/src/uscxml/interpreter/BasicContentExecutor.cpp @@ -17,13 +17,13 @@ * @endcond */ -#include "ContentExecutorImpl.h" +#include "BasicContentExecutor.h" #include "uscxml/util/String.h" #include "uscxml/util/Predicates.h" #include "uscxml/util/UUID.h" #include "uscxml/util/URL.h" -#include "uscxml/messages/Data.h" +#include <xercesc/dom/DOM.hpp> #include <xercesc/parsers/XercesDOMParser.hpp> #include <xercesc/sax/HandlerBase.hpp> #include <xercesc/framework/MemBufInputSource.hpp> @@ -32,14 +32,14 @@ namespace uscxml { -using namespace xercesc; +using namespace XERCESC_NS; -void BasicContentExecutorImpl::processRaise(xercesc::DOMElement* content) { +void BasicContentExecutor::processRaise(XERCESC_NS::DOMElement* content) { Event raised(ATTR(content, "event")); _callbacks->enqueueInternal(raised); } -void BasicContentExecutorImpl::processSend(xercesc::DOMElement* element) { +void BasicContentExecutor::processSend(XERCESC_NS::DOMElement* element) { Event sendEvent; std::string target; std::string type = "http://www.w3.org/TR/scxml/#SCXMLEventProcessor"; // default @@ -193,7 +193,7 @@ void BasicContentExecutorImpl::processSend(xercesc::DOMElement* element) { } -void BasicContentExecutorImpl::processCancel(xercesc::DOMElement* content) { +void BasicContentExecutor::processCancel(XERCESC_NS::DOMElement* content) { std::string sendid; if (HAS_ATTR(content, "sendid")) { sendid = ATTR(content, "sendid"); @@ -206,7 +206,7 @@ void BasicContentExecutorImpl::processCancel(xercesc::DOMElement* content) { _callbacks->cancelDelayed(sendid); } -void BasicContentExecutorImpl::processIf(xercesc::DOMElement* content) { +void BasicContentExecutor::processIf(XERCESC_NS::DOMElement* content) { bool blockIsTrue = _callbacks->isTrue(ATTR(content, "cond")); DOMNodeList* children = content->getChildNodes(); @@ -241,12 +241,12 @@ void BasicContentExecutorImpl::processIf(xercesc::DOMElement* content) { } } -void BasicContentExecutorImpl::processAssign(xercesc::DOMElement* content) { +void BasicContentExecutor::processAssign(XERCESC_NS::DOMElement* content) { std::string location = ATTR(content, "location"); _callbacks->assign(location, elementAsData(content)); } -void BasicContentExecutorImpl::processForeach(xercesc::DOMElement* content) { +void BasicContentExecutor::processForeach(XERCESC_NS::DOMElement* content) { std::string array = ATTR(content, "array"); std::string item = ATTR(content, "item"); std::string index = (HAS_ATTR(content, "index") ? ATTR(content, "index") : ""); @@ -266,7 +266,7 @@ void BasicContentExecutorImpl::processForeach(xercesc::DOMElement* content) { } } -void BasicContentExecutorImpl::processLog(xercesc::DOMElement* content) { +void BasicContentExecutor::processLog(XERCESC_NS::DOMElement* content) { std::string label = ATTR(content, "label"); std::string expr = ATTR(content, "expr"); @@ -277,14 +277,14 @@ void BasicContentExecutorImpl::processLog(xercesc::DOMElement* content) { std::cout << d << std::endl; } -void BasicContentExecutorImpl::processScript(xercesc::DOMElement* content) { +void BasicContentExecutor::processScript(XERCESC_NS::DOMElement* content) { // download as necessary std::string scriptContent(X(content->getTextContent())); _callbacks->evalAsData(scriptContent); } -void BasicContentExecutorImpl::process(xercesc::DOMElement* block, const X& xmlPrefix) { +void BasicContentExecutor::process(XERCESC_NS::DOMElement* block, const X& xmlPrefix) { std::string tagName = TAGNAME(block); @@ -379,7 +379,7 @@ void BasicContentExecutorImpl::process(xercesc::DOMElement* block, const X& xmlP } -void BasicContentExecutorImpl::invoke(xercesc::DOMElement* element) { +void BasicContentExecutor::invoke(XERCESC_NS::DOMElement* element) { std::string type; std::string source; bool autoForward = false; @@ -475,7 +475,7 @@ void BasicContentExecutorImpl::invoke(xercesc::DOMElement* element) { USCXML_MONITOR_CALLBACK2(_callbacks->getMonitor(), afterUninvoking, element, invokeEvent.invokeid); } -void BasicContentExecutorImpl::uninvoke(xercesc::DOMElement* invoke) { +void BasicContentExecutor::uninvoke(XERCESC_NS::DOMElement* invoke) { // TODO: DANGER This is the real danger here char* invokeId = (char*)invoke->getUserData(X("invokeid")); assert(invokeId != NULL); @@ -487,7 +487,7 @@ void BasicContentExecutorImpl::uninvoke(xercesc::DOMElement* invoke) { free(invokeId); } -void BasicContentExecutorImpl::raiseDoneEvent(xercesc::DOMElement* state, xercesc::DOMElement* doneData) { +void BasicContentExecutor::raiseDoneEvent(XERCESC_NS::DOMElement* state, XERCESC_NS::DOMElement* doneData) { Event doneEvent; doneEvent.name = "done.state."; @@ -535,7 +535,7 @@ void BasicContentExecutorImpl::raiseDoneEvent(xercesc::DOMElement* state, xerces } -void BasicContentExecutorImpl::processNameLists(std::map<std::string, Data>& nameMap, DOMElement* element) { +void BasicContentExecutor::processNameLists(std::map<std::string, Data>& nameMap, DOMElement* element) { if (HAS_ATTR(element, "namelist")) { std::list<std::string> names = tokenize(ATTR(element, "namelist")); for (std::list<std::string>::const_iterator nameIter = names.begin(); nameIter != names.end(); nameIter++) { @@ -544,7 +544,7 @@ void BasicContentExecutorImpl::processNameLists(std::map<std::string, Data>& nam } } -void BasicContentExecutorImpl::processParams(std::multimap<std::string, Data>& paramMap, DOMElement* element) { +void BasicContentExecutor::processParams(std::multimap<std::string, Data>& paramMap, DOMElement* element) { std::list<DOMElement*> params = DOMUtils::filterChildElements(XML_PREFIX(element).str() + "param", element); for (auto paramIter = params.begin(); paramIter != params.end(); paramIter++) { std::string name = ATTR(*paramIter, "name"); @@ -560,7 +560,7 @@ void BasicContentExecutorImpl::processParams(std::multimap<std::string, Data>& p } } -Data BasicContentExecutorImpl::elementAsData(xercesc::DOMElement* element) { +Data BasicContentExecutor::elementAsData(XERCESC_NS::DOMElement* element) { if (HAS_ATTR(element, "expr")) { // return _callbacks->evalAsData(ATTR(element, "expr")); if (LOCALNAME(element) == "content") { @@ -586,22 +586,22 @@ Data BasicContentExecutorImpl::elementAsData(xercesc::DOMElement* element) { // make an attempt to parse as XML try { - xercesc::XercesDOMParser* parser = new xercesc::XercesDOMParser(); - parser->setValidationScheme(xercesc::XercesDOMParser::Val_Always); + XERCESC_NS::XercesDOMParser* parser = new XERCESC_NS::XercesDOMParser(); + parser->setValidationScheme(XERCESC_NS::XercesDOMParser::Val_Always); parser->setDoNamespaces(true); - parser->useScanner(xercesc::XMLUni::fgWFXMLScanner); + parser->useScanner(XERCESC_NS::XMLUni::fgWFXMLScanner); - xercesc::ErrorHandler* errHandler = new xercesc::HandlerBase(); + XERCESC_NS::ErrorHandler* errHandler = new XERCESC_NS::HandlerBase(); parser->setErrorHandler(errHandler); std::string tmp = url; - xercesc::MemBufInputSource is((XMLByte*)content.c_str(), content.size(), X("fake")); + XERCESC_NS::MemBufInputSource is((XMLByte*)content.c_str(), content.size(), X("fake")); parser->parse(is); Data d; - xercesc::DOMDocument* doc = parser->adoptDocument(); - d.adoptedDoc = std::make_shared<xercesc::DOMDocument*>(doc); + XERCESC_NS::DOMDocument* doc = parser->adoptDocument(); + d.adoptedDoc = std::make_shared<XERCESC_NS::DOMDocument*>(doc); d.node = doc->getDocumentElement(); return d; diff --git a/src/uscxml/interpreter/BasicContentExecutor.h b/src/uscxml/interpreter/BasicContentExecutor.h new file mode 100644 index 0000000..c3549f6 --- /dev/null +++ b/src/uscxml/interpreter/BasicContentExecutor.h @@ -0,0 +1,63 @@ +/** + * @file + * @author 2016 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + +#ifndef BASICCONTENTEXECUTOR_H_B873199D +#define BASICCONTENTEXECUTOR_H_B873199D + +#include "ContentExecutorImpl.h" + +namespace uscxml { + +using namespace XERCESC_NS; + +/** + * @ingroup execcontent + * @ingroup impl + */ +class USCXML_API BasicContentExecutor : public ContentExecutorImpl { +public: + BasicContentExecutor(ContentExecutorCallbacks* callbacks) : ContentExecutorImpl(callbacks) {} + virtual ~BasicContentExecutor() {} + + void processRaise(XERCESC_NS::DOMElement* content); + void processSend(XERCESC_NS::DOMElement* element); + void processCancel(XERCESC_NS::DOMElement* content); + void processIf(XERCESC_NS::DOMElement* content); + void processAssign(XERCESC_NS::DOMElement* content); + void processForeach(XERCESC_NS::DOMElement* content); + void processLog(XERCESC_NS::DOMElement* content); + void processScript(XERCESC_NS::DOMElement* content); + + virtual void process(XERCESC_NS::DOMElement* block, const X& xmlPrefix); + + virtual void invoke(XERCESC_NS::DOMElement* invoke); + virtual void uninvoke(XERCESC_NS::DOMElement* invoke); + virtual void raiseDoneEvent(XERCESC_NS::DOMElement* state, XERCESC_NS::DOMElement* doneData); + + virtual Data elementAsData(XERCESC_NS::DOMElement* element); + +protected: + void processNameLists(std::map<std::string, Data>& nameMap, XERCESC_NS::DOMElement* element); + void processParams(std::multimap<std::string, Data>& paramMap, XERCESC_NS::DOMElement* element); + +}; + +} + +#endif /* end of include guard: BASICCONTENTEXECUTOR_H_B873199D */ diff --git a/src/uscxml/interpreter/EventQueueImpl.cpp b/src/uscxml/interpreter/BasicEventQueue.cpp index 345da69..5d3fa2d 100644 --- a/src/uscxml/interpreter/EventQueueImpl.cpp +++ b/src/uscxml/interpreter/BasicEventQueue.cpp @@ -17,7 +17,7 @@ * @endcond */ -#include "EventQueueImpl.h" +#include "BasicEventQueue.h" #include <event2/util.h> // for evutil_socket_t #include <event2/thread.h> #include <assert.h> @@ -26,12 +26,12 @@ namespace uscxml { -EventQueueImpl::EventQueueImpl() { +BasicEventQueue::BasicEventQueue() { } -EventQueueImpl::~EventQueueImpl() { +BasicEventQueue::~BasicEventQueue() { } -Event EventQueueImpl::dequeue(bool blocking) { +Event BasicEventQueue::dequeue(bool blocking) { std::lock_guard<std::recursive_mutex> lock(_mutex); if (blocking) { while (_queue.empty()) { @@ -48,7 +48,7 @@ Event EventQueueImpl::dequeue(bool blocking) { } -void EventQueueImpl::enqueue(const Event& event) { +void BasicEventQueue::enqueue(const Event& event) { std::lock_guard<std::recursive_mutex> lock(_mutex); _queue.push_back(event); _cond.notify_all(); @@ -62,7 +62,7 @@ static void dummyCallback(evutil_socket_t fd, short what, void *arg) { evtimer_add(ev, &tv); } -DelayedEventQueueImpl::DelayedEventQueueImpl(DelayedEventQueueCallbacks* callbacks) { +BasicDelayedEventQueue::BasicDelayedEventQueue(DelayedEventQueueCallbacks* callbacks) { _callbacks = callbacks; #ifndef _WIN32 evthread_use_pthreads(); @@ -84,14 +84,14 @@ DelayedEventQueueImpl::DelayedEventQueueImpl(DelayedEventQueueCallbacks* callbac start(); } -DelayedEventQueueImpl::~DelayedEventQueueImpl() { +BasicDelayedEventQueue::~BasicDelayedEventQueue() { stop(); evtimer_del(_dummyEvent); event_free(_dummyEvent); event_base_free(_eventLoop); } -void DelayedEventQueueImpl::timerCallback(evutil_socket_t fd, short what, void *arg) { +void BasicDelayedEventQueue::timerCallback(evutil_socket_t fd, short what, void *arg) { struct callbackData *data = (struct callbackData*)arg; std::lock_guard<std::recursive_mutex> lock(data->eventQueue->_mutex); @@ -103,7 +103,7 @@ void DelayedEventQueueImpl::timerCallback(evutil_socket_t fd, short what, void * data->eventQueue->_callbackData.erase(data->eventUUID); } -void DelayedEventQueueImpl::enqueueDelayed(const Event& event, size_t delayMs, const std::string& eventUUID) { +void BasicDelayedEventQueue::enqueueDelayed(const Event& event, size_t delayMs, const std::string& eventUUID) { std::lock_guard<std::recursive_mutex> lock(_mutex); if(_callbackData.find(eventUUID) != _callbackData.end()) { cancelDelayed(eventUUID); @@ -121,7 +121,7 @@ void DelayedEventQueueImpl::enqueueDelayed(const Event& event, size_t delayMs, c event_add(e, &delay); } -void DelayedEventQueueImpl::cancelAllDelayed() { +void BasicDelayedEventQueue::cancelAllDelayed() { std::lock_guard<std::recursive_mutex> lock(_mutex); while(_callbackData.size() > 0) { @@ -134,7 +134,7 @@ void DelayedEventQueueImpl::cancelAllDelayed() { } -void DelayedEventQueueImpl::cancelDelayed(const std::string& eventId) { +void BasicDelayedEventQueue::cancelDelayed(const std::string& eventId) { std::lock_guard<std::recursive_mutex> lock(_mutex); if(_callbackData.find(eventId) != _callbackData.end()) { @@ -144,8 +144,8 @@ void DelayedEventQueueImpl::cancelDelayed(const std::string& eventId) { } } -void DelayedEventQueueImpl::run(void* instance) { - DelayedEventQueueImpl* INSTANCE = (DelayedEventQueueImpl*)instance; +void BasicDelayedEventQueue::run(void* instance) { + BasicDelayedEventQueue* INSTANCE = (BasicDelayedEventQueue*)instance; int result; while(INSTANCE->_isStarted) { /** @@ -165,15 +165,15 @@ void DelayedEventQueueImpl::run(void* instance) { } } -void DelayedEventQueueImpl::start() { +void BasicDelayedEventQueue::start() { if (_isStarted) { return; } _isStarted = true; - _thread = new std::thread(DelayedEventQueueImpl::run, this); + _thread = new std::thread(BasicDelayedEventQueue::run, this); } -void DelayedEventQueueImpl::stop() { +void BasicDelayedEventQueue::stop() { if (_isStarted) { _isStarted = false; event_base_loopbreak(_eventLoop); diff --git a/src/uscxml/interpreter/BasicEventQueue.h b/src/uscxml/interpreter/BasicEventQueue.h new file mode 100644 index 0000000..cfb2b5d --- /dev/null +++ b/src/uscxml/interpreter/BasicEventQueue.h @@ -0,0 +1,98 @@ +/** + * @file + * @author 2016 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + +#ifndef BASICEVENTQUEUE_H_39DCC18B +#define BASICEVENTQUEUE_H_39DCC18B + + +#include "EventQueueImpl.h" +#include <string> +#include <map> +#include <list> +#include <thread> +#include <mutex> +#include <condition_variable> + +#include <event2/event.h> + + +namespace uscxml { + +/** + * @ingroup eventqueue + * @ingroup impl + */ +class USCXML_API BasicEventQueue : public EventQueueImpl { +public: + BasicEventQueue(); + virtual ~BasicEventQueue(); + virtual Event dequeue(bool blocking); + virtual void enqueue(const Event& event); + +protected: + std::list<Event> _queue; + std::recursive_mutex _mutex; + std::condition_variable_any _cond; +}; + +/** + * @ingroup eventqueue + * @ingroup impl + */ +class USCXML_API BasicDelayedEventQueue : public BasicEventQueue, public DelayedEventQueueImpl { +public: + BasicDelayedEventQueue(DelayedEventQueueCallbacks* callbacks); + virtual ~BasicDelayedEventQueue(); + virtual void enqueueDelayed(const Event& event, size_t delayMs, const std::string& eventUUID); + virtual void cancelDelayed(const std::string& eventId); + virtual void cancelAllDelayed(); + virtual Event dequeue(bool blocking) { + return BasicEventQueue::dequeue(blocking); + } + virtual void enqueue(const Event& event) { + return BasicEventQueue::enqueue(event); + } + +protected: + struct callbackData { + Event userData; + std::string eventUUID; + bool persist; + struct event *event; + BasicDelayedEventQueue* eventQueue; + }; + + bool _isStarted; + std::thread* _thread; + + std::map<std::string, callbackData> _callbackData; + struct event_base* _eventLoop; + struct event* _dummyEvent; + + static void run(void* instance); + void start(); + void stop(); + + static void timerCallback(evutil_socket_t fd, short what, void *arg); + DelayedEventQueueCallbacks* _callbacks; +}; + +} + +#endif /* end of include guard: BASICEVENTQUEUE_H_39DCC18B */ diff --git a/src/uscxml/interpreter/ContentExecutor.cpp b/src/uscxml/interpreter/ContentExecutor.cpp new file mode 100644 index 0000000..e26d66a --- /dev/null +++ b/src/uscxml/interpreter/ContentExecutor.cpp @@ -0,0 +1,46 @@ +/** + * @file + * @author 2016 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + + +#include "ContentExecutor.h" +#include "ContentExecutorImpl.h" + +namespace uscxml { + +void ContentExecutor::process(XERCESC_NS::DOMElement* block, const X& xmlPrefix) { + _impl->process(block, xmlPrefix); +} + +void ContentExecutor::invoke(XERCESC_NS::DOMElement* invoke) { + _impl->invoke(invoke); +} + +void ContentExecutor::uninvoke(XERCESC_NS::DOMElement* invoke) { + _impl->uninvoke(invoke); +} + +Data ContentExecutor::elementAsData(XERCESC_NS::DOMElement* element) { + return _impl->elementAsData(element); +} + +void ContentExecutor::raiseDoneEvent(XERCESC_NS::DOMElement* state, XERCESC_NS::DOMElement* doneData) { + return _impl->raiseDoneEvent(state, doneData); +} + +} diff --git a/src/uscxml/interpreter/ContentExecutor.h b/src/uscxml/interpreter/ContentExecutor.h new file mode 100644 index 0000000..64f5a95 --- /dev/null +++ b/src/uscxml/interpreter/ContentExecutor.h @@ -0,0 +1,59 @@ +/** + * @file + * @author 2016 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + +#ifndef CONTENTEXECUTOR_H_A2D592FA +#define CONTENTEXECUTOR_H_A2D592FA + + +#include "uscxml/config.h" +#include "uscxml/Common.h" +#include "uscxml/messages/Data.h" +#include <string> + +// forward declare +namespace XERCESC_NS { + class DOMElement; +} + +namespace uscxml { + +class ContentExecutorImpl; +class X; + +/** + * @ingroup execcontent + * @ingroup facade + */ +class USCXML_API ContentExecutor { +public: + PIMPL_OPERATORS(ContentExecutor); + + virtual void process(XERCESC_NS::DOMElement* block, const X& xmlPrefix); + virtual void invoke(XERCESC_NS::DOMElement* invoke); + virtual void uninvoke(XERCESC_NS::DOMElement* invoke); + virtual Data elementAsData(XERCESC_NS::DOMElement* element); + virtual void raiseDoneEvent(XERCESC_NS::DOMElement* state, XERCESC_NS::DOMElement* doneData); + +protected: + std::shared_ptr<ContentExecutorImpl> _impl; +}; + +} + +#endif /* end of include guard: CONTENTEXECUTOR_H_A2D592FA */ diff --git a/src/uscxml/interpreter/ContentExecutorImpl.h b/src/uscxml/interpreter/ContentExecutorImpl.h index c0d28a2..e1a7e8c 100644 --- a/src/uscxml/interpreter/ContentExecutorImpl.h +++ b/src/uscxml/interpreter/ContentExecutorImpl.h @@ -17,20 +17,24 @@ * @endcond */ +#ifndef CONTENTEXECUTORIMPL_H_3ABA8969 +#define CONTENTEXECUTORIMPL_H_3ABA8969 -#ifndef CONTENTEXECUTORIMPL_H_13F2884F -#define CONTENTEXECUTORIMPL_H_13F2884F #include "uscxml/Common.h" #include "uscxml/util/DOM.h" -#include "uscxml/messages/Data.h" #include "uscxml/messages/Event.h" #include "uscxml/interpreter/InterpreterMonitor.h" + #include <xercesc/dom/DOM.hpp> #include <string> namespace uscxml { +/** + * @ingroup execcontent + * @ingroup callback + */ class USCXML_API ContentExecutorCallbacks { public: virtual void enqueueInternal(const Event& event) = 0; @@ -55,7 +59,7 @@ public: virtual std::string getBaseURL() = 0; virtual bool checkValidSendType(const std::string& type, const std::string& target) = 0; virtual void enqueue(const std::string& type, const std::string& target, size_t delayMs, const Event& sendEvent) = 0; - virtual void invoke(const std::string& type, const std::string& src, bool autoForward, xercesc::DOMElement* finalize, const Event& invokeEvent) = 0; + virtual void invoke(const std::string& type, const std::string& src, bool autoForward, XERCESC_NS::DOMElement* finalize, const Event& invokeEvent) = 0; virtual void uninvoke(const std::string& invokeId) = 0; virtual const Event& getCurrentEvent() = 0; @@ -65,79 +69,27 @@ public: }; +/** + * @ingroup execcontent + * @ingroup impl + */ class USCXML_API ContentExecutorImpl { public: ContentExecutorImpl(ContentExecutorCallbacks* callbacks) : _callbacks(callbacks) {} - virtual void process(xercesc::DOMElement* block, const X& xmlPrefix) = 0; + virtual void process(XERCESC_NS::DOMElement* block, const X& xmlPrefix) = 0; - virtual void invoke(xercesc::DOMElement* invoke) = 0; - virtual void uninvoke(xercesc::DOMElement* invoke) = 0; + virtual void invoke(XERCESC_NS::DOMElement* invoke) = 0; + virtual void uninvoke(XERCESC_NS::DOMElement* invoke) = 0; - virtual void raiseDoneEvent(xercesc::DOMElement* state, xercesc::DOMElement* doneData) = 0; - virtual Data elementAsData(xercesc::DOMElement* element) = 0; + virtual void raiseDoneEvent(XERCESC_NS::DOMElement* state, XERCESC_NS::DOMElement* doneData) = 0; + virtual Data elementAsData(XERCESC_NS::DOMElement* element) = 0; protected: ContentExecutorCallbacks* _callbacks; }; -class USCXML_API BasicContentExecutorImpl : public ContentExecutorImpl { -public: - BasicContentExecutorImpl(ContentExecutorCallbacks* callbacks) : ContentExecutorImpl(callbacks) {} - virtual ~BasicContentExecutorImpl() {} - - void processRaise(xercesc::DOMElement* content); - void processSend(xercesc::DOMElement* element); - void processCancel(xercesc::DOMElement* content); - void processIf(xercesc::DOMElement* content); - void processAssign(xercesc::DOMElement* content); - void processForeach(xercesc::DOMElement* content); - void processLog(xercesc::DOMElement* content); - void processScript(xercesc::DOMElement* content); - - virtual void process(xercesc::DOMElement* block, const X& xmlPrefix); - - virtual void invoke(xercesc::DOMElement* invoke); - virtual void uninvoke(xercesc::DOMElement* invoke); - virtual void raiseDoneEvent(xercesc::DOMElement* state, xercesc::DOMElement* doneData); - - virtual Data elementAsData(xercesc::DOMElement* element); - -protected: - void processNameLists(std::map<std::string, Data>& nameMap, xercesc::DOMElement* element); - void processParams(std::multimap<std::string, Data>& paramMap, xercesc::DOMElement* element); - -}; - -class USCXML_API ContentExecutor { -public: - PIMPL_OPERATORS(ContentExecutor) - - virtual void process(xercesc::DOMElement* block, const X& xmlPrefix) { - _impl->process(block, xmlPrefix); - } - - virtual void invoke(xercesc::DOMElement* invoke) { - _impl->invoke(invoke); - } - - virtual void uninvoke(xercesc::DOMElement* invoke) { - _impl->uninvoke(invoke); - } - - virtual Data elementAsData(xercesc::DOMElement* element) { - return _impl->elementAsData(element); - } - - virtual void raiseDoneEvent(xercesc::DOMElement* state, xercesc::DOMElement* doneData) { - return _impl->raiseDoneEvent(state, doneData); - } - -protected: - std::shared_ptr<ContentExecutorImpl> _impl; -}; - } -#endif /* end of include guard: CONTENTEXECUTORIMPL_H_13F2884F */ +#endif /* end of include guard: CONTENTEXECUTORIMPL_H_3ABA8969 */ diff --git a/src/uscxml/interpreter/EventQueue.cpp b/src/uscxml/interpreter/EventQueue.cpp new file mode 100644 index 0000000..9b9fa88 --- /dev/null +++ b/src/uscxml/interpreter/EventQueue.cpp @@ -0,0 +1,56 @@ +/** + * @file + * @author 2016 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + +#include "uscxml/Common.h" +#include "EventQueue.h" +#include "EventQueueImpl.h" +#include <string> +#include <map> +#include <list> +#include <thread> +#include <mutex> +#include <condition_variable> + +#include <event2/event.h> + + +namespace uscxml { + +Event EventQueue::dequeue(bool blocking) { + return _impl->dequeue(blocking); +} +void EventQueue::enqueue(const Event& event) { + return _impl->enqueue(event); +} + +PIMPL_OPERATORS_INHERIT_IMPL(DelayedEventQueue, EventQueue) + +void DelayedEventQueue::enqueueDelayed(const Event& event, size_t delayMs, const std::string& eventUUID) { + _impl->enqueueDelayed(event, delayMs, eventUUID); +} +void DelayedEventQueue::cancelDelayed(const std::string& eventUUID) { + return _impl->cancelDelayed(eventUUID); +} + +void DelayedEventQueue::cancelAllDelayed() { + return _impl->cancelAllDelayed(); +} + +} + diff --git a/src/uscxml/interpreter/EventQueue.h b/src/uscxml/interpreter/EventQueue.h new file mode 100644 index 0000000..4409b72 --- /dev/null +++ b/src/uscxml/interpreter/EventQueue.h @@ -0,0 +1,65 @@ +/** + * @file + * @author 2016 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + +#ifndef EVENTQUEUE_H_C5C41BEE +#define EVENTQUEUE_H_C5C41BEE + +#include "uscxml/Common.h" +#include "uscxml/messages/Event.h" + +namespace uscxml { + +class EventQueueImpl; +class DelayedEventQueueImpl; + +/** + * @ingroup eventqueue + * @ingroup facade + */ +class USCXML_API EventQueue { +public: + PIMPL_OPERATORS(EventQueue); + + virtual Event dequeue(bool blocking); + virtual void enqueue(const Event& event); + +protected: + std::shared_ptr<EventQueueImpl> _impl; + +}; + +/** + * @ingroup eventqueue + * @ingroup facade + */ +class USCXML_API DelayedEventQueue : public EventQueue { +public: + PIMPL_OPERATORS_INHERIT(DelayedEventQueue, EventQueue); + + void enqueueDelayed(const Event& event, size_t delayMs, const std::string& eventUUID); + void cancelDelayed(const std::string& eventUUID); + void cancelAllDelayed(); + +protected: + std::shared_ptr<DelayedEventQueueImpl> _impl; +}; + +} + +#endif /* end of include guard: EVENTQUEUE_H_C5C41BEE */ diff --git a/src/uscxml/interpreter/EventQueueImpl.h b/src/uscxml/interpreter/EventQueueImpl.h index 10543c9..1cafd4d 100644 --- a/src/uscxml/interpreter/EventQueueImpl.h +++ b/src/uscxml/interpreter/EventQueueImpl.h @@ -17,8 +17,8 @@ * @endcond */ -#ifndef EVENTSOURCE_H_775AB206 -#define EVENTSOURCE_H_775AB206 +#ifndef EVENTQUEUEIMPL_H_48027643 +#define EVENTQUEUEIMPL_H_48027643 #include "uscxml/Common.h" #include "uscxml/messages/Event.h" @@ -34,92 +34,36 @@ namespace uscxml { +/** + * @ingroup eventqueue + * @ingroup impl + */ class USCXML_API EventQueueImpl { public: - EventQueueImpl(); - virtual ~EventQueueImpl(); - virtual Event dequeue(bool blocking); - virtual void enqueue(const Event& event); - -protected: - std::list<Event> _queue; - std::recursive_mutex _mutex; - std::condition_variable_any _cond; - + virtual Event dequeue(bool blocking) = 0; + virtual void enqueue(const Event& event) = 0; }; +/** + * @ingroup eventqueue + * @ingroup callback + */ class USCXML_API DelayedEventQueueCallbacks { public: virtual void eventReady(Event& event, const std::string& eventId) = 0; }; +/** + * @ingroup eventqueue + * @ingroup impl + */ class USCXML_API DelayedEventQueueImpl : public EventQueueImpl { public: - DelayedEventQueueImpl(DelayedEventQueueCallbacks* callbacks); - virtual ~DelayedEventQueueImpl(); - virtual void enqueueDelayed(const Event& event, size_t delayMs, const std::string& eventUUID); - virtual void cancelDelayed(const std::string& eventId); - virtual void cancelAllDelayed(); - -protected: - struct callbackData { - Event userData; - std::string eventUUID; - bool persist; - struct event *event; - DelayedEventQueueImpl* eventQueue; - }; - - bool _isStarted; - std::thread* _thread; - - std::map<std::string, callbackData> _callbackData; - struct event_base* _eventLoop; - struct event* _dummyEvent; - - static void run(void* instance); - void start(); - void stop(); - - static void timerCallback(evutil_socket_t fd, short what, void *arg); - DelayedEventQueueCallbacks* _callbacks; -}; - -class USCXML_API EventQueue { -public: - PIMPL_OPERATORS(EventQueue) - - virtual Event dequeue(bool blocking) { - return _impl->dequeue(blocking); - } - virtual void enqueue(const Event& event) { - return _impl->enqueue(event); - } - -protected: - std::shared_ptr<EventQueueImpl> _impl; - -}; - -class USCXML_API DelayedEventQueue : public EventQueue { -public: - PIMPL_OPERATORS2(DelayedEventQueue, EventQueue) - - void enqueueDelayed(const Event& event, size_t delayMs, const std::string& eventUUID) { - _impl->enqueueDelayed(event, delayMs, eventUUID); - } - void cancelDelayed(const std::string& eventUUID) { - return _impl->cancelDelayed(eventUUID); - } - - void cancelAllDelayed() { - return _impl->cancelAllDelayed(); - } - -protected: - std::shared_ptr<DelayedEventQueueImpl> _impl; + virtual void enqueueDelayed(const Event& event, size_t delayMs, const std::string& eventUUID) = 0; + virtual void cancelDelayed(const std::string& eventId) = 0; + virtual void cancelAllDelayed() = 0; }; } -#endif /* end of include guard: EVENTSOURCE_H_775AB206 */ +#endif /* end of include guard: EVENTQUEUEIMPL_H_48027643 */ diff --git a/src/uscxml/interpreter/MicroStepFast.cpp b/src/uscxml/interpreter/FastMicroStep.cpp index 158c3ee..99c2d74 100644 --- a/src/uscxml/interpreter/MicroStepFast.cpp +++ b/src/uscxml/interpreter/FastMicroStep.cpp @@ -19,7 +19,7 @@ #undef USCXML_VERBOSE -#include "MicroStepFast.h" +#include "FastMicroStep.h" #include "uscxml/util/DOM.h" #include "uscxml/util/String.h" #include "uscxml/util/Predicates.h" @@ -74,13 +74,13 @@ namespace uscxml { -using namespace xercesc; +using namespace XERCESC_NS; -MicroStepFast::MicroStepFast(MicroStepCallbacks* callbacks) +FastMicroStep::FastMicroStep(MicroStepCallbacks* callbacks) : MicroStepImpl(callbacks), _flags(USCXML_CTX_PRISTINE), _isInitialized(false), _isCancelled(false) { } -MicroStepFast::~MicroStepFast() { +FastMicroStep::~FastMicroStep() { for (size_t i = 0; i < _states.size(); i++) { delete(_states[i]); } @@ -89,7 +89,7 @@ MicroStepFast::~MicroStepFast() { } } -void MicroStepFast::resortStates(DOMNode* node, const X& xmlPrefix) { +void FastMicroStep::resortStates(DOMNode* node, const X& xmlPrefix) { if (node->getNodeType() != DOMNode::ELEMENT_NODE) return; @@ -155,7 +155,7 @@ void MicroStepFast::resortStates(DOMNode* node, const X& xmlPrefix) { } } -void MicroStepFast::init(xercesc::DOMElement* scxml) { +void FastMicroStep::init(XERCESC_NS::DOMElement* scxml) { _scxml = scxml; _binding = (HAS_ATTR(_scxml, "binding") && iequals(ATTR(_scxml, "binding"), "late") ? LATE : EARLY); @@ -172,17 +172,18 @@ void MicroStepFast::init(xercesc::DOMElement* scxml) { /** -- All things states -- */ - std::list<xercesc::DOMElement*> tmp; + std::list<XERCESC_NS::DOMElement*> tmp; size_t i, j; - tmp = DOMUtils::inDocumentOrder({ - _xmlPrefix.str() + "state", - _xmlPrefix.str() + "parallel", - _xmlPrefix.str() + "scxml", - _xmlPrefix.str() + "initial", - _xmlPrefix.str() + "final", - _xmlPrefix.str() + "history"}, _scxml); - + tmp = DOMUtils::inDocumentOrder({ + _xmlPrefix.str() + "state", + _xmlPrefix.str() + "parallel", + _xmlPrefix.str() + "scxml", + _xmlPrefix.str() + "initial", + _xmlPrefix.str() + "final", + _xmlPrefix.str() + "history" + }, _scxml); + _states.resize(tmp.size()); _configuration.resize(tmp.size()); _history.resize(tmp.size()); @@ -307,7 +308,7 @@ void MicroStepFast::init(xercesc::DOMElement* scxml) { /** -- All things transitions -- */ - tmp = DOMUtils::inPostFixOrder({_xmlPrefix.str() + "transition"}, _scxml); + tmp = DOMUtils::inPostFixOrder({_xmlPrefix.str() + "transition"}, _scxml); _transitions.resize(tmp.size()); for (i = 0; i < _transitions.size(); i++) { @@ -318,13 +319,13 @@ void MicroStepFast::init(xercesc::DOMElement* scxml) { _transitions[i]->target.resize(_states.size()); tmp.pop_front(); } - assert(tmp.size() == 0); - + assert(tmp.size() == 0); + for (i = 0; i < _transitions.size(); i++) { // establish the transitions' exit set - assert(_transitions[i]->element != NULL); - std::cout << "i: " << i << std::endl << std::flush; + assert(_transitions[i]->element != NULL); + std::cout << "i: " << i << std::endl << std::flush; std::list<DOMElement*> exitList = getExitSet(_transitions[i]->element, _scxml); for (j = 0; j < _states.size(); j++) { if (!exitList.empty() && _states[j]->element == exitList.front()) { @@ -393,11 +394,11 @@ void MicroStepFast::init(xercesc::DOMElement* scxml) { _isInitialized = true; } -void MicroStepFast::markAsCancelled() { +void FastMicroStep::markAsCancelled() { _isCancelled = true; } -InterpreterState MicroStepFast::step(bool blocking) { +InterpreterState FastMicroStep::step(bool blocking) { if (!_isInitialized) { init(_scxml); return USCXML_INITIALIZED; @@ -911,7 +912,7 @@ ESTABLISH_ENTRYSET: return USCXML_MICROSTEPPED; } -void MicroStepFast::reset() { +void FastMicroStep::reset() { _isCancelled = false; _flags = USCXML_CTX_PRISTINE; _configuration.reset(); @@ -921,7 +922,7 @@ void MicroStepFast::reset() { } -bool MicroStepFast::isInState(const std::string& stateId) { +bool FastMicroStep::isInState(const std::string& stateId) { #ifdef USCXML_VERBOSE printStateNames(_configuration); #endif @@ -930,8 +931,8 @@ bool MicroStepFast::isInState(const std::string& stateId) { return _configuration[_stateIds[stateId]]; } -std::list<xercesc::DOMElement*> MicroStepFast::getConfiguration() { - std::list<xercesc::DOMElement*> config; +std::list<XERCESC_NS::DOMElement*> FastMicroStep::getConfiguration() { + std::list<XERCESC_NS::DOMElement*> config; size_t i = _configuration.find_first(); while(i != boost::dynamic_bitset<>::npos) { config.push_back(_states[i]->element); @@ -941,7 +942,7 @@ std::list<xercesc::DOMElement*> MicroStepFast::getConfiguration() { } -std::list<DOMElement*> MicroStepFast::getHistoryCompletion(const DOMElement* history) { +std::list<DOMElement*> FastMicroStep::getHistoryCompletion(const DOMElement* history) { std::set<std::string> elements; elements.insert(_xmlPrefix.str() + "history"); std::list<DOMElement*> histories = DOMUtils::inPostFixOrder(elements, _scxml); @@ -990,7 +991,7 @@ std::list<DOMElement*> MicroStepFast::getHistoryCompletion(const DOMElement* his /** * Print name of states contained in a (debugging). */ -void MicroStepFast::printStateNames(const boost::dynamic_bitset<>& a) { +void FastMicroStep::printStateNames(const boost::dynamic_bitset<>& a) { size_t i; const char* seperator = ""; for (i = 0; i < a.size(); i++) { @@ -1003,7 +1004,7 @@ void MicroStepFast::printStateNames(const boost::dynamic_bitset<>& a) { } #endif -std::list<DOMElement*> MicroStepFast::getCompletion(const DOMElement* state) { +std::list<DOMElement*> FastMicroStep::getCompletion(const DOMElement* state) { if (isHistory(state)) { // we already did in setHistoryCompletion @@ -1044,7 +1045,7 @@ std::list<DOMElement*> MicroStepFast::getCompletion(const DOMElement* state) { /** * See: http://www.w3.org/TR/scxml/#LegalStateConfigurations */ -bool MicroStepFast::hasLegalConfiguration() { +bool FastMicroStep::hasLegalConfiguration() { // The configuration contains exactly one child of the <scxml> element. std::list<DOMElement*> scxmlChilds = getChildStates(_scxml, true); diff --git a/src/uscxml/interpreter/MicroStepFast.h b/src/uscxml/interpreter/FastMicroStep.h index c41be80..3789af9 100644 --- a/src/uscxml/interpreter/MicroStepFast.h +++ b/src/uscxml/interpreter/FastMicroStep.h @@ -17,11 +17,14 @@ * @endcond */ -#ifndef INTERPRETERFAST_H_DA55E52B -#define INTERPRETERFAST_H_DA55E52B +#ifndef FASTMICROSTEP_H_065FE1F7 +#define FASTMICROSTEP_H_065FE1F7 //#define USCXML_VERBOSE 1 +#include "uscxml/config.h" +#include "uscxml/util/DOM.h" // X + #include <vector> #include <set> #include "MicroStepImpl.h" @@ -30,15 +33,19 @@ namespace uscxml { -class MicroStepFast : public MicroStepImpl { +/** + * @ingroup microstep + * @ingroup impl + */ +class FastMicroStep : public MicroStepImpl { public: - MicroStepFast(MicroStepCallbacks* callbacks); - virtual ~MicroStepFast(); + FastMicroStep(MicroStepCallbacks* callbacks); + virtual ~FastMicroStep(); virtual InterpreterState step(bool blocking); virtual void reset(); virtual bool isInState(const std::string& stateId); - virtual std::list<xercesc::DOMElement*> getConfiguration(); + virtual std::list<XERCESC_NS::DOMElement*> getConfiguration(); void markAsCancelled(); protected: @@ -46,14 +53,14 @@ protected: public: Transition() : element(NULL), source(0), onTrans(NULL), type(0) {} - xercesc::DOMElement* element; + XERCESC_NS::DOMElement* element; boost::dynamic_bitset<> conflicts; boost::dynamic_bitset<> exitSet; uint32_t source; boost::dynamic_bitset<> target; - xercesc::DOMElement* onTrans; + XERCESC_NS::DOMElement* onTrans; std::string event; std::string cond; @@ -66,32 +73,32 @@ protected: public: State() : element(NULL), parent(0), documentOrder(0), doneData(NULL), type(0) {} - xercesc::DOMElement* element; + XERCESC_NS::DOMElement* element; boost::dynamic_bitset<> completion; boost::dynamic_bitset<> children; boost::dynamic_bitset<> ancestors; uint32_t parent; uint32_t documentOrder; - std::list<xercesc::DOMElement*> data; - std::list<xercesc::DOMElement*> invoke; - std::list<xercesc::DOMElement*> onEntry; - std::list<xercesc::DOMElement*> onExit; - xercesc::DOMElement* doneData; + std::list<XERCESC_NS::DOMElement*> data; + std::list<XERCESC_NS::DOMElement*> invoke; + std::list<XERCESC_NS::DOMElement*> onEntry; + std::list<XERCESC_NS::DOMElement*> onExit; + XERCESC_NS::DOMElement* doneData; unsigned char type; }; - virtual void init(xercesc::DOMElement* scxml); + virtual void init(XERCESC_NS::DOMElement* scxml); - std::list<xercesc::DOMElement*> getCompletion(const xercesc::DOMElement* state); + std::list<XERCESC_NS::DOMElement*> getCompletion(const XERCESC_NS::DOMElement* state); unsigned char _flags; std::map<std::string, int> _stateIds; std::vector<State*> _states; std::vector<Transition*> _transitions; - std::list<xercesc::DOMElement*> _globalScripts; + std::list<XERCESC_NS::DOMElement*> _globalScripts; boost::dynamic_bitset<> _configuration; boost::dynamic_bitset<> _invocations; @@ -101,7 +108,7 @@ protected: std::set<boost::dynamic_bitset<> > _microstepConfigurations; Binding _binding; - xercesc::DOMElement* _scxml; + XERCESC_NS::DOMElement* _scxml; X _xmlPrefix; X _xmlNS; @@ -110,8 +117,8 @@ protected: Event _event; // we do not care about the event's representation private: - std::list<xercesc::DOMElement*> getHistoryCompletion(const xercesc::DOMElement* state); - void resortStates(xercesc::DOMNode* node, const X& xmlPrefix); + std::list<XERCESC_NS::DOMElement*> getHistoryCompletion(const XERCESC_NS::DOMElement* state); + void resortStates(XERCESC_NS::DOMNode* node, const X& xmlPrefix); // bool hasLegalConfiguration(); @@ -123,5 +130,5 @@ private: } -#endif /* end of include guard: INTERPRETERFAST_H_DA55E52B */ +#endif /* end of include guard: FASTMICROSTEP_H_065FE1F7 */ diff --git a/src/uscxml/interpreter/InterpreterImpl.cpp b/src/uscxml/interpreter/InterpreterImpl.cpp index e61c4ab..880afbc 100644 --- a/src/uscxml/interpreter/InterpreterImpl.cpp +++ b/src/uscxml/interpreter/InterpreterImpl.cpp @@ -17,12 +17,16 @@ * @endcond */ +#include "uscxml/config.h" #include "uscxml/Common.h" #include "uscxml/util/UUID.h" #include "uscxml/Interpreter.h" +#include "uscxml/interpreter/InterpreterImpl.h" // beware cyclic reference! +#include "uscxml/interpreter/BasicEventQueue.h" #include "uscxml/messages/Event.h" #include "uscxml/util/String.h" #include "uscxml/util/Predicates.h" +#include "uscxml/plugins/InvokerImpl.h" #include "easylogging++.h" @@ -33,14 +37,16 @@ #include <memory> #include <mutex> -#include "uscxml/interpreter/MicroStepFast.h" +#include "uscxml/interpreter/FastMicroStep.h" +#include "uscxml/interpreter/BasicContentExecutor.h" + +#include <xercesc/dom/DOM.hpp> +#include <xercesc/util/PlatformUtils.hpp> #define VERBOSE 0 namespace uscxml { -using namespace xercesc; - std::map<std::string, std::weak_ptr<InterpreterImpl> > InterpreterImpl::_instances; std::recursive_mutex InterpreterImpl::_instanceMutex; @@ -65,8 +71,8 @@ void InterpreterImpl::addInstance(std::shared_ptr<InterpreterImpl> interpreterIm InterpreterImpl::InterpreterImpl() : _isInitialized(false), _document(NULL), _scxml(NULL), _state(USCXML_INSTANTIATED), _monitor(NULL) { try { - xercesc::XMLPlatformUtils::Initialize(); - } catch (const xercesc::XMLException& toCatch) { + ::xercesc_3_1::XMLPlatformUtils::Initialize(); + } catch (const XERCESC_NS::XMLException& toCatch) { ERROR_PLATFORM_THROW("Cannot initialize XercesC: " + X(toCatch.getMessage()).str()); } @@ -80,7 +86,7 @@ InterpreterImpl::~InterpreterImpl() { _delayQueue.cancelAllDelayed(); if (_document) delete _document; - + { std::lock_guard<std::recursive_mutex> lock(_instanceMutex); _instances.erase(getSessionId()); @@ -102,7 +108,7 @@ void InterpreterImpl::setupDOM() { if (!_scxml) { // find scxml element - DOMNodeList* scxmls = NULL; + XERCESC_NS::DOMNodeList* scxmls = NULL; // proper namespace scxmls = _document->getElementsByTagNameNS(X("http://www.w3.org/2005/07/scxml"), X("scxml")); @@ -120,7 +126,7 @@ SCXML_STOP_SEARCH: return; } - _scxml = dynamic_cast<DOMElement*>(scxmls->item(0)); + _scxml = dynamic_cast<XERCESC_NS::DOMElement*>(scxmls->item(0)); _xmlPrefix = _scxml->getPrefix(); _xmlNS = _scxml->getNamespaceURI(); @@ -171,7 +177,7 @@ void InterpreterImpl::init() { } if (!_microStepper) { - _microStepper = MicroStep(std::shared_ptr<MicroStepImpl>(new MicroStepFast(this))); + _microStepper = MicroStep(std::shared_ptr<MicroStepImpl>(new FastMicroStep(this))); } _microStepper.init(_scxml); @@ -179,23 +185,23 @@ void InterpreterImpl::init() { _dataModel = _factory->createDataModel(HAS_ATTR(_scxml, "datamodel") ? ATTR(_scxml, "datamodel") : "null", this); } if (!_execContent) { - _execContent = ContentExecutor(std::shared_ptr<ContentExecutorImpl>(new BasicContentExecutorImpl(this))); + _execContent = ContentExecutor(std::shared_ptr<ContentExecutorImpl>(new BasicContentExecutor(this))); } if (!_externalQueue) { - _externalQueue = EventQueue(std::shared_ptr<EventQueueImpl>(new EventQueueImpl())); + _externalQueue = EventQueue(std::shared_ptr<EventQueueImpl>(new BasicEventQueue())); } if (!_internalQueue) { - _internalQueue = EventQueue(std::shared_ptr<EventQueueImpl>(new EventQueueImpl())); + _internalQueue = EventQueue(std::shared_ptr<EventQueueImpl>(new BasicEventQueue())); } if (!_delayQueue) { - _delayQueue = DelayedEventQueue(std::shared_ptr<DelayedEventQueueImpl>(new DelayedEventQueueImpl(this))); + _delayQueue = DelayedEventQueue(std::shared_ptr<DelayedEventQueueImpl>(new BasicDelayedEventQueue(this))); } _isInitialized = true; } -void InterpreterImpl::initData(xercesc::DOMElement* root) { +void InterpreterImpl::initData(XERCESC_NS::DOMElement* root) { std::string id = ATTR(root, "id"); Data d; try { @@ -330,7 +336,7 @@ void InterpreterImpl::eventReady(Event& sendEvent, const std::string& eventUUID) } } -void InterpreterImpl::invoke(const std::string& type, const std::string& src, bool autoForward, xercesc::DOMElement* finalize, const Event& invokeEvent) { +void InterpreterImpl::invoke(const std::string& type, const std::string& src, bool autoForward, XERCESC_NS::DOMElement* finalize, const Event& invokeEvent) { std::string tmp; if (src.size() > 0) { diff --git a/src/uscxml/interpreter/InterpreterImpl.h b/src/uscxml/interpreter/InterpreterImpl.h index 7c64779..e1abf9b 100644 --- a/src/uscxml/interpreter/InterpreterImpl.h +++ b/src/uscxml/interpreter/InterpreterImpl.h @@ -17,8 +17,8 @@ * @endcond */ -#ifndef INTERPRETERIMPL_H_29D5BEBA -#define INTERPRETERIMPL_H_29D5BEBA +#ifndef INTERPRETERIMPL_H_2A79C83D +#define INTERPRETERIMPL_H_2A79C83D #include <memory> #include <mutex> @@ -29,9 +29,10 @@ #include "uscxml/Common.h" #include "uscxml/util/URL.h" #include "uscxml/plugins/Factory.h" -#include "uscxml/plugins/DataModel.h" +#include "uscxml/plugins/DataModelImpl.h" #include "uscxml/interpreter/MicroStepImpl.h" #include "uscxml/interpreter/ContentExecutorImpl.h" +#include "uscxml/interpreter/EventQueue.h" #include "uscxml/interpreter/EventQueueImpl.h" #include "uscxml/util/DOM.h" #include <xercesc/dom/DOM.hpp> @@ -41,13 +42,10 @@ namespace uscxml { class InterpreterMonitor; class InterpreterIssue; -class USCXML_API ActionLanguage { -public: - MicroStep microStepper; - DataModel dataModel; - ContentExecutor execContent; -}; - +/** + * @ingroup interpreter + * @ingroup impl + */ class USCXML_API InterpreterImpl : public MicroStepCallbacks, public DataModelCallbacks, @@ -92,7 +90,7 @@ public: return _state; } - std::list<xercesc::DOMElement*> getConfiguration() { + std::list<XERCESC_NS::DOMElement*> getConfiguration() { return _microStepper.getConfiguration(); } @@ -112,22 +110,22 @@ public: virtual Event dequeueExternal(bool blocking); virtual bool isTrue(const std::string& expr); - virtual void raiseDoneEvent(xercesc::DOMElement* state, xercesc::DOMElement* doneData) { + virtual void raiseDoneEvent(XERCESC_NS::DOMElement* state, XERCESC_NS::DOMElement* doneData) { _execContent.raiseDoneEvent(state, doneData); } - virtual void process(xercesc::DOMElement* block) { + virtual void process(XERCESC_NS::DOMElement* block) { _execContent.process(block, _xmlPrefix); } virtual bool isMatched(const Event& event, const std::string& eventDesc); - virtual void initData(xercesc::DOMElement* element); + virtual void initData(XERCESC_NS::DOMElement* element); - virtual void invoke(xercesc::DOMElement* invoke) { + virtual void invoke(XERCESC_NS::DOMElement* invoke) { _execContent.invoke(invoke); } - virtual void uninvoke(xercesc::DOMElement* invoke) { + virtual void uninvoke(XERCESC_NS::DOMElement* invoke) { _execContent.uninvoke(invoke); } @@ -154,7 +152,7 @@ public: virtual bool isInState(const std::string& stateId) { return _microStepper.isInState(stateId); } - virtual xercesc::DOMDocument* getDocument() const { + virtual XERCESC_NS::DOMDocument* getDocument() const { return _document; } @@ -201,7 +199,7 @@ public: } virtual bool checkValidSendType(const std::string& type, const std::string& target); - virtual void invoke(const std::string& type, const std::string& src, bool autoForward, xercesc::DOMElement* finalize, const Event& invokeEvent); + virtual void invoke(const std::string& type, const std::string& src, bool autoForward, XERCESC_NS::DOMElement* finalize, const Event& invokeEvent); virtual void uninvoke(const std::string& invokeId); virtual void enqueue(const std::string& type, const std::string& target, size_t delayMs, const Event& sendEvent); @@ -225,7 +223,7 @@ public: static std::map<std::string, std::weak_ptr<InterpreterImpl> > getInstances(); - virtual xercesc::DOMDocument* getDocument() { + virtual XERCESC_NS::DOMDocument* getDocument() { return _document; } @@ -239,8 +237,8 @@ protected: std::string _invokeId; // TODO: Never set! bool _isInitialized; - xercesc::DOMDocument* _document; - xercesc::DOMElement* _scxml; + XERCESC_NS::DOMDocument* _document; + XERCESC_NS::DOMElement* _scxml; std::map<std::string, std::tuple<std::string, std::string, std::string> > _delayedEventTargets; @@ -287,4 +285,4 @@ private: } -#endif /* end of include guard: INTERPRETERIMPL_H_29D5BEBA */ +#endif /* end of include guard: INTERPRETERIMPL_H_2A79C83D */ diff --git a/src/uscxml/interpreter/InterpreterMonitor.h b/src/uscxml/interpreter/InterpreterMonitor.h index 6ebdb35..901e1eb 100644 --- a/src/uscxml/interpreter/InterpreterMonitor.h +++ b/src/uscxml/interpreter/InterpreterMonitor.h @@ -17,8 +17,8 @@ * @endcond */ -#ifndef INTERPRETERMONITOR_H_4BA77097 -#define INTERPRETERMONITOR_H_4BA77097 +#ifndef INTERPRETERMONITOR_H_D3F21429 +#define INTERPRETERMONITOR_H_D3F21429 #include "uscxml/Common.h" #include "uscxml/messages/Event.h" @@ -51,23 +51,23 @@ public: virtual void beforeProcessingEvent(const Event& event) {} virtual void beforeMicroStep() {} - virtual void beforeExitingState(const xercesc::DOMElement* state) {} - virtual void afterExitingState(const xercesc::DOMElement* state) {} + virtual void beforeExitingState(const XERCESC_NS::DOMElement* state) {} + virtual void afterExitingState(const XERCESC_NS::DOMElement* state) {} - virtual void beforeExecutingContent(const xercesc::DOMElement* execContent) {} - virtual void afterExecutingContent(const xercesc::DOMElement* execContent) {} + virtual void beforeExecutingContent(const XERCESC_NS::DOMElement* execContent) {} + virtual void afterExecutingContent(const XERCESC_NS::DOMElement* execContent) {} - virtual void beforeUninvoking(const xercesc::DOMElement* invokeElem, const std::string& invokeid) {} - virtual void afterUninvoking(const xercesc::DOMElement* invokeElem, const std::string& invokeid) {} + virtual void beforeUninvoking(const XERCESC_NS::DOMElement* invokeElem, const std::string& invokeid) {} + virtual void afterUninvoking(const XERCESC_NS::DOMElement* invokeElem, const std::string& invokeid) {} - virtual void beforeTakingTransition(const xercesc::DOMElement* transition) {} - virtual void afterTakingTransition(const xercesc::DOMElement* transition) {} + virtual void beforeTakingTransition(const XERCESC_NS::DOMElement* transition) {} + virtual void afterTakingTransition(const XERCESC_NS::DOMElement* transition) {} - virtual void beforeEnteringState(const xercesc::DOMElement* state) {} - virtual void afterEnteringState(const xercesc::DOMElement* state) {} + virtual void beforeEnteringState(const XERCESC_NS::DOMElement* state) {} + virtual void afterEnteringState(const XERCESC_NS::DOMElement* state) {} - virtual void beforeInvoking(const xercesc::DOMElement* invokeElem, const std::string& invokeid) {} - virtual void afterInvoking(const xercesc::DOMElement* invokeElem, const std::string& invokeid) {} + virtual void beforeInvoking(const XERCESC_NS::DOMElement* invokeElem, const std::string& invokeid) {} + virtual void afterInvoking(const XERCESC_NS::DOMElement* invokeElem, const std::string& invokeid) {} virtual void afterMicroStep() {} virtual void onStableConfiguration() {} @@ -90,6 +90,23 @@ protected: }; +class USCXML_API StateTransitionMonitor : public uscxml::InterpreterMonitor { +public: + StateTransitionMonitor() {} + virtual ~StateTransitionMonitor() {} + + virtual void beforeTakingTransition(const XERCESC_NS::DOMElement* transition); + virtual void beforeExecutingContent(const XERCESC_NS::DOMElement* element); + virtual void onStableConfiguration(); + virtual void beforeProcessingEvent(const uscxml::Event& event); + virtual void beforeExitingState(const XERCESC_NS::DOMElement* state); + virtual void beforeEnteringState(const XERCESC_NS::DOMElement* state); + virtual void beforeMicroStep(); + +protected: + static std::recursive_mutex _mutex; +}; + } -#endif /* end of include guard: INTERPRETERMONITOR_H_4BA77097 */ +#endif /* end of include guard: INTERPRETERMONITOR_H_D3F21429 */ diff --git a/src/uscxml/interpreter/InterpreterState.h b/src/uscxml/interpreter/InterpreterState.h new file mode 100644 index 0000000..a4741ed --- /dev/null +++ b/src/uscxml/interpreter/InterpreterState.h @@ -0,0 +1,44 @@ +/** + * @file + * @author 2016 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + + +#ifndef INTERPRETERSTATE_H_E6CCAEA5 +#define INTERPRETERSTATE_H_E6CCAEA5 + + +#include "uscxml/Common.h" + +namespace uscxml { + +enum InterpreterState { + USCXML_FINISHED = -2, ///< machine reached a final configuration and is done + USCXML_INTERRUPTED = -1, ///< machine received the empty event on the external queue + USCXML_UNDEF = 0, ///< not an actual state + USCXML_IDLE = 1, ///< stable configuration and queues empty + USCXML_INITIALIZED = 2, ///< DOM is setup and all external components instantiated + USCXML_INSTANTIATED = 3, ///< nothing really, just instantiated + USCXML_MICROSTEPPED = 4, ///< processed one transition set + USCXML_MACROSTEPPED = 5, ///< processed all transition sets and reached a stable configuration + USCXML_CANCELLED = 6, ///< machine was cancelled, step once more to finalize +}; + + +} + +#endif /* end of include guard: INTERPRETERSTATE_H_E6CCAEA5 */ diff --git a/src/uscxml/interpreter/MicroStep.cpp b/src/uscxml/interpreter/MicroStep.cpp new file mode 100644 index 0000000..aa75c91 --- /dev/null +++ b/src/uscxml/interpreter/MicroStep.cpp @@ -0,0 +1,47 @@ +/** + * @file + * @author 2012-2016 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + +#include "MicroStep.h" +#include "MicroStepImpl.h" + +namespace uscxml { + +InterpreterState MicroStep::step(bool blocking) { + return _impl->step(blocking); +} +void MicroStep::reset() { + return _impl->reset(); +} +bool MicroStep::isInState(const std::string& stateId) { + return _impl->isInState(stateId); +} + +std::list<XERCESC_NS::DOMElement*> MicroStep::getConfiguration() { + return _impl->getConfiguration(); +} + +void MicroStep::init(XERCESC_NS::DOMElement* scxml) { + _impl->init(scxml); +} + +void MicroStep::markAsCancelled() { + _impl->markAsCancelled(); +} + +}
\ No newline at end of file diff --git a/src/uscxml/interpreter/MicroStep.h b/src/uscxml/interpreter/MicroStep.h new file mode 100644 index 0000000..c20e994 --- /dev/null +++ b/src/uscxml/interpreter/MicroStep.h @@ -0,0 +1,66 @@ +/** + * @file + * @author 2016 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + +#ifndef MICROSTEP_H_07DA8BFA +#define MICROSTEP_H_07DA8BFA + + +#include <memory> +#include <list> +#include <string> + +#include "uscxml/config.h" +#include "uscxml/Common.h" +#include "uscxml/interpreter/InterpreterState.h" + +// #include <xercesc/dom/DOM.hpp> + +// forward declare +namespace XERCESC_NS { + class DOMElement; +} + +namespace uscxml { + +class MicroStepImpl; + +/** + * @ingroup microstep + * @ingroup facade + */ +class USCXML_API MicroStep { +public: + PIMPL_OPERATORS(MicroStep); + + virtual InterpreterState step(bool blocking); + virtual void reset(); + virtual bool isInState(const std::string& stateId); + + std::list<XERCESC_NS::DOMElement*> getConfiguration(); + + virtual void init(XERCESC_NS::DOMElement* scxml); + virtual void markAsCancelled(); + +protected: + std::shared_ptr<MicroStepImpl> _impl; +}; + +} + +#endif /* end of include guard: MICROSTEP_H_07DA8BFA */ diff --git a/src/uscxml/interpreter/MicroStepImpl.h b/src/uscxml/interpreter/MicroStepImpl.h index 71c03b5..e4cde5d 100644 --- a/src/uscxml/interpreter/MicroStepImpl.h +++ b/src/uscxml/interpreter/MicroStepImpl.h @@ -20,57 +20,50 @@ #ifndef MICROSTEPIMPL_H_98233709 #define MICROSTEPIMPL_H_98233709 -#include <memory> -#include <mutex> +#include "uscxml/config.h" + #include <list> -#include <map> #include <string> +#include <xercesc/dom/DOM.hpp> #include "uscxml/Common.h" +#include "uscxml/Interpreter.h" #include "uscxml/messages/Event.h" -#include "uscxml/interpreter/InterpreterMonitor.h" -#include "uscxml/util/DOM.h" -#include <xercesc/dom/DOM.hpp> - -namespace uscxml { - -enum InterpreterState { - USCXML_FINISHED = -2, ///< machine reached a final configuration and is done - USCXML_INTERRUPTED = -1, ///< machine received the empty event on the external queue - USCXML_UNDEF = 0, ///< not an actual state - USCXML_IDLE = 1, ///< stable configuration and queues empty - USCXML_INITIALIZED = 2, ///< DOM is setup and all external components instantiated - USCXML_INSTANTIATED = 3, ///< nothing really, just instantiated - USCXML_MICROSTEPPED = 4, ///< processed one transition set - USCXML_MACROSTEPPED = 5, ///< processed all transition sets and reached a stable configuration - USCXML_CANCELLED = 6, ///< machine was cancelled, step once more to finalize -}; +namespace uscxml { +/** + * @ingroup microstep + * @ingroup callback + */ class USCXML_API MicroStepCallbacks { public: /** Event Queues / Matching */ virtual Event dequeueInternal() = 0; virtual Event dequeueExternal(bool blocking) = 0; virtual bool isMatched(const Event& event, const std::string& eventDesc) = 0; - virtual void raiseDoneEvent(xercesc::DOMElement* state, xercesc::DOMElement* doneData) = 0; + virtual void raiseDoneEvent(XERCESC_NS::DOMElement* state, XERCESC_NS::DOMElement* doneData) = 0; /** Datamodel */ virtual bool isTrue(const std::string& expr) = 0; - virtual void initData(xercesc::DOMElement* element) = 0; + virtual void initData(XERCESC_NS::DOMElement* element) = 0; /** Executable Content */ - virtual void process(xercesc::DOMElement* block) = 0; + virtual void process(XERCESC_NS::DOMElement* block) = 0; /** Invocations */ - virtual void invoke(xercesc::DOMElement* invoke) = 0; - virtual void uninvoke(xercesc::DOMElement* invoke) = 0; + virtual void invoke(XERCESC_NS::DOMElement* invoke) = 0; + virtual void uninvoke(XERCESC_NS::DOMElement* invoke) = 0; /** Monitoring */ virtual InterpreterMonitor* getMonitor() = 0; }; +/** + * @ingroup microstep + * @ingroup impl + */ class USCXML_API MicroStepImpl { public: enum Binding { @@ -83,9 +76,9 @@ public: virtual InterpreterState step(bool blocking) = 0; virtual void reset() = 0; ///< Reset state machine virtual bool isInState(const std::string& stateId) = 0; - virtual std::list<xercesc::DOMElement*> getConfiguration() = 0; + virtual std::list<XERCESC_NS::DOMElement*> getConfiguration() = 0; - virtual void init(xercesc::DOMElement* scxml) = 0; + virtual void init(XERCESC_NS::DOMElement* scxml) = 0; virtual void markAsCancelled() = 0; protected: @@ -93,35 +86,6 @@ protected: }; -class USCXML_API MicroStep { -public: - PIMPL_OPERATORS(MicroStep) - - virtual InterpreterState step(bool blocking) { - return _impl->step(blocking); - } - virtual void reset() { - return _impl->reset(); - } - virtual bool isInState(const std::string& stateId) { - return _impl->isInState(stateId); - } - - std::list<xercesc::DOMElement*> getConfiguration() { - return _impl->getConfiguration(); - } - - virtual void init(xercesc::DOMElement* scxml) { - _impl->init(scxml); - } - - virtual void markAsCancelled() { - _impl->markAsCancelled(); - } -protected: - std::shared_ptr<MicroStepImpl> _impl; -}; - } #endif /* end of include guard: MICROSTEPIMPL_H_98233709 */ diff --git a/src/uscxml/messages/Blob.h b/src/uscxml/messages/Blob.h index 9bbf0f7..403485c 100644 --- a/src/uscxml/messages/Blob.h +++ b/src/uscxml/messages/Blob.h @@ -65,7 +65,7 @@ protected: class USCXML_API Blob { public: - PIMPL_OPERATORS(Blob) + PIMPL_OPERATORS(Blob); Blob(size_t size) : _impl(std::shared_ptr<BlobImpl>(new BlobImpl(size))) {} Blob(const char* data, diff --git a/src/uscxml/messages/Data.h b/src/uscxml/messages/Data.h index 55b9f64..6ab3bec 100644 --- a/src/uscxml/messages/Data.h +++ b/src/uscxml/messages/Data.h @@ -24,11 +24,18 @@ #include <map> #include <memory> +#include "uscxml/config.h" #include "uscxml/Common.h" #include "uscxml/util/Convenience.h" #include "uscxml/messages/Blob.h" -#include <xercesc/dom/DOMDocument.hpp> +//#include <xercesc/dom/DOMDocument.hpp> + +// forward declare +namespace XERCESC_NS { + class DOMDocument; + class DOMNode; +} namespace uscxml { @@ -54,8 +61,6 @@ public: } } - Data(xercesc::DOMNode* node) : node(node), type(VERBATIM) {} - // template <typename T> Data(T value, Type type = INTERPRETED) : atom(toStr(value)), type(type) {} // we will have to drop this constructor as it interferes with operator Data() and requires C++11 @@ -214,8 +219,8 @@ public: protected: #endif - xercesc::DOMNode* node; - std::shared_ptr<xercesc::DOMDocument*> adoptedDoc; + XERCESC_NS::DOMNode* node; + std::shared_ptr<XERCESC_NS::DOMDocument*> adoptedDoc; std::map<std::string, Data> compound; std::list<Data> array; std::string atom; diff --git a/src/uscxml/plugins/DataModel.cpp b/src/uscxml/plugins/DataModel.cpp new file mode 100644 index 0000000..96afd89 --- /dev/null +++ b/src/uscxml/plugins/DataModel.cpp @@ -0,0 +1,86 @@ +/** + * @file + * @author 2012-2014 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + +#include "DataModel.h" +#include "DataModelImpl.h" + +namespace uscxml { + +std::list<std::string> DataModel::getNames() { + return _impl->getNames(); +} + +bool DataModel::isValidSyntax(const std::string& expr) { + return _impl->isValidSyntax(expr); +} + +void DataModel::setEvent(const Event& event) { + return _impl->setEvent(event); +} + +Data DataModel::getAsData(const std::string& content) { + return _impl->getAsData(content); +} + +Data DataModel::evalAsData(const std::string& content) { + return _impl->evalAsData(content); +} + +bool DataModel::evalAsBool(const std::string& expr) { + return _impl->evalAsBool(expr); +} + +uint32_t DataModel::getLength(const std::string& expr) { + return _impl->getLength(expr); +} + +void DataModel::setForeach(const std::string& item, + const std::string& array, + const std::string& index, + uint32_t iteration) { + return _impl->setForeach(item, array, index, iteration); +} + +void DataModel::assign(const std::string& location, const Data& data) { + return _impl->assign(location, data); +} + +void DataModel::init(const std::string& location, const Data& data) { + return _impl->init(location, data); +} + +bool DataModel::isDeclared(const std::string& expr) { + return _impl->isDeclared(expr); +} + +size_t DataModel::replaceExpressions(std::string& content) { + return _impl->replaceExpressions(content); +} + +std::string DataModel::andExpressions(std::list<std::string> expressions) { + return _impl->andExpressions(expressions); +} + +void DataModel::addExtension(DataModelExtension* ext) { + return _impl->addExtension(ext); +} + + +} + diff --git a/src/uscxml/plugins/DataModel.h b/src/uscxml/plugins/DataModel.h index b08f934..03e557c 100644 --- a/src/uscxml/plugins/DataModel.h +++ b/src/uscxml/plugins/DataModel.h @@ -21,208 +21,65 @@ #define DATAMODEL_H_F1F776F9 #include "uscxml/Common.h" -#include "uscxml/plugins/Invoker.h" -#include "uscxml/plugins/IOProcessor.h" - -#ifndef TIME_BLOCK -# ifdef BUILD_PROFILING -# include "uscxml/concurrency/Timer.h" -# define TIME_BLOCK Measurement msm(&timer); -# else -# define TIME_BLOCK -# endif -#endif +#include "uscxml/messages/Event.h" #include <list> #include <string> #include <memory> -#include <sstream> - -#include <xercesc/dom/DOM.hpp> namespace uscxml { -class InterpreterImpl; class DataModelImpl; +class DataModelExtension; -class USCXML_API DataModelCallbacks { +/** + * @ingroup datamodel + * @ingroup facade + * The facade for data-models. + */ +class USCXML_API DataModel { public: - virtual const std::string& getName() = 0; - virtual const std::string& getSessionId() = 0; - virtual const std::map<std::string, IOProcessor>& getIOProcessors() = 0; - virtual bool isInState(const std::string& stateId) = 0; - virtual xercesc::DOMDocument* getDocument() const = 0; - virtual const std::map<std::string, Invoker>& getInvokers() = 0; -}; -class USCXML_API DataModelExtension { -public: - DataModelExtension() : dm(NULL) {} - virtual ~DataModelExtension() {} - virtual std::string provides() = 0; - virtual Data getValueOf(const std::string& member) = 0; - virtual void setValueOf(const std::string& member, const Data& data) = 0; - DataModelImpl* dm; -}; + PIMPL_OPERATORS(DataModel); -class USCXML_API DataModelImpl { -public: - virtual ~DataModelImpl() {} - virtual std::shared_ptr<DataModelImpl> create(DataModelCallbacks* interpreter) = 0; - virtual std::list<std::string> getNames() = 0; + /// @copydoc DataModelImpl::getNames() + virtual std::list<std::string> getNames(); + /// @copydoc DataModelImpl::isValidSyntax() + virtual bool isValidSyntax(const std::string& expr); - virtual bool isValidSyntax(const std::string& expr) { - return true; // overwrite when datamodel supports it - } - virtual void setEvent(const Event& event) = 0; + /// @copydoc DataModelImpl::setEvent() + virtual void setEvent(const Event& event); - size_t replaceExpressions(std::string& content); + /// @copydoc DataModelImpl::getAsData() + virtual Data getAsData(const std::string& content); + /// @copydoc DataModelImpl::evalAsData() + virtual Data evalAsData(const std::string& content); + /// @copydoc DataModelImpl::evalAsBool() + virtual bool evalAsBool(const std::string& expr); - // foreach - virtual uint32_t getLength(const std::string& expr) = 0; + /// @copydoc DataModelImpl::getLength() + virtual uint32_t getLength(const std::string& expr); + /// @copydoc DataModelImpl::setForeach() virtual void setForeach(const std::string& item, const std::string& array, const std::string& index, - uint32_t iteration) = 0; - - virtual Data getAsData(const std::string& content) = 0; - virtual Data evalAsData(const std::string& content) = 0; - virtual bool evalAsBool(const std::string& expr) = 0; - - virtual bool isDeclared(const std::string& expr) = 0; - - /** - * test147: - * <data id="Var1" expr="0"/> - * - * test150: - * <data id="Var3"> - * [1,2,3] - * </data> - * - * test277: - * <data id="Var1" expr="return"/> - * - */ - virtual void assign(const std::string& location, const Data& data) = 0; - virtual void init(const std::string& location, const Data& data) = 0; - - virtual void setCallbacks(DataModelCallbacks* callbacks) { - _callbacks = callbacks; - } + uint32_t iteration); - virtual void addExtension(DataModelExtension* ext); - virtual std::string andExpressions(std::list<std::string>) { - return ""; - } + /// @copydoc DataModelImpl::assign() + virtual void assign(const std::string& location, const Data& data); + /// @copydoc DataModelImpl::init() + virtual void init(const std::string& location, const Data& data); -protected: - DataModelCallbacks* _callbacks; -}; + /// @copydoc DataModelImpl::isDeclared() + virtual bool isDeclared(const std::string& expr); -class USCXML_API DataModel { -public: + /// @copydoc DataModelImpl::replaceExpressions() + size_t replaceExpressions(std::string& content); + /// @copydoc DataModelImpl::andExpressions() + std::string andExpressions(std::list<std::string> expressions); - DataModel() : _impl() {} - DataModel(const std::shared_ptr<DataModelImpl> impl) : _impl(impl) { } - DataModel(const DataModel& other) : _impl(other._impl) { } - virtual ~DataModel() {}; - - operator bool() const { - return !!_impl; - } - bool operator< (const DataModel& other) const { - return _impl < other._impl; - } - bool operator==(const DataModel& other) const { - return _impl == other._impl; - } - bool operator!=(const DataModel& other) const { - return _impl != other._impl; - } - DataModel& operator= (const DataModel& other) { - _impl = other._impl; - return *this; - } - - virtual std::list<std::string> getNames() { - TIME_BLOCK - return _impl->getNames(); - } - - virtual bool isValidSyntax(const std::string& expr) { - TIME_BLOCK - return _impl->isValidSyntax(expr); - } - - virtual void setEvent(const Event& event) { - TIME_BLOCK - return _impl->setEvent(event); - } - virtual Data getAsData(const std::string& content) { - TIME_BLOCK - return _impl->getAsData(content); - } - virtual Data evalAsData(const std::string& content) { - TIME_BLOCK - return _impl->evalAsData(content); - } - - virtual bool evalAsBool(const std::string& expr) { - TIME_BLOCK - return _impl->evalAsBool(expr); - } - - virtual uint32_t getLength(const std::string& expr) { - TIME_BLOCK - return _impl->getLength(expr); - } - virtual void setForeach(const std::string& item, - const std::string& array, - const std::string& index, - uint32_t iteration) { - TIME_BLOCK - return _impl->setForeach(item, array, index, iteration); - } - - virtual void assign(const std::string& location, const Data& data) { - TIME_BLOCK - return _impl->assign(location, data); - } - - virtual void init(const std::string& location, const Data& data) { - TIME_BLOCK - return _impl->init(location, data); - } - - virtual bool isDeclared(const std::string& expr) { - TIME_BLOCK - return _impl->isDeclared(expr); - } - - size_t replaceExpressions(std::string& content) { - TIME_BLOCK - return _impl->replaceExpressions(content); - } - - std::string andExpressions(std::list<std::string> expressions) { - TIME_BLOCK - return _impl->andExpressions(expressions); - } - - virtual void setCallbacks(DataModelCallbacks* callbacks) { - TIME_BLOCK - _impl->setCallbacks(callbacks); - } - - virtual void addExtension(DataModelExtension* ext) { - TIME_BLOCK - _impl->addExtension(ext); - } - -#ifdef BUILD_PROFILING - Timer timer; -#endif + /// @copydoc DataModelImpl::addExtension() + virtual void addExtension(DataModelExtension* ext); protected: std::shared_ptr<DataModelImpl> _impl; diff --git a/src/uscxml/plugins/DataModelImpl.h b/src/uscxml/plugins/DataModelImpl.h new file mode 100644 index 0000000..e2795c0 --- /dev/null +++ b/src/uscxml/plugins/DataModelImpl.h @@ -0,0 +1,196 @@ +/** + * @file + * @author 2012-2014 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + +#ifndef DATAMODELIMPL_H_5A33C087 +#define DATAMODELIMPL_H_5A33C087 + +#include "uscxml/config.h" +#include "uscxml/Common.h" +#include "uscxml/plugins/Invoker.h" +#include "uscxml/plugins/IOProcessor.h" + +#include <xercesc/dom/DOM.hpp> + +#include <list> +#include <string> +#include <memory> + +namespace uscxml { + +class InterpreterImpl; +class DataModelImpl; + +/** + * @ingroup datamodel + * @ingroup callback + * Callbacks available for every data-model. + */ +class USCXML_API DataModelCallbacks { +public: + virtual const std::string& getName() = 0; + virtual const std::string& getSessionId() = 0; + virtual const std::map<std::string, IOProcessor>& getIOProcessors() = 0; + virtual bool isInState(const std::string& stateId) = 0; + virtual XERCESC_NS::DOMDocument* getDocument() const = 0; + virtual const std::map<std::string, Invoker>& getInvokers() = 0; +}; + +class USCXML_API DataModelExtension { +public: + DataModelExtension() : dm(NULL) {} + virtual ~DataModelExtension() {} + virtual std::string provides() = 0; + virtual Data getValueOf(const std::string& member) = 0; + virtual void setValueOf(const std::string& member, const Data& data) = 0; + DataModelImpl* dm; +}; + +/** + * @ingroup datamodel + * @ingroup abstract + * Abstract base class for all data-model implementations. + */ +class USCXML_API DataModelImpl { +public: + virtual ~DataModelImpl() {} + + /** + * The Factory wants to instantiate a new instance. + * This function will have to initialize the object. The actual constructor + * is called from within here. The only one who calls the constructor directly + * is the Factory for the prototype object. + * + * @param callbacks The callbacks available to the datamodel + * @return A shared pointer with an initialized instance + */ + virtual std::shared_ptr<DataModelImpl> create(DataModelCallbacks* callbacks) = 0; + + /** + * Return a list of names to be matched by the `datamodel` attribute in SCXML. + */ + virtual std::list<std::string> getNames() = 0; + + /** + * Determine whether a given string constitutes valid syntax in the + * data-model's language. + * @param expr A string, supposedly containing an expression of the data-model. + * @return Whether expr is in L(DM). + */ + virtual bool isValidSyntax(const std::string& expr) { + return true; // overwrite when datamodel supports it + } + + /** + * Set the given event as `_event` in the data-model's global scope. + * @param event The event as it was dequeued from either the internal or external queue. + */ + virtual void setEvent(const Event& event) = 0; + + /** + * Experimental extension to have dynamic content in string literals. + * This function was used to replace ${foo} expressions on the data-model, + * e.g. in text nodes. It will eventually make a reappearance I guess. + * @param content The string with tokens to replace. + * @return How many occurences where replaced. + */ + size_t replaceExpressions(std::string& content); + + ///@name Foreach Support + ///@{ + + // foreach + virtual uint32_t getLength(const std::string& expr) = 0; + virtual void setForeach(const std::string& item, + const std::string& array, + const std::string& index, + uint32_t iteration) = 0; + ///@} + + /** + * Return a string as an *unevaluated* Data object. + * @param content A string with a literal, eppression or compound data-structure in the data-model's language. + * @return An unevaluated structure representing the given compound or literal. + */ + virtual Data getAsData(const std::string& content) = 0; + + /** + * Return a string as an *evaluated* Data object. + * @param content A string with a literal, eppression or compound data-structure in the data-model's language. + * @return An evaluated structure representing the given compound or literal. + */ + virtual Data evalAsData(const std::string& content) = 0; + + /** + * Evaluate a given expression as a boolean. + * This function is a subset of evalAsData() but saves on creating and copying a Data object. + * @param expr An expression in the data-model's language. + * @return Whether the expression evaluates as `true` + */ + virtual bool evalAsBool(const std::string& expr) = 0; + + /** + * Determine whether a given variable / location is declared. + * @param expr The variable / location to check. + * @todo Is this still used? + */ + virtual bool isDeclared(const std::string& expr) = 0; + + /** + * Assign a data object to a location in the data-model. + * There are different occurences in the SCXML IRP tests, e.g. +\verbatim +test147: + <data id="Var1" expr="0"/> + +test150: + <data id="Var3"> + [1,2,3] + </data> + +test277: + <data id="Var1" expr="return"/> +\endverbatim + * @param location A variable or locatio to assign to. + * @param data The Data object with the respective data. + */ + virtual void assign(const std::string& location, const Data& data) = 0; + + /** + * Initialize a variable / location in the data-model with a given data object. + * This is, semantically, very close to assign() but does not assume the + * location to be declared first. + * + * @param location A variable or locatio to assign to. + * @param data The Data object with the respective data. + */ + virtual void init(const std::string& location, const Data& data) = 0; + + + virtual void addExtension(DataModelExtension* ext); + virtual std::string andExpressions(std::list<std::string>) { + return ""; + } + +protected: + DataModelCallbacks* _callbacks; +}; + +} + +#endif /* end of include guard: DATAMODELIMPL_H_5A33C087 */ diff --git a/src/uscxml/plugins/EventHandler.h b/src/uscxml/plugins/EventHandler.h index 401afec..e08b1ad 100644 --- a/src/uscxml/plugins/EventHandler.h +++ b/src/uscxml/plugins/EventHandler.h @@ -21,40 +21,58 @@ #define EVENTHANDLER_H_2801243E #include "uscxml/Common.h" -#include "uscxml/messages/Data.h" #include "uscxml/messages/Event.h" #include <list> #include <string> #include <memory> -#include <sstream> - -#include <xercesc/dom/DOM.hpp> namespace uscxml { class InterpreterImpl; +/** + * @ingroup ioproc + * @ingroup invoker + * @ingroup impl + * Common base class for invokers and i/o processors. + */ + class USCXML_API EventHandlerImpl { public: EventHandlerImpl() {} virtual ~EventHandlerImpl() {} + /** + * Return a list of names for types we implement. + */ virtual std::list<std::string> getNames() = 0; + + /** + * Export a Data object for the `_x['name']` data-model namespace + * @return An object to be represented at `_x['name']` + */ virtual Data getDataModelVariables() = 0; protected: InterpreterImpl* _interpreter; }; +/** + * @ingroup ioproc + * @ingroup invoker + * @ingroup facade + */ class USCXML_API EventHandler { public: PIMPL_OPERATORS(EventHandler); + /// @copydoc EventHandlerImpl::getNames virtual std::list<std::string> getNames() { return _impl->getNames(); } + /// @copydoc EventHandlerImpl::getDataModelVariables virtual Data getDataModelVariables() const { return _impl->getDataModelVariables(); }; diff --git a/src/uscxml/plugins/ExecutableContent.cpp b/src/uscxml/plugins/ExecutableContent.cpp new file mode 100644 index 0000000..349f239 --- /dev/null +++ b/src/uscxml/plugins/ExecutableContent.cpp @@ -0,0 +1,50 @@ +/** + * @file + * @author 2012-2014 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + +#include "ExecutableContent.h" +#include "ExecutableContentImpl.h" + +#include <xercesc/dom/DOM.hpp> +#include <string> +#include <memory> +#include <sstream> + +namespace uscxml { + +std::string ExecutableContent::getLocalName() { + return _impl->getLocalName(); +} + +std::string ExecutableContent::getNamespace() { + return _impl->getNamespace(); +} + +void ExecutableContent::enterElement(XERCESC_NS::DOMElement* node) { + return _impl->enterElement(node); +} + +void ExecutableContent::exitElement(XERCESC_NS::DOMElement* node) { + return _impl->exitElement(node); +} + +bool ExecutableContent::processChildren() { + return _impl->processChildren(); +} + +} diff --git a/src/uscxml/plugins/ExecutableContent.h b/src/uscxml/plugins/ExecutableContent.h index 0190820..14c1d5d 100644 --- a/src/uscxml/plugins/ExecutableContent.h +++ b/src/uscxml/plugins/ExecutableContent.h @@ -20,81 +20,37 @@ #ifndef EXECUTABLECONTENT_H_1E028A2D #define EXECUTABLECONTENT_H_1E028A2D +#include "uscxml/config.h" #include "uscxml/Common.h" + #include <string> #include <memory> #include <sstream> -#include "xercesc/dom/DOM.hpp" - -namespace uscxml { - -class InterpreterImpl; -class USCXML_API ExecutableContentImpl { -public: - ExecutableContentImpl() {}; - virtual ~ExecutableContentImpl() {}; - virtual std::shared_ptr<ExecutableContentImpl> create(InterpreterImpl* interpreter) = 0; +// forward declare +namespace XERCESC_NS { + class DOMElement; +} - virtual void setInterpreter(InterpreterImpl* interpreter) { - _interpreter = interpreter; - } +namespace uscxml { - virtual std::string getLocalName() = 0; ///< The name of the element. - virtual std::string getNamespace() { - return "http://www.w3.org/2005/07/scxml"; ///< The namespace of the element. - } - virtual void enterElement(xercesc::DOMElement* node) = 0; ///< Invoked when entering the element as part of evaluating executable content. - virtual void exitElement(xercesc::DOMElement* node) = 0; ///< Invoked when exiting the element as part of evaluating executable content. - virtual bool processChildren() = 0; ///< Whether or not the interpreter should process this elements children. - -protected: - InterpreterImpl* _interpreter; -}; +class ExecutableContentImpl; +/** + * @ingroup element + * @ingroup facade + * Facade for all executable content implementations. + */ class USCXML_API ExecutableContent { public: - ExecutableContent() : _impl() {} - ExecutableContent(std::shared_ptr<ExecutableContentImpl> const impl) : _impl(impl) { } - ExecutableContent(const ExecutableContent& other) : _impl(other._impl) { } - virtual ~ExecutableContent() {}; - - operator bool() const { - return !!_impl; - } - bool operator< (const ExecutableContent& other) const { - return _impl < other._impl; - } - bool operator==(const ExecutableContent& other) const { - return _impl == other._impl; - } - bool operator!=(const ExecutableContent& other) const { - return _impl != other._impl; - } - ExecutableContent& operator= (const ExecutableContent& other) { - _impl = other._impl; - return *this; - } - - void setInterpreter(InterpreterImpl* interpreter) { - _impl->setInterpreter(interpreter); - } - - std::string getLocalName() { - return _impl->getLocalName(); - } - std::string getNamespace() { - return _impl->getNamespace(); - } - void enterElement(xercesc::DOMElement* node) { - return _impl->enterElement(node); - } - void exitElement(xercesc::DOMElement* node) { - return _impl->exitElement(node); - } - bool processChildren() { - return _impl->processChildren(); - } + PIMPL_OPERATORS(ExecutableContent); + + std::string getLocalName(); + std::string getNamespace(); + void enterElement(XERCESC_NS::DOMElement* node); + void exitElement(XERCESC_NS::DOMElement* node); + bool processChildren(); + protected: std::shared_ptr<ExecutableContentImpl> _impl; diff --git a/src/uscxml/plugins/ExecutableContentImpl.h b/src/uscxml/plugins/ExecutableContentImpl.h new file mode 100644 index 0000000..d033d1e --- /dev/null +++ b/src/uscxml/plugins/ExecutableContentImpl.h @@ -0,0 +1,65 @@ +/** + * @file + * @author 2012-2014 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + +#ifndef EXECUTABLECONTENTIMPL_H_CCE9F02D +#define EXECUTABLECONTENTIMPL_H_CCE9F02D + +#include "uscxml/config.h" +#include "uscxml/Common.h" + +#include <xercesc/dom/DOM.hpp> +#include <string> +#include <memory> +#include <sstream> + +namespace uscxml { + +class InterpreterImpl; + +/** + * @ingroup element + * @ingroup impl + * Abstract base class fo all elements of executable content. + */ +class USCXML_API ExecutableContentImpl { +public: + ExecutableContentImpl() {}; + virtual ~ExecutableContentImpl() {}; + virtual std::shared_ptr<ExecutableContentImpl> create(InterpreterImpl* interpreter) = 0; + + virtual void setInterpreter(InterpreterImpl* interpreter) { + _interpreter = interpreter; + } + + virtual std::string getLocalName() = 0; ///< The name of the element. + virtual std::string getNamespace() { + return "http://www.w3.org/2005/07/scxml"; ///< The namespace of the element. + } + virtual void enterElement(XERCESC_NS::DOMElement* node) = 0; ///< Invoked when entering the element as part of evaluating executable content. + virtual void exitElement(XERCESC_NS::DOMElement* node) = 0; ///< Invoked when exiting the element as part of evaluating executable content. + virtual bool processChildren() = 0; ///< Whether or not the interpreter should process this elements children. + +protected: + InterpreterImpl* _interpreter; +}; + + +} + +#endif /* end of include guard: EXECUTABLECONTENTIMPL_H_CCE9F02D */ diff --git a/src/uscxml/plugins/Factory.cpp b/src/uscxml/plugins/Factory.cpp index 7c68a30..3600dd1 100644 --- a/src/uscxml/plugins/Factory.cpp +++ b/src/uscxml/plugins/Factory.cpp @@ -24,6 +24,8 @@ #include "uscxml/Interpreter.h" #include <easylogging++.h> +#include "uscxml/plugins/ExecutableContentImpl.h" + // see http://nadeausoftware.com/articles/2012/01/c_c_tip_how_use_compiler_predefined_macros_detect_operating_system // we will always include these in a build @@ -275,7 +277,6 @@ std::shared_ptr<DataModelImpl> Factory::createDataModel(const std::string& type, std::string canonicalName = _dataModelAliases[type]; if (_dataModels.find(canonicalName) != _dataModels.end()) { std::shared_ptr<DataModelImpl> dataModel = _dataModels[canonicalName]->create(callbacks); - dataModel->setCallbacks(callbacks); return dataModel; } } diff --git a/src/uscxml/plugins/Factory.h b/src/uscxml/plugins/Factory.h index 0ce2af9..e0015b5 100644 --- a/src/uscxml/plugins/Factory.h +++ b/src/uscxml/plugins/Factory.h @@ -26,7 +26,7 @@ #include "uscxml/plugins/EventHandler.h" #include "uscxml/plugins/IOProcessor.h" #include "uscxml/plugins/Invoker.h" -#include "uscxml/plugins/DataModel.h" +#include "uscxml/plugins/DataModelImpl.h" #include <string.h> diff --git a/src/uscxml/plugins/IOProcessor.cpp b/src/uscxml/plugins/IOProcessor.cpp new file mode 100644 index 0000000..435d3b6 --- /dev/null +++ b/src/uscxml/plugins/IOProcessor.cpp @@ -0,0 +1,37 @@ +/** + * @file + * @author 2012-2014 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + +#include "IOProcessor.h" +#include "IOProcessorImpl.h" + +namespace uscxml { + +PIMPL_OPERATORS_INHERIT_IMPL(IOProcessor, EventHandler) + +void IOProcessor::eventFromSCXML(const std::string& target, const Event& event) { + _impl->eventFromSCXML(target, event); +} + +bool IOProcessor::isValidTarget(const std::string& target) { + return _impl->isValidTarget(target); +} + + +} + diff --git a/src/uscxml/plugins/IOProcessor.h b/src/uscxml/plugins/IOProcessor.h index c7d90e5..558edfa 100644 --- a/src/uscxml/plugins/IOProcessor.h +++ b/src/uscxml/plugins/IOProcessor.h @@ -26,31 +26,25 @@ namespace uscxml { +class IOProcessorImpl; class InterpreterImpl; -class USCXML_API IOProcessorImpl : public EventHandlerImpl { -public: - - virtual std::shared_ptr<IOProcessorImpl> create(InterpreterImpl* interpreter) = 0; - virtual void eventFromSCXML(const std::string& target, const Event& event) = 0; - virtual bool isValidTarget(const std::string& target) = 0; - -protected: - void eventToSCXML(Event& event, const std::string& type, const std::string& origin, bool internal = false); - -}; - +/** + * @ingroup ioproc + * @ingroup facade + * Facade for I/O processors. + */ class USCXML_API IOProcessor : public EventHandler { public: - PIMPL_OPERATORS2(IOProcessor, EventHandler) - virtual void eventFromSCXML(const std::string& target, const Event& event) { - _impl->eventFromSCXML(target, event); - } + PIMPL_OPERATORS_INHERIT(IOProcessor, EventHandler); + + /// @copydoc IOProcessorImpl::eventFromSCXML + virtual void eventFromSCXML(const std::string& target, const Event& event); + + /// @copydoc IOProcessorImpl::isValidTarget + virtual bool isValidTarget(const std::string& target); - virtual bool isValidTarget(const std::string& target) { - return _impl->isValidTarget(target); - } protected: std::shared_ptr<IOProcessorImpl> _impl; diff --git a/src/uscxml/plugins/IOProcessorImpl.h b/src/uscxml/plugins/IOProcessorImpl.h new file mode 100644 index 0000000..0e5b44a --- /dev/null +++ b/src/uscxml/plugins/IOProcessorImpl.h @@ -0,0 +1,74 @@ +/** + * @file + * @author 2012-2014 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + +#ifndef IOPROCESSORIMPL_H_92E6AA44 +#define IOPROCESSORIMPL_H_92E6AA44 + + +#include "uscxml/Common.h" +#include "uscxml/plugins/EventHandler.h" +#include "uscxml/messages/Event.h" + +namespace uscxml { + +/** + * @ingroup ioproc + * @ingroup abstract + * Abstract base class for IOProcessor%s implementations. + */ +class USCXML_API IOProcessorImpl : public EventHandlerImpl { +public: + + /** + * Factory demands a new instance. + * @param interpreter The imlementation of the associated Interpreter + * @todo We will eventually introduce callbacks and prevent complete access to the interpreter. + */ + virtual std::shared_ptr<IOProcessorImpl> create(InterpreterImpl* interpreter) = 0; + + /** + * We received an event from the SCXML Interpreter we are associated with. + * @param target Where the event is supposed to be delivered to. + * @param event The event to deliver. + */ + virtual void eventFromSCXML(const std::string& target, const Event& event) = 0; + + /** + * Determine whether the given target is a valid destination for events. + * @param target A target where the Interpreter wants to deliver Event%s to. + * @return Whether or not the target is valid. + */ + virtual bool isValidTarget(const std::string& target) = 0; + +protected: + /** + * Return an event to the SCXML Interpreter instance. + * @param event An event to enqueue at the interpreter's external queue. + * @param type The type of this I/O Processor for `event.origintype`. + * @param origin The origin of this I/O Processor for `event.origin`. + * @param internal If the event is to be delivered to the Interpreter's internal queue instead. + */ + void eventToSCXML(Event& event, const std::string& type, const std::string& origin, bool internal = false); + +}; + +} + + +#endif /* end of include guard: IOPROCESSORIMPL_H_92E6AA44 */ diff --git a/src/uscxml/plugins/Invoker.cpp b/src/uscxml/plugins/Invoker.cpp new file mode 100644 index 0000000..a021ff7 --- /dev/null +++ b/src/uscxml/plugins/Invoker.cpp @@ -0,0 +1,43 @@ +/** + * @file + * @author 2012-2014 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + +#include "Invoker.h" +#include "InvokerImpl.h" + +namespace uscxml { + +PIMPL_OPERATORS_INHERIT_IMPL(Invoker, EventHandler) + +void Invoker::invoke(const std::string& source, const Event& invokeEvent) { + _impl->invoke(source, invokeEvent); +} + +void Invoker::uninvoke() { + _impl->uninvoke(); +} + +void Invoker::eventFromSCXML(const Event& event) { + _impl->eventFromSCXML(event); +} + +XERCESC_NS::DOMElement* Invoker::getFinalize() { + return _impl->getFinalize(); +} + +} diff --git a/src/uscxml/plugins/Invoker.h b/src/uscxml/plugins/Invoker.h index c22b7e3..33a89d6 100644 --- a/src/uscxml/plugins/Invoker.h +++ b/src/uscxml/plugins/Invoker.h @@ -21,63 +21,42 @@ #define INVOKER_H_CAC11892 +#include "uscxml/config.h" #include "uscxml/Common.h" #include "uscxml/plugins/EventHandler.h" #include "uscxml/messages/Event.h" +#include <xercesc/dom/DOM.hpp> -namespace uscxml { - -class Interpreter; - -class USCXML_API InvokerImpl : public EventHandlerImpl { -public: - InvokerImpl() : _finalize(NULL) {}; - virtual ~InvokerImpl() {} - virtual std::list<std::string> getNames() = 0; - - virtual void invoke(const std::string& source, const Event& invokeEvent) = 0; - virtual void uninvoke() = 0; - - virtual void eventFromSCXML(const Event& event) = 0; - - virtual std::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter) = 0; - virtual xercesc::DOMElement* getFinalize() { - return _finalize; - } - virtual void setFinalize(xercesc::DOMElement* finalize) { - _finalize = finalize; - } - virtual void setInvokeId(const std::string& invokeId) { - _invokeId = invokeId; - } - -protected: - void eventToSCXML(Event& event, const std::string& type, const std::string& invokeId, bool internal = false); +namespace XERCESC_NS { + class DOMDocument; + class DOMNode; +} - xercesc::DOMElement* _finalize; - std::string _invokeId; +namespace uscxml { -}; +class InvokerImpl; +/** + * @ingroup invoker + * @ingroup facade + * Facade for invoker implementation. + */ class USCXML_API Invoker : public EventHandler { public: - PIMPL_OPERATORS2(Invoker, EventHandler); + PIMPL_OPERATORS_INHERIT(Invoker, EventHandler); + + /// @copydoc InvokerImpl::invoke + virtual void invoke(const std::string& source, const Event& invokeEvent); - virtual void invoke(const std::string& source, const Event& invokeEvent) { - _impl->invoke(source, invokeEvent); - } + /// @copydoc InvokerImpl::uninvoke + virtual void uninvoke(); - virtual void uninvoke() { - _impl->uninvoke(); - } + /// @copydoc InvokerImpl::eventFromSCXML + virtual void eventFromSCXML(const Event& event); - virtual void eventFromSCXML(const Event& event) { - _impl->eventFromSCXML(event); - } + /// @copydoc InvokerImpl::getFinalize + virtual XERCESC_NS::DOMElement* getFinalize(); - virtual xercesc::DOMElement* getFinalize() { - return _impl->getFinalize(); - } protected: std::shared_ptr<InvokerImpl> _impl; }; diff --git a/src/uscxml/plugins/InvokerImpl.h b/src/uscxml/plugins/InvokerImpl.h new file mode 100644 index 0000000..d8a3410 --- /dev/null +++ b/src/uscxml/plugins/InvokerImpl.h @@ -0,0 +1,110 @@ +/** + * @file + * @author 2012-2014 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + +#ifndef INVOKERIMPL_H_8A15A102 +#define INVOKERIMPL_H_8A15A102 + + +#include "uscxml/config.h" +#include "uscxml/Common.h" +#include "uscxml/plugins/EventHandler.h" +#include "uscxml/messages/Event.h" + +namespace uscxml { + +class Interpreter; + +/** + * @ingroup invoker + * @ingroup abstract + * Abstract base class for all invokers. + */ +class USCXML_API InvokerImpl : public EventHandlerImpl { +public: + InvokerImpl() : _finalize(NULL) {}; + virtual ~InvokerImpl() {} + + virtual std::list<std::string> getNames() = 0; + + /** + * Factory demands a new instance. + * @param interpreter The imlementation of the associated Interpreter + * @todo We will eventually introduce callbacks and prevent complete access to the interpreter. + */ + virtual std::shared_ptr<InvokerImpl> create(InterpreterImpl* interpreter) = 0; + + /** + * Invoker's parent state became active at the end of a macro-step. + * @param source The content of the invoke's `src` or evaluated `srcexpr` attribute + * @param invokeEvent The invocation with all its data as an event + */ + virtual void invoke(const std::string& source, const Event& invokeEvent) = 0; + + /** + * The invokers's parent state was left at the end of a macro-step. + */ + virtual void uninvoke() = 0; + + /** + * Interpreter received an event from the SCXML Interpreter. + */ + virtual void eventFromSCXML(const Event& event) = 0; + + /** + * Return the finalize XML element associated with this invoker. + */ + virtual XERCESC_NS::DOMElement* getFinalize() { + return _finalize; + } + + /** + * Set the finalize XML element associated with this invoker. + * @param finalize The finalize XMl element. + */ + virtual void setFinalize(XERCESC_NS::DOMElement* finalize) { + _finalize = finalize; + } + + /** + * Set the invocation identifier as required when returning events. + * @param invokeId The invocation identifier. + */ + virtual void setInvokeId(const std::string& invokeId) { + _invokeId = invokeId; + } + +protected: + /** + * Return an event to the SCXML Interpreter instance. + * @param event An event to enqueue at the interpreter's external queue. + * @param type The type of this I/O Processor for `event.origintype`. + * @param invokeId The invocation identifier of this invocation for `event.invokeid`. + * @param internal If the event is to be delivered to the Interpreter's internal queue instead. + */ + void eventToSCXML(Event& event, const std::string& type, const std::string& invokeId, bool internal = false); + + XERCESC_NS::DOMElement* _finalize; + std::string _invokeId; + +}; + +} + + +#endif /* end of include guard: INVOKERIMPL_H_8A15A102 */ diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp index d43efbe..35d9c4b 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp +++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.cpp @@ -43,12 +43,12 @@ if (exception) \ handleException(exception); -using namespace xercesc; +using namespace XERCESC_NS; static JSValueRef XMLString2JS(const XMLCh* input, JSContextRef context) { JSValueRef output; - char* res = xercesc::XMLString::transcode(input); + char* res = XERCESC_NS::XMLString::transcode(input); JSStringRef stringRef = JSStringCreateWithUTF8CString(res); output = JSValueMakeString(context, stringRef); @@ -70,7 +70,7 @@ static XMLCh* JS2XMLString(JSValueRef input, JSContextRef context) { char* output = new char[maxSize + 1]; JSStringGetUTF8CString(stringInput, output, maxSize); - XMLCh* ret = xercesc::XMLString::transcode(output); + XMLCh* ret = XERCESC_NS::XMLString::transcode(output); return(ret); } @@ -509,7 +509,7 @@ Data JSCDataModel::getValueAsData(const JSValueRef value) { // dom node void* privData = NULL; SWIG_JSC_ConvertPtr(_ctx, value, &privData, SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMNode, 0); - data.node = (xercesc::DOMNode*)privData; + data.node = (XERCESC_NS::DOMNode*)privData; return data; } std::set<std::string> propertySet; diff --git a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h index b65dc37..c5129a4 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h +++ b/src/uscxml/plugins/datamodel/ecmascript/JavaScriptCore/JSCDataModel.h @@ -21,14 +21,10 @@ #define JSCDATAMODEL_H_KN8TWG0V #include "uscxml/config.h" -#include "uscxml/plugins/DataModel.h" +#include "uscxml/plugins/DataModelImpl.h" #include <list> #include <set> -/** - * There are two variants with JavaScriptCore headers - * Still beats the >20 V8 variants =D - */ #if defined(HAS_JSC_JAVASCRIPTCORE_H) #include <JavaScriptCore/JavaScriptCore.h> #elif defined(HAS_JSC_JAVASCRIPT_H) @@ -48,6 +44,11 @@ class Data; namespace uscxml { +/** + * @ingroup datamodel + * + * ECMAScript data-model via JavaScriptCore. + */ class JSCDataModel : public DataModelImpl { public: JSCDataModel(); @@ -103,7 +104,7 @@ protected: static JSValueRef jsInvokerGetProp(JSContextRef ctx, JSObjectRef object, JSStringRef propertyName, JSValueRef* exception); static void jsInvokerListProps(JSContextRef ctx, JSObjectRef object, JSPropertyNameAccumulatorRef propertyNames); - JSValueRef getNodeAsValue(const xercesc::DOMNode* node); + JSValueRef getNodeAsValue(const XERCESC_NS::DOMNode* node); JSValueRef getDataAsValue(const Data& data); Data getValueAsData(const JSValueRef value); JSValueRef evalAsValue(const std::string& expr, bool dontThrow = false); diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp index bfa29d8..3ccadcd 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp +++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.cpp @@ -33,17 +33,17 @@ #include "uscxml/util/DOM.h" #include <easylogging++.h> -using namespace xercesc; +using namespace XERCESC_NS; static v8::Local<v8::Value> XMLString2JS(const XMLCh* input) { - char* res = xercesc::XMLString::transcode(input); + char* res = XERCESC_NS::XMLString::transcode(input); v8::Local<v8::Value> handle = v8::String::New(res); return handle; } static XMLCh* JS2XMLString(const v8::Local<v8::Value>& value) { v8::String::AsciiValue s(value); - XMLCh* ret = xercesc::XMLString::transcode(*s); + XMLCh* ret = XERCESC_NS::XMLString::transcode(*s); return(ret); } @@ -137,11 +137,11 @@ std::mutex V8DataModel::_initMutex; v8::Isolate* V8DataModel::_isolate = NULL; void V8NodeListIndexedPropertyHandler(uint32_t index, const v8::PropertyCallbackInfo<v8::Value>& info) { - xercesc::DOMNodeList* list; + XERCESC_NS::DOMNodeList* list; SWIG_V8_GetInstancePtr(info.Holder(), (void**)&list); if (list->getLength() >= index) { - xercesc::DOMNode* node = list->item(index); + XERCESC_NS::DOMNode* node = list->item(index); v8::Handle<v8::Value> val = SWIG_NewPointerObj(SWIG_as_voidptr(node), SWIG_TypeDynamicCast(SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMNode, SWIG_as_voidptrptr(&node)), 0 | 0 ); info.GetReturnValue().Set(val); @@ -528,7 +528,7 @@ Data V8DataModel::getValueAsData(const v8::Local<v8::Value>& value, std::set<v8: return data; } -v8::Local<v8::Value> V8DataModel::getNodeAsValue(const xercesc::DOMNode* node) { +v8::Local<v8::Value> V8DataModel::getNodeAsValue(const XERCESC_NS::DOMNode* node) { return SWIG_NewPointerObj(SWIG_as_voidptr(node), SWIG_TypeDynamicCast(SWIGTYPE_p_XERCES_CPP_NAMESPACE__DOMNode, SWIG_as_voidptrptr(&node)), diff --git a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h index 29b2b58..91ac48d 100644 --- a/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h +++ b/src/uscxml/plugins/datamodel/ecmascript/v8/V8DataModel.h @@ -20,7 +20,8 @@ #ifndef V8DATAMODEL_H_KN8TWG0V #define V8DATAMODEL_H_KN8TWG0V -#include "uscxml/plugins/DataModel.h" +#include "uscxml/plugins/DataModelImpl.h" + #include <list> #include <set> #include <v8.h> @@ -36,6 +37,11 @@ class Data; namespace uscxml { +/** + * @ingroup datamodel + * ECMAScript data-model via Google's V8. + */ + class V8DataModel : public DataModelImpl { public: V8DataModel(); @@ -95,7 +101,7 @@ protected: v8::Local<v8::Value> evalAsValue(const std::string& expr, bool dontThrow = false); v8::Local<v8::Value> getDataAsValue(const Data& data); Data getValueAsData(const v8::Local<v8::Value>& value); - v8::Local<v8::Value> getNodeAsValue(const xercesc::DOMNode* node); + v8::Local<v8::Value> getNodeAsValue(const XERCESC_NS::DOMNode* node); void throwExceptionEvent(const v8::TryCatch& tryCatch); std::set<DataModelExtension*> _extensions; diff --git a/src/uscxml/plugins/datamodel/lua/LuaDataModel.h b/src/uscxml/plugins/datamodel/lua/LuaDataModel.h index 4e2fd43..7b7121f 100644 --- a/src/uscxml/plugins/datamodel/lua/LuaDataModel.h +++ b/src/uscxml/plugins/datamodel/lua/LuaDataModel.h @@ -20,7 +20,7 @@ #ifndef LUADATAMODEL_H_113E014C #define LUADATAMODEL_H_113E014C -#include "uscxml/plugins/DataModel.h" +#include "uscxml/plugins/DataModelImpl.h" #include <list> extern "C" { @@ -41,6 +41,11 @@ class Data; namespace uscxml { +/** + * @ingroup datamodel + * Lua data-model. + */ + class LuaDataModel : public DataModelImpl { public: LuaDataModel(); diff --git a/src/uscxml/plugins/datamodel/null/NULLDataModel.cpp b/src/uscxml/plugins/datamodel/null/NULLDataModel.cpp index 773a970..53c414f 100644 --- a/src/uscxml/plugins/datamodel/null/NULLDataModel.cpp +++ b/src/uscxml/plugins/datamodel/null/NULLDataModel.cpp @@ -63,7 +63,7 @@ Data NULLDataModel::getAsData(const std::string& content) { * The predicate must return 'true' if and only if that state is in the current * state configuration. */ -bool NULLDataModel::evalAsBool(const xercesc::DOMElement* scriptNode, const std::string& expr) { +bool NULLDataModel::evalAsBool(const XERCESC_NS::DOMElement* scriptNode, const std::string& expr) { std::string trimmedExpr = expr; boost::trim(trimmedExpr); if (!boost::istarts_with(trimmedExpr, "in")) diff --git a/src/uscxml/plugins/datamodel/null/NULLDataModel.h b/src/uscxml/plugins/datamodel/null/NULLDataModel.h index c584357..4bea664 100644 --- a/src/uscxml/plugins/datamodel/null/NULLDataModel.h +++ b/src/uscxml/plugins/datamodel/null/NULLDataModel.h @@ -20,7 +20,7 @@ #ifndef NULLDATAMODEL_H_KN8TWG0V #define NULLDATAMODEL_H_KN8TWG0V -#include "uscxml/plugins/DataModel.h" +#include "uscxml/plugins/DataModelImpl.h" #include <list> #ifdef BUILD_AS_PLUGINS @@ -34,6 +34,10 @@ class Data; namespace uscxml { +/** + * @ingroup datamodel + * NULL data-model. + */ class NULLDataModel : public DataModelImpl { public: NULLDataModel(); @@ -76,7 +80,7 @@ public: return expr; } - virtual bool evalAsBool(const xercesc::DOMElement* scriptNode, + virtual bool evalAsBool(const XERCESC_NS::DOMElement* scriptNode, const std::string& expr); virtual bool evalAsBool(const std::string& expr) { return evalAsBool(NULL, expr); @@ -86,13 +90,13 @@ public: return true; } - virtual void assign(const xercesc::DOMElement* assignElem, - const xercesc::DOMNode* node, + virtual void assign(const XERCESC_NS::DOMElement* assignElem, + const XERCESC_NS::DOMNode* node, const std::string& content) {} virtual void assign(const std::string& location, const Data& data) {} - virtual void init(const xercesc::DOMElement* dataElem, - const xercesc::DOMNode* node, + virtual void init(const XERCESC_NS::DOMElement* dataElem, + const XERCESC_NS::DOMNode* node, const std::string& content) {} virtual void init(const std::string& location, const Data& data) {} diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp index 4d3c579..f80d427 100644 --- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp +++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.cpp @@ -32,7 +32,7 @@ namespace uscxml { // msxml.h should die in a fire for polluting the global namespace -// using namespace xercesc; +// using namespace XERCESC_NS; #ifdef BUILD_AS_PLUGINS PLUMA_CONNECTOR @@ -136,11 +136,11 @@ void USCXMLInvoker::invoke(const std::string& source, const Event& invokeEvent) if (source.length() > 0) { _invokedInterpreter = Interpreter::fromURL(source); } else if (invokeEvent.data.node) { - xercesc::DOMImplementation* implementation = xercesc::DOMImplementationRegistry::getDOMImplementation(X("core")); - xercesc::DOMDocument* document = implementation->createDocument(); + XERCESC_NS::DOMImplementation* implementation = XERCESC_NS::DOMImplementationRegistry::getDOMImplementation(X("core")); + XERCESC_NS::DOMDocument* document = implementation->createDocument(); // we need to import the parent - to support xpath test150 - xercesc::DOMNode* newNode = document->importNode(invokeEvent.data.node, true); + XERCESC_NS::DOMNode* newNode = document->importNode(invokeEvent.data.node, true); document->appendChild(newNode); // std::cout << *document << std::endl; diff --git a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h index dac8d8b..f896bac 100644 --- a/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h +++ b/src/uscxml/plugins/invoker/scxml/USCXMLInvoker.h @@ -20,8 +20,11 @@ #ifndef USCXMLINVOKER_H_OQFA21IO #define USCXMLINVOKER_H_OQFA21IO -#include <uscxml/Interpreter.h> -#include "uscxml/interpreter/EventQueueImpl.h" +#include "uscxml/interpreter/InterpreterImpl.h" +#include "uscxml/interpreter/BasicEventQueue.h" + +#include "uscxml/plugins/Invoker.h" +#include "uscxml/plugins/InvokerImpl.h" #ifdef BUILD_AS_PLUGINS #include "uscxml/plugins/Plugins.h" @@ -31,11 +34,15 @@ namespace uscxml { +/** +* @ingroup invoker + * An invoker for other SCXML instances. + */ class USCXMLInvoker : public InvokerImpl, public std::enable_shared_from_this<USCXMLInvoker> { public: - class ParentQueueImpl : public EventQueueImpl { + class ParentQueueImpl : public BasicEventQueue { public: ParentQueueImpl(USCXMLInvoker* invoker) : _invoker(invoker) {} virtual void enqueue(const Event& event); diff --git a/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.h b/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.h index f7e9f10..b70ce8e 100644 --- a/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.h +++ b/src/uscxml/plugins/ioprocessor/basichttp/BasicHTTPIOProcessor.h @@ -36,8 +36,9 @@ extern "C" { #endif #include "uscxml/server/HTTPServer.h" -#include "uscxml/Interpreter.h" -#include "uscxml/plugins/Factory.h" +#include "uscxml/interpreter/InterpreterImpl.h" +#include "uscxml/plugins/IOProcessorImpl.h" + #ifndef _WIN32 #include <sys/time.h> #endif @@ -50,6 +51,10 @@ extern "C" { namespace uscxml { +/** + * @ingroup ioproc + * The basichttp I/O processor as per standard. + */ class USCXML_PLUGIN_API BasicHTTPIOProcessor : public IOProcessorImpl, public HTTPServlet, public URLMonitor { public: BasicHTTPIOProcessor(); diff --git a/src/uscxml/plugins/ioprocessor/scxml/SCXMLIOProcessor.h b/src/uscxml/plugins/ioprocessor/scxml/SCXMLIOProcessor.h index 3b08e30..21fd13a 100644 --- a/src/uscxml/plugins/ioprocessor/scxml/SCXMLIOProcessor.h +++ b/src/uscxml/plugins/ioprocessor/scxml/SCXMLIOProcessor.h @@ -20,10 +20,14 @@ #ifndef SCXMLIOProcessor_H_2CUY93KU #define SCXMLIOProcessor_H_2CUY93KU -#include "uscxml/plugins/IOProcessor.h" +#include "uscxml/plugins/IOProcessorImpl.h" namespace uscxml { +/** + * @ingroup ioproc + * The scxml I/O processor as per standard. + */ class SCXMLIOProcessor : public IOProcessorImpl { public: SCXMLIOProcessor(); diff --git a/src/uscxml/transform/ChartToC.cpp b/src/uscxml/transform/ChartToC.cpp index 4891bfe..d7537ea 100644 --- a/src/uscxml/transform/ChartToC.cpp +++ b/src/uscxml/transform/ChartToC.cpp @@ -33,7 +33,7 @@ namespace uscxml { -using namespace xercesc; +using namespace XERCESC_NS; // many more tricks: https://graphics.stanford.edu/~seander/bithacks.html @@ -41,7 +41,7 @@ using namespace xercesc; Transformer ChartToC::transform(const Interpreter& other) { ChartToC* c2c = new ChartToC(other); - return boost::shared_ptr<TransformerImpl>(c2c); + return std::shared_ptr<TransformerImpl>(c2c); } ChartToC::ChartToC(const Interpreter& other) : TransformerImpl(other), _topMostMachine(NULL), _parentMachine(NULL) { @@ -69,7 +69,7 @@ ChartToC::ChartToC(const Interpreter& other) : TransformerImpl(other), _topMostM void ChartToC::setHistoryCompletion() { - std::list<DOMElement*> histories = DOMUtils::inPostFixOrder({ XML_PREFIX(_scxml).str() + "history" }, _scxml); + std::list<DOMElement*> histories = DOMUtils::inPostFixOrder({ XML_PREFIX(_scxml).str() + "history" }, _scxml); std::list<DOMElement*> covered; std::list<DOMElement*> perParentcovered; @@ -245,14 +245,14 @@ void ChartToC::prepare() { // make sure initial and history elements always precede propoer states resortStates(_scxml); - std::list<xercesc::DOMElement*> tmp = DOMUtils::inDocumentOrder({ - XML_PREFIX(_scxml).str() + "scxml", - XML_PREFIX(_scxml).str() + "state", - XML_PREFIX(_scxml).str() + "final", - XML_PREFIX(_scxml).str() + "history", - XML_PREFIX(_scxml).str() + "initial", - XML_PREFIX(_scxml).str() + "parallel" - }, _scxml); + std::list<XERCESC_NS::DOMElement*> tmp = DOMUtils::inDocumentOrder({ + XML_PREFIX(_scxml).str() + "scxml", + XML_PREFIX(_scxml).str() + "state", + XML_PREFIX(_scxml).str() + "final", + XML_PREFIX(_scxml).str() + "history", + XML_PREFIX(_scxml).str() + "initial", + XML_PREFIX(_scxml).str() + "parallel" + }, _scxml); _states.insert(_states.end(), tmp.begin(), tmp.end()); // set states' document order and parent attribute @@ -297,7 +297,7 @@ void ChartToC::prepare() { // set transitions' document order and source attribute - tmp = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "transition" }, _scxml); + tmp = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "transition" }, _scxml); size_t index = 0; for (auto transIter = tmp.begin(); transIter != tmp.end(); transIter++, index++) { DOMElement* transition = *transIter; @@ -1027,7 +1027,7 @@ void ChartToC::writeHelpers(std::ostream& stream) { void ChartToC::writeExecContentFinalize(std::ostream& stream) { // needs to be written prior to invocation elem info - std::list<DOMElement*> finalizes = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "finalize" }, _scxml); + std::list<DOMElement*> finalizes = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "finalize" }, _scxml); if (finalizes.size() > 0) { stream << "#ifndef USCXML_NO_EXEC_CONTENT" << std::endl; @@ -1497,7 +1497,7 @@ void ChartToC::writeElementInfo(std::ostream& stream) { stream << "#ifndef USCXML_NO_ELEM_INFO" << std::endl; stream << std::endl; - std::list<DOMElement*> foreachs = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "foreach" }, _scxml); + std::list<DOMElement*> foreachs = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "foreach" }, _scxml); if (foreachs.size() > 0) { _hasElement.insert("foreach"); stream << "static const uscxml_elem_foreach " << _prefix << "_elem_foreachs[" << foreachs.size() << "] = {" << std::endl; @@ -1516,7 +1516,7 @@ void ChartToC::writeElementInfo(std::ostream& stream) { stream << std::endl; } - std::list<DOMElement*> assigns = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "assign" }, _scxml); + std::list<DOMElement*> assigns = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "assign" }, _scxml); if (assigns.size() > 0) { _hasElement.insert("assign"); stream << "static const uscxml_elem_assign " << _prefix << "_elem_assigns[" << assigns.size() << "] = {" << std::endl; @@ -1549,7 +1549,7 @@ void ChartToC::writeElementInfo(std::ostream& stream) { } - std::list<DOMElement*> datas = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "data" }, _scxml); + std::list<DOMElement*> datas = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "data" }, _scxml); if (datas.size() > 0) { _hasElement.insert("data"); size_t dataIndexOffset = 0; @@ -1607,7 +1607,7 @@ void ChartToC::writeElementInfo(std::ostream& stream) { stream << std::endl; } - std::list<DOMElement*> params = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "param" }, _scxml); + std::list<DOMElement*> params = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "param" }, _scxml); if (params.size() > 0) { _hasElement.insert("param"); DOMNode* parent = NULL; @@ -1644,7 +1644,7 @@ void ChartToC::writeElementInfo(std::ostream& stream) { stream << std::endl; } - std::list<DOMElement*> sends = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "send" }, _scxml); + std::list<DOMElement*> sends = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "send" }, _scxml); if (sends.size() > 0) { _hasElement.insert("send"); stream << "static const uscxml_elem_send " << _prefix << "_elem_sends[" << sends.size() << "] = {" << std::endl; @@ -1708,7 +1708,7 @@ void ChartToC::writeElementInfo(std::ostream& stream) { stream << std::endl; } - std::list<DOMElement*> donedatas = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "donedata" }, _scxml); + std::list<DOMElement*> donedatas = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "donedata" }, _scxml); stream << "static const uscxml_elem_donedata " << _prefix << "_elem_donedatas[" << donedatas.size() + 1 << "] = {" << std::endl; stream << " /* source, content, contentexpr, params */" << std::endl; size_t i = 0; @@ -1970,7 +1970,7 @@ void ChartToC::writeTransitions(std::ostream& stream) { stream << std::endl; // cross reference transition by document order - is this really needed?! - std::list<DOMElement*> transDocOrder = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "transition" }, _scxml); + std::list<DOMElement*> transDocOrder = DOMUtils::inDocumentOrder({ XML_PREFIX(_scxml).str() + "transition" }, _scxml); if (_transitions.size() > 0) { stream << "static const uscxml_transition " << _prefix << "_transitions[" << toStr(_transitions.size()) << "] = {" << std::endl; diff --git a/src/uscxml/transform/ChartToC.h b/src/uscxml/transform/ChartToC.h index a34a2e0..43ffc45 100644 --- a/src/uscxml/transform/ChartToC.h +++ b/src/uscxml/transform/ChartToC.h @@ -58,9 +58,9 @@ protected: void writeFSM(std::ostream& stream); void writeCharArrayInitList(std::ostream& stream, const std::string& boolString); - void writeExecContent(std::ostream& stream, const xercesc::DOMNode* node, int indent = 0); + void writeExecContent(std::ostream& stream, const XERCESC_NS::DOMNode* node, int indent = 0); - void resortStates(xercesc::DOMNode* node); + void resortStates(XERCESC_NS::DOMNode* node); void setHistoryCompletion(); void setStateCompletion(); void prepare(); @@ -69,8 +69,8 @@ protected: Interpreter interpreter; - std::vector<xercesc::DOMElement*> _states; - std::vector<xercesc::DOMElement*> _transitions; + std::vector<XERCESC_NS::DOMElement*> _states; + std::vector<XERCESC_NS::DOMElement*> _transitions; std::string _md5; std::string _prefix; diff --git a/src/uscxml/transform/ChartToVHDL.h b/src/uscxml/transform/ChartToVHDL.h index 3d8b00d..89af6fd 100644 --- a/src/uscxml/transform/ChartToVHDL.h +++ b/src/uscxml/transform/ChartToVHDL.h @@ -191,15 +191,15 @@ protected: // event generation void writeExContentBlock(std::ostream & stream, std::string index, - std::list<xercesc::DOMElement*> commandSequence); + std::list<XERCESC_NS::DOMElement*> commandSequence); Trie _eventTrie; - std::list<xercesc::DOMElement*> _execContent; + std::list<XERCESC_NS::DOMElement*> _execContent; private: std::string eventNameEscape(const std::string& eventName); - std::string getLineForExecContent(const xercesc::DOMElement* elem); + std::string getLineForExecContent(const XERCESC_NS::DOMElement* elem); }; diff --git a/src/uscxml/transform/Transformer.h b/src/uscxml/transform/Transformer.h index a490533..fcfda01 100644 --- a/src/uscxml/transform/Transformer.h +++ b/src/uscxml/transform/Transformer.h @@ -23,6 +23,7 @@ #include <iostream> #include <map> #include "uscxml/Interpreter.h" +#include "uscxml/interpreter/InterpreterImpl.h" namespace uscxml { @@ -47,8 +48,8 @@ protected: std::multimap<std::string, std::string> _extensions; std::list<std::string> _options; - xercesc::DOMDocument* _document; - xercesc::DOMElement* _scxml; + XERCESC_NS::DOMDocument* _document; + XERCESC_NS::DOMElement* _scxml; Interpreter interpreter; InterpreterImpl::Binding _binding; @@ -63,7 +64,7 @@ public: // Transformer(const Interpreter& source) { _impl = new (source) } Transformer() : _impl() {} // the empty, invalid interpreter - Transformer(boost::shared_ptr<TransformerImpl> const impl) : _impl(impl) { } + Transformer(std::shared_ptr<TransformerImpl> const impl) : _impl(impl) { } Transformer(const Transformer& other) : _impl(other._impl) { } virtual ~Transformer() {}; @@ -91,7 +92,7 @@ public: return _impl->operator Interpreter(); } - boost::shared_ptr<TransformerImpl> getImpl() { + std::shared_ptr<TransformerImpl> getImpl() { return _impl; } @@ -104,7 +105,7 @@ public: } protected: - boost::shared_ptr<TransformerImpl> _impl; + std::shared_ptr<TransformerImpl> _impl; }; diff --git a/src/uscxml/uscxml.h b/src/uscxml/uscxml.h new file mode 100644 index 0000000..fb5b512 --- /dev/null +++ b/src/uscxml/uscxml.h @@ -0,0 +1,24 @@ +/** + * @file + * @author 2012-2013 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + * + * @mainpage + */ + +#include "uscxml/Common.h" +#include "uscxml/Interpreter.h" + diff --git a/src/uscxml/util/DOM.cpp b/src/uscxml/util/DOM.cpp index b68901c..0e1e9fa 100644 --- a/src/uscxml/util/DOM.cpp +++ b/src/uscxml/util/DOM.cpp @@ -36,7 +36,7 @@ namespace uscxml { -using namespace xercesc; +using namespace XERCESC_NS; std::ostream& operator<< (std::ostream& os, const DOMNode& node) { @@ -233,8 +233,8 @@ void DOMUtils::inPostFixOrder(const std::set<std::string>& elements, const bool includeEmbeddedDoc, std::list<DOMElement*>& nodes) { - if (root == NULL) - return; + if (root == NULL) + return; DOMNodeList* children = root->getChildNodes(); for (size_t i = 0; i < children->getLength(); i++) { @@ -260,8 +260,8 @@ void DOMUtils::inPostFixOrder(const std::set<std::string>& elements, } std::list<DOMElement*> DOMUtils::inDocumentOrder(const std::set<std::string>& elements, - const DOMElement* root, - const bool includeEmbeddedDoc) { + const DOMElement* root, + const bool includeEmbeddedDoc) { std::list<DOMElement*> nodes; inDocumentOrder(elements, root, includeEmbeddedDoc, nodes); return nodes; @@ -271,10 +271,10 @@ void DOMUtils::inDocumentOrder(const std::set<std::string>& elements, const DOMElement* root, const bool includeEmbeddedDoc, std::list<DOMElement*>& nodes) { - if (root == NULL) - return; - - if (elements.find(TAGNAME(root)) != elements.end()) { + if (root == NULL) + return; + + if (elements.find(TAGNAME(root)) != elements.end()) { nodes.push_back((DOMElement*)root); } diff --git a/src/uscxml/util/DOM.h b/src/uscxml/util/DOM.h index 1f2ced2..0e8621c 100644 --- a/src/uscxml/util/DOM.h +++ b/src/uscxml/util/DOM.h @@ -24,6 +24,7 @@ #include <list> #include <iostream> +#include "uscxml/config.h" #include "uscxml/Common.h" #include <xercesc/util/XMLString.hpp> #include <xercesc/dom/DOM.hpp> @@ -58,57 +59,57 @@ namespace uscxml { class USCXML_API DOMUtils { public: - static const xercesc::DOMNode* getNearestAncestor(const xercesc::DOMNode* node, const std::string tagName); - static bool isDescendant(const xercesc::DOMNode* s1, const xercesc::DOMNode* s2); + static const XERCESC_NS::DOMNode* getNearestAncestor(const XERCESC_NS::DOMNode* node, const std::string tagName); + static bool isDescendant(const XERCESC_NS::DOMNode* s1, const XERCESC_NS::DOMNode* s2); - static bool hasIntersection(const std::list<xercesc::DOMElement*>& l1, - const std::list<xercesc::DOMElement*>& l2); - static bool isMember(const xercesc::DOMElement* node, const std::list<xercesc::DOMElement*>& list); - static bool isMember(const xercesc::DOMNode* node, const std::list<xercesc::DOMNode*>& list); - static bool isMember(const xercesc::DOMNode* node, const xercesc::DOMNodeList* list); + static bool hasIntersection(const std::list<XERCESC_NS::DOMElement*>& l1, + const std::list<XERCESC_NS::DOMElement*>& l2); + static bool isMember(const XERCESC_NS::DOMElement* node, const std::list<XERCESC_NS::DOMElement*>& list); + static bool isMember(const XERCESC_NS::DOMNode* node, const std::list<XERCESC_NS::DOMNode*>& list); + static bool isMember(const XERCESC_NS::DOMNode* node, const XERCESC_NS::DOMNodeList* list); - static std::string xPathForNode(const xercesc::DOMNode* node, + static std::string xPathForNode(const XERCESC_NS::DOMNode* node, const std::string& ns = ""); - static std::string idForNode(const xercesc::DOMNode* node); + static std::string idForNode(const XERCESC_NS::DOMNode* node); - static std::list<xercesc::DOMNode*> getElementsByType(const xercesc::DOMNode* root, - xercesc::DOMNode::NodeType type); + static std::list<XERCESC_NS::DOMNode*> getElementsByType(const XERCESC_NS::DOMNode* root, + XERCESC_NS::DOMNode::NodeType type); - static std::list<xercesc::DOMElement*> inPostFixOrder(const std::set<std::string>& elements, - const xercesc::DOMElement* root, + static std::list<XERCESC_NS::DOMElement*> inPostFixOrder(const std::set<std::string>& elements, + const XERCESC_NS::DOMElement* root, const bool includeEmbeddedDoc = false); - static std::list<xercesc::DOMElement*> inDocumentOrder(const std::set<std::string>& elements, - const xercesc::DOMElement* root, + static std::list<XERCESC_NS::DOMElement*> inDocumentOrder(const std::set<std::string>& elements, + const XERCESC_NS::DOMElement* root, const bool includeEmbeddedDoc = false); - static std::list<xercesc::DOMElement*> filterChildElements(const std::string& tagName, - const xercesc::DOMElement* node, + static std::list<XERCESC_NS::DOMElement*> filterChildElements(const std::string& tagName, + const XERCESC_NS::DOMElement* node, bool recurse = false); - static std::list<xercesc::DOMElement*> filterChildElements(const std::string& tagName, - const std::list<xercesc::DOMElement*>& nodeSet, + static std::list<XERCESC_NS::DOMElement*> filterChildElements(const std::string& tagName, + const std::list<XERCESC_NS::DOMElement*>& nodeSet, bool recurse = false); - static std::list<xercesc::DOMNode*> filterChildType(const xercesc::DOMNode::NodeType type, - const xercesc::DOMNode* node, + static std::list<XERCESC_NS::DOMNode*> filterChildType(const XERCESC_NS::DOMNode::NodeType type, + const XERCESC_NS::DOMNode* node, bool recurse = false); - static std::list<xercesc::DOMNode*> filterChildType(const xercesc::DOMNode::NodeType type, - const std::list<xercesc::DOMNode*>& nodeSet, + static std::list<XERCESC_NS::DOMNode*> filterChildType(const XERCESC_NS::DOMNode::NodeType type, + const std::list<XERCESC_NS::DOMNode*>& nodeSet, bool recurse = false); protected: static void inPostFixOrder(const std::set<std::string>& elements, - const xercesc::DOMElement* root, + const XERCESC_NS::DOMElement* root, const bool includeEmbeddedDoc, - std::list<xercesc::DOMElement*>& nodes); + std::list<XERCESC_NS::DOMElement*>& nodes); static void inDocumentOrder(const std::set<std::string>& elements, - const xercesc::DOMElement* root, + const XERCESC_NS::DOMElement* root, const bool includeEmbeddedDoc, - std::list<xercesc::DOMElement*>& nodes); + std::list<XERCESC_NS::DOMElement*>& nodes); }; @@ -121,21 +122,21 @@ public : X(X const &other) { _localForm = other._localForm; - _otherForm = xercesc::XMLString::replicate(other._otherForm); + _otherForm = XERCESC_NS::XMLString::replicate(other._otherForm); _deallocOther = true; } void operator=(X const &other) { // did we maybe leak before? _localForm = other._localForm; - _otherForm = xercesc::XMLString::replicate(other._otherForm); + _otherForm = XERCESC_NS::XMLString::replicate(other._otherForm); _deallocOther = true; } X(const XMLCh* const toTranscode) { if (toTranscode != NULL) { // Call the private transcoding method - char* tmp = xercesc::XMLString::transcode(toTranscode); + char* tmp = XERCESC_NS::XMLString::transcode(toTranscode); _localForm = std::string(tmp); - xercesc::XMLString::release(&tmp); + XERCESC_NS::XMLString::release(&tmp); } _otherForm = NULL; _deallocOther = false; @@ -144,21 +145,21 @@ public : X(const std::string& fromTranscode) { // Call the private transcoding method _localForm = fromTranscode; - _otherForm = xercesc::XMLString::transcode(fromTranscode.c_str()); + _otherForm = XERCESC_NS::XMLString::transcode(fromTranscode.c_str()); _deallocOther = true; } X(const char* const fromTranscode) { // Call the private transcoding method _localForm = fromTranscode; - _otherForm = xercesc::XMLString::transcode(fromTranscode); + _otherForm = XERCESC_NS::XMLString::transcode(fromTranscode); _deallocOther = true; } X(char* fromTranscode) { // Call the private transcoding method _localForm = fromTranscode; - _otherForm = xercesc::XMLString::transcode(fromTranscode); + _otherForm = XERCESC_NS::XMLString::transcode(fromTranscode); _deallocOther = true; } @@ -169,7 +170,7 @@ public : ~X() { if (_deallocOther) - xercesc::XMLString::release(&_otherForm); + XERCESC_NS::XMLString::release(&_otherForm); } const std::string& str() const { @@ -199,7 +200,7 @@ private: }; USCXML_API std::ostream& operator<< (std::ostream& os, const X& xmlString); -USCXML_API std::ostream& operator<< (std::ostream& os, const xercesc::DOMNode& node); +USCXML_API std::ostream& operator<< (std::ostream& os, const XERCESC_NS::DOMNode& node); } diff --git a/src/uscxml/util/Predicates.cpp b/src/uscxml/util/Predicates.cpp index 6ac092f..2f46d75 100644 --- a/src/uscxml/util/Predicates.cpp +++ b/src/uscxml/util/Predicates.cpp @@ -22,7 +22,7 @@ namespace uscxml { -using namespace xercesc; +using namespace XERCESC_NS; std::list<DOMElement*> getChildStates(const DOMElement* state, bool properOnly) { std::list<DOMElement*> children; @@ -39,8 +39,8 @@ std::list<DOMElement*> getChildStates(const DOMElement* state, bool properOnly) return children; } -std::list<xercesc::DOMElement*> getChildStates(const std::list<xercesc::DOMElement*>& states, bool properOnly) { - std::list<xercesc::DOMElement*> children; +std::list<XERCESC_NS::DOMElement*> getChildStates(const std::list<XERCESC_NS::DOMElement*>& states, bool properOnly) { + std::list<XERCESC_NS::DOMElement*> children; for (auto stateIter = states.begin(); stateIter != states.end(); stateIter++) { std::list<DOMElement*> tmp = getChildStates(*stateIter, properOnly); children.merge(tmp); diff --git a/src/uscxml/util/Predicates.h b/src/uscxml/util/Predicates.h index 50c69b6..7bc4a9c 100644 --- a/src/uscxml/util/Predicates.h +++ b/src/uscxml/util/Predicates.h @@ -28,32 +28,32 @@ namespace uscxml { -std::list<xercesc::DOMElement*> getChildStates(const xercesc::DOMElement* state, bool properOnly = true); -std::list<xercesc::DOMElement*> getChildStates(const std::list<xercesc::DOMElement*>& states, bool properOnly = true); -xercesc::DOMElement* getParentState(const xercesc::DOMElement* element); -xercesc::DOMElement* getSourceState(const xercesc::DOMElement* transition); -xercesc::DOMElement* findLCCA(const std::list<xercesc::DOMElement*>& states); -std::list<xercesc::DOMElement*> getProperAncestors(const xercesc::DOMElement* s1, const xercesc::DOMElement* s2); - -std::list<xercesc::DOMElement*> getTargetStates(const xercesc::DOMElement* transition, const xercesc::DOMElement* root); -std::list<xercesc::DOMElement*> getEffectiveTargetStates(const xercesc::DOMElement* transition); -xercesc::DOMElement* getTransitionDomain(const xercesc::DOMElement* transition, const xercesc::DOMElement* root); - -bool isInEmbeddedDocument(const xercesc::DOMNode* node); - -std::list<xercesc::DOMElement*> getStates(const std::list<std::string>& stateIds, const xercesc::DOMElement* root); -xercesc::DOMElement* getState(const std::string& stateId, const xercesc::DOMElement* root); -std::list<xercesc::DOMElement*> getInitialStates(const xercesc::DOMElement* state, const xercesc::DOMElement* root); -std::list<xercesc::DOMElement*> getReachableStates(const xercesc::DOMElement* root); -std::list<xercesc::DOMElement*> getExitSet(const xercesc::DOMElement* transition, const xercesc::DOMElement* root); -bool conflicts(const xercesc::DOMElement* transition1, const xercesc::DOMElement* transition2, const xercesc::DOMElement* root); - -bool isState(const xercesc::DOMElement* state, bool properOnly = true); -bool isCompound(const xercesc::DOMElement* state); -bool isAtomic(const xercesc::DOMElement* state); -bool isParallel(const xercesc::DOMElement* state); -bool isFinal(const xercesc::DOMElement* state); -bool isHistory(const xercesc::DOMElement* state); +std::list<XERCESC_NS::DOMElement*> getChildStates(const XERCESC_NS::DOMElement* state, bool properOnly = true); +std::list<XERCESC_NS::DOMElement*> getChildStates(const std::list<XERCESC_NS::DOMElement*>& states, bool properOnly = true); +XERCESC_NS::DOMElement* getParentState(const XERCESC_NS::DOMElement* element); +XERCESC_NS::DOMElement* getSourceState(const XERCESC_NS::DOMElement* transition); +XERCESC_NS::DOMElement* findLCCA(const std::list<XERCESC_NS::DOMElement*>& states); +std::list<XERCESC_NS::DOMElement*> getProperAncestors(const XERCESC_NS::DOMElement* s1, const XERCESC_NS::DOMElement* s2); + +std::list<XERCESC_NS::DOMElement*> getTargetStates(const XERCESC_NS::DOMElement* transition, const XERCESC_NS::DOMElement* root); +std::list<XERCESC_NS::DOMElement*> getEffectiveTargetStates(const XERCESC_NS::DOMElement* transition); +XERCESC_NS::DOMElement* getTransitionDomain(const XERCESC_NS::DOMElement* transition, const XERCESC_NS::DOMElement* root); + +bool isInEmbeddedDocument(const XERCESC_NS::DOMNode* node); + +std::list<XERCESC_NS::DOMElement*> getStates(const std::list<std::string>& stateIds, const XERCESC_NS::DOMElement* root); +XERCESC_NS::DOMElement* getState(const std::string& stateId, const XERCESC_NS::DOMElement* root); +std::list<XERCESC_NS::DOMElement*> getInitialStates(const XERCESC_NS::DOMElement* state, const XERCESC_NS::DOMElement* root); +std::list<XERCESC_NS::DOMElement*> getReachableStates(const XERCESC_NS::DOMElement* root); +std::list<XERCESC_NS::DOMElement*> getExitSet(const XERCESC_NS::DOMElement* transition, const XERCESC_NS::DOMElement* root); +bool conflicts(const XERCESC_NS::DOMElement* transition1, const XERCESC_NS::DOMElement* transition2, const XERCESC_NS::DOMElement* root); + +bool isState(const XERCESC_NS::DOMElement* state, bool properOnly = true); +bool isCompound(const XERCESC_NS::DOMElement* state); +bool isAtomic(const XERCESC_NS::DOMElement* state); +bool isParallel(const XERCESC_NS::DOMElement* state); +bool isFinal(const XERCESC_NS::DOMElement* state); +bool isHistory(const XERCESC_NS::DOMElement* state); } diff --git a/src/uscxml/util/URL.cpp b/src/uscxml/util/URL.cpp index a576f8b..cb3abe3 100644 --- a/src/uscxml/util/URL.cpp +++ b/src/uscxml/util/URL.cpp @@ -140,7 +140,7 @@ URL URLImpl::resolveWithCWD(URLImpl* relative) { } currPath[sizeof(currPath) - 1] = '\0'; /* not really required? */ - // without the trailing slash, last component is assumed a file + // without the trailing slash, last component is assumed a file std::shared_ptr<URLImpl> cwdURL(new URLImpl(std::string("file://") + currPath + PATH_SEPERATOR)); return resolve(relative, cwdURL.get()); diff --git a/src/uscxml/util/URL.h b/src/uscxml/util/URL.h index f545fe8..dba8e3d 100644 --- a/src/uscxml/util/URL.h +++ b/src/uscxml/util/URL.h @@ -190,7 +190,8 @@ protected: class USCXML_API URL { public: - PIMPL_OPERATORS(URL) + PIMPL_OPERATORS(URL); + URL(const std::string url) : _impl(new URLImpl(url)) {} bool isAbsolute() { diff --git a/src/uscxml/util/UUID.cpp b/src/uscxml/util/UUID.cpp index 34e3e75..6f7cf96 100644 --- a/src/uscxml/util/UUID.cpp +++ b/src/uscxml/util/UUID.cpp @@ -17,12 +17,16 @@ * @endcond */ -#include "UUID.h" #include <sstream> #include <boost/uuid/uuid_io.hpp> +#include <boost/uuid/random_generator.hpp> + +#include "UUID.h" namespace uscxml { -boost::uuids::random_generator UUID::uuidGen; + +// hide from public header +boost::uuids::random_generator uuidGen; std::string UUID::getUUID() { boost::uuids::uuid uuid = uuidGen(); diff --git a/src/uscxml/util/UUID.h b/src/uscxml/util/UUID.h index 873d963..bc362c0 100644 --- a/src/uscxml/util/UUID.h +++ b/src/uscxml/util/UUID.h @@ -21,7 +21,6 @@ #define UUID_H_8X65R2EI #include "uscxml/Common.h" -#include <boost/uuid/uuid_generators.hpp> #include <string> namespace uscxml { @@ -30,7 +29,6 @@ class USCXML_API UUID { public: static std::string getUUID(); static bool isUUID(const std::string& uuid); - static boost::uuids::random_generator uuidGen; }; } diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 7343809..4905fbc 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -53,12 +53,17 @@ foreach(USCXML_ISSUE ${USCXML_ISSUES} ) endforeach() # make sure all headers are self-reliant +set (USCXML_PUBLIC_HEADERS + "${PROJECT_SOURCE_DIR}/src/uscxml/uscxml.h" + "${PROJECT_SOURCE_DIR}/src/uscxml/Interpreter.h" +) + file(GLOB_RECURSE USCXML_HEADERS ../src/*.h ../src/*.hpp ) -foreach(USCXML_HEADER ${USCXML_HEADERS} ) +foreach(USCXML_HEADER ${USCXML_PUBLIC_HEADERS} ) STRING(REGEX REPLACE "${CMAKE_CURRENT_SOURCE_DIR}/../src/" "" USCXML_REL_HEADER ${USCXML_HEADER}) set(HEADER_TEST) diff --git a/test/ctest/scripts/run_header_compiles.cmake b/test/ctest/scripts/run_header_compiles.cmake index e60ef0e..8bed4e1 100644 --- a/test/ctest/scripts/run_header_compiles.cmake +++ b/test/ctest/scripts/run_header_compiles.cmake @@ -3,11 +3,11 @@ get_filename_component(TEST_FILE_NAME ${TESTFILE} NAME) set(COMPILE_CMD_BIN "-c" -"-I${PROJECT_SOURCE_DIR}/contrib/src" -"-I${PROJECT_BINARY_DIR}/deps/xerces-c/include" -"-I${PROJECT_BINARY_DIR}/deps/libevent/include" -"-I${PROJECT_BINARY_DIR}/deps/uriparser/include" -"-I${PROJECT_SOURCE_DIR}/contrib/src/evws" +# "-I${PROJECT_SOURCE_DIR}/contrib/src" +# "-I${PROJECT_BINARY_DIR}/deps/xerces-c/include" +# "-I${PROJECT_BINARY_DIR}/deps/libevent/include" +# "-I${PROJECT_BINARY_DIR}/deps/uriparser/include" +# "-I${PROJECT_SOURCE_DIR}/contrib/src/evws" "-I${CMAKE_BINARY_DIR}" "-I${PROJECT_BINARY_DIR}" "-I${PROJECT_SOURCE_DIR}/src" diff --git a/test/src/test-gen-c.cpp b/test/src/test-gen-c.cpp index 327858c..7870578 100644 --- a/test/src/test-gen-c.cpp +++ b/test/src/test-gen-c.cpp @@ -28,7 +28,7 @@ #include "uscxml/util/UUID.h" #include "uscxml/interpreter/InterpreterImpl.h" -#include "uscxml/interpreter/EventQueueImpl.h" +#include "uscxml/interpreter/BasicEventQueue.h" #ifdef BUILD_PROFILING # include "uscxml/plugins/DataModel.h" @@ -77,7 +77,7 @@ public: return false; } - xercesc::DOMDocument* getDocument() const { + XERCESC_NS::DOMDocument* getDocument() const { return document; } const std::map<std::string, Invoker>& getInvokers() { @@ -113,7 +113,7 @@ public: name = machine->name; - delayQueue = DelayedEventQueue(std::shared_ptr<DelayedEventQueueImpl>(new DelayedEventQueueImpl(this))); + delayQueue = DelayedEventQueue(std::shared_ptr<DelayedEventQueueImpl>(new BasicDelayedEventQueue(this))); dataModel = Factory::getInstance()->createDataModel(machine->datamodel, this); if (invocation != NULL) { @@ -899,7 +899,7 @@ protected: X xmlPrefix; std::map<std::string, IOProcessor> ioProcs; std::map<std::string, Invoker> invokers; - xercesc::DOMDocument* document; + XERCESC_NS::DOMDocument* document; DelayedEventQueue delayQueue; std::map<std::string, std::tuple<std::string, std::string, std::string> > sendUUIDs; diff --git a/test/src/test-lifecycle.cpp b/test/src/test-lifecycle.cpp index 528d903..df77e96 100644 --- a/test/src/test-lifecycle.cpp +++ b/test/src/test-lifecycle.cpp @@ -14,7 +14,7 @@ int startedAt; int lastTransitionAt; using namespace uscxml; -using namespace xercesc; +using namespace XERCESC_NS; enum CallbackType { USCXML_BEFOREPROCESSINGEVENT, @@ -55,45 +55,45 @@ class SequenceCheckingMonitor : public InterpreterMonitor { CHECK_CALLBACK_TYPE(USCXML_BEFOREMICROSTEP); } - virtual void beforeExitingState(const xercesc::DOMElement* state) { + virtual void beforeExitingState(const XERCESC_NS::DOMElement* state) { CHECK_CALLBACK_TYPE(USCXML_BEFOREEXITINGSTATE); } - virtual void afterExitingState(const xercesc::DOMElement* state) { + virtual void afterExitingState(const XERCESC_NS::DOMElement* state) { CHECK_CALLBACK_TYPE(USCXML_AFTEREXITINGSTATE); } - virtual void beforeExecutingContent(const xercesc::DOMElement* element) { + virtual void beforeExecutingContent(const XERCESC_NS::DOMElement* element) { CHECK_CALLBACK_TYPE(USCXML_BEFOREEXECUTINGCONTENT); } - virtual void afterExecutingContent(const xercesc::DOMElement* element) { + virtual void afterExecutingContent(const XERCESC_NS::DOMElement* element) { CHECK_CALLBACK_TYPE(USCXML_AFTEREXECUTINGCONTENT); } - virtual void beforeUninvoking(const xercesc::DOMElement* invokeElem, const std::string& invokeid) { + virtual void beforeUninvoking(const XERCESC_NS::DOMElement* invokeElem, const std::string& invokeid) { CHECK_CALLBACK_TYPE(USCXML_BEFOREUNINVOKING); } - virtual void afterUninvoking(const xercesc::DOMElement* invokeElem, const std::string& invokeid) { + virtual void afterUninvoking(const XERCESC_NS::DOMElement* invokeElem, const std::string& invokeid) { CHECK_CALLBACK_TYPE(USCXML_AFTERUNINVOKING); } - virtual void beforeTakingTransition(const xercesc::DOMElement* transition) { + virtual void beforeTakingTransition(const XERCESC_NS::DOMElement* transition) { CHECK_CALLBACK_TYPE(USCXML_BEFORETAKINGTRANSITION); } - virtual void afterTakingTransition(const xercesc::DOMElement* transition) { + virtual void afterTakingTransition(const XERCESC_NS::DOMElement* transition) { CHECK_CALLBACK_TYPE(USCXML_AFTERTAKINGTRANSITION); } - virtual void beforeEnteringState(const xercesc::DOMElement* state) { + virtual void beforeEnteringState(const XERCESC_NS::DOMElement* state) { CHECK_CALLBACK_TYPE(USCXML_BEFOREENTERINGSTATE); } - virtual void afterEnteringState(const xercesc::DOMElement* state) { + virtual void afterEnteringState(const XERCESC_NS::DOMElement* state) { CHECK_CALLBACK_TYPE(USCXML_AFTERENTERINGSTATE); } - virtual void beforeInvoking(const xercesc::DOMElement* invokeElem, const std::string& invokeid) { + virtual void beforeInvoking(const XERCESC_NS::DOMElement* invokeElem, const std::string& invokeid) { CHECK_CALLBACK_TYPE(USCXML_BEFOREINVOKING); } - virtual void afterInvoking(const xercesc::DOMElement* invokeElem, const std::string& invokeid) { + virtual void afterInvoking(const XERCESC_NS::DOMElement* invokeElem, const std::string& invokeid) { CHECK_CALLBACK_TYPE(USCXML_AFTERINVOKING); } diff --git a/test/src/test-state-pass.cpp b/test/src/test-state-pass.cpp index 943b3dc..ac52a0b 100644 --- a/test/src/test-state-pass.cpp +++ b/test/src/test-state-pass.cpp @@ -7,6 +7,7 @@ #include <xercesc/util/PlatformUtils.hpp> #include "uscxml/Interpreter.h" +#include "uscxml/interpreter/InterpreterMonitor.h" #include "uscxml/util/DOM.h" #include "uscxml/util/String.h" #include "uscxml/util/UUID.h" @@ -34,7 +35,7 @@ #endif using namespace std; -using namespace xercesc; +using namespace XERCESC_NS; using namespace uscxml; @@ -67,11 +68,11 @@ int main(int argc, char** argv) { try { Interpreter interpreter = Interpreter::fromURL(documentURI); - ActionLanguage al; - al.execContent = std::shared_ptr<ContentExecutorImpl>(new BasicContentExecutorImpl(interpreter.getImpl().get())); - interpreter.setActionLanguage(al); +// ActionLanguage al; +// al.execContent = std::shared_ptr<ContentExecutorImpl>(new ContentExecutorBasic(interpreter.getImpl().get())); +// interpreter.setActionLanguage(al); - StateTransitionMonitor mon(interpreter); + StateTransitionMonitor mon; interpreter.setMonitor(&mon); InterpreterState state = InterpreterState::USCXML_UNDEF; diff --git a/test/src/test-url.cpp b/test/src/test-url.cpp index d713c67..aa559f3 100644 --- a/test/src/test-url.cpp +++ b/test/src/test-url.cpp @@ -10,7 +10,7 @@ #include <iostream>
using namespace uscxml;
-using namespace xercesc;
+using namespace XERCESC_NS;
class TestServlet : public HTTPServlet {
public:
diff --git a/test/src/test-validating.cpp b/test/src/test-validating.cpp index a7a89df..34d8122 100644 --- a/test/src/test-validating.cpp +++ b/test/src/test-validating.cpp @@ -1,5 +1,7 @@ #include "uscxml/config.h" #include "uscxml/Interpreter.h" +#include "uscxml/interpreter/InterpreterImpl.h" +#include "uscxml/debug/InterpreterIssue.h" #include <easylogging++.h> #include <xercesc/util/PlatformUtils.hpp> @@ -36,7 +38,7 @@ public: int main(int argc, char** argv) { - using namespace xercesc; + using namespace XERCESC_NS; int iterations = 1; |