diff --git a/.gitignore b/.gitignore index ea04b5f..6ed0930 100644 --- a/.gitignore +++ b/.gitignore @@ -31,11 +31,6 @@ lib/eigen_files.mk # CI builds ci-scripts/local/* -# CLion stuff -.idea/* -CMakeLists.txt -cmake-build-debug/* - # VS Code Studio stuff .vscode *.code-workspace diff --git a/bootstrap.sh b/bootstrap.sh index 2d8caa3..9aa8e5b 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -2,4 +2,5 @@ rm -rf .buildutils mkdir -p .buildutils/m4 +./update_eigen.sh eigen-3.3.4.tar.bz2 autoreconf -fvi diff --git a/ci-scripts/install-deps.sh b/ci-scripts/install-deps.sh index 400bbbe..466a8fb 100755 --- a/ci-scripts/install-deps.sh +++ b/ci-scripts/install-deps.sh @@ -13,4 +13,3 @@ for d in nlopt minuit hdf5; do ./install-${d}.sh ${PREFIX} fi done -./install-latcore.sh ${PREFIX} diff --git a/ci-scripts/install-latcore.sh b/ci-scripts/install-latcore.sh deleted file mode 100755 index d0d3f39..0000000 --- a/ci-scripts/install-latcore.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env bash - -if (( $# != 1 )); then - echo "usage: `basename $0` {osx|linux}" 1>&2 - exit 1 -fi -PREFIX=$1 - -set -ex -INITDIR=`pwd` -cd local/build -if [ -d LatCore ]; then - cd LatCore - git pull origin master -else - git clone https://github.com/aportelli/LatCore.git - mkdir LatCore/build - cd LatCore - ./bootstrap.sh -fi -cd build -../configure --prefix=${PREFIX} -make -j4 -make install -cd ${INITDIR} diff --git a/configure.ac b/configure.ac index 63c81d0..09d26ff 100644 --- a/configure.ac +++ b/configure.ac @@ -8,7 +8,7 @@ AC_CONFIG_SRCDIR([lib/Global.cpp]) AC_CONFIG_SRCDIR([utils/sample_read.cpp]) AC_CONFIG_SRCDIR([examples/exMathInterpreter.cpp]) AC_CONFIG_MACRO_DIR([.buildutils/m4]) -AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign]) +AM_INIT_AUTOMAKE([1.11 -Wall -Werror foreign subdir-objects]) AM_SILENT_RULES([yes]) AC_CONFIG_HEADERS([config.h]) AM_CONDITIONAL([HAVE_AM_MINOR_LE_11], @@ -48,11 +48,6 @@ AC_ARG_WITH([hdf5], [try this for a non-standard install prefix of the HDF5 library])], [AM_CXXFLAGS="$AM_CXXFLAGS -I$with_hdf5/include"] [AM_LDFLAGS="$AM_LDFLAGS -L$with_hdf5/lib"]) -AC_ARG_WITH([latcore], - [AS_HELP_STRING([--with-latcore=prefix], - [use this option for a non-standard install prefix of the LatCore library])], - [AM_CXXFLAGS="$AM_CXXFLAGS -I$with_latcore/include"] - [AM_LDFLAGS="$AM_LDFLAGS -L$with_latcore/lib"]) # Get compilers informations AX_COMPILER_VENDOR @@ -109,17 +104,6 @@ AC_LINK_IFELSE( [AC_MSG_RESULT([no])]) AM_CONDITIONAL([HAVE_MINUIT], [test x$have_minuit = xtrue]) LDFLAGS=$SAVED_LDFLAGS -SAVED_LDFLAGS=$LDFLAGS -LDFLAGS="$LDFLAGS -lLatCore" -AC_MSG_CHECKING([for LatCore::XmlReader in -lLatCore]); -AC_LINK_IFELSE( - [AC_LANG_PROGRAM([#include ], - [LatCore::XmlReader dummy()])], - [LIBS="$LIBS -lLatCore"] - [AC_MSG_RESULT([yes])], - [AC_MSG_RESULT([no])] - [AC_MSG_ERROR([LatCore library not found])]) -LDFLAGS=$SAVED_LDFLAGS CXXFLAGS=$CXXFLAGS_CPY LDFLAGS=$LDFLAGS_CPY diff --git a/eigen-3.3.4.tar.bz2 b/eigen-3.3.4.tar.bz2 new file mode 100644 index 0000000..3e7deb7 Binary files /dev/null and b/eigen-3.3.4.tar.bz2 differ diff --git a/examples/exCompiledDoubleFunction.cpp b/examples/exCompiledDoubleFunction.cpp index ea0fce7..7751afe 100644 --- a/examples/exCompiledDoubleFunction.cpp +++ b/examples/exCompiledDoubleFunction.cpp @@ -1,4 +1,4 @@ -#include +#include using namespace std; using namespace Latan; diff --git a/examples/exDerivative.cpp b/examples/exDerivative.cpp index 1b467f7..86bf760 100644 --- a/examples/exDerivative.cpp +++ b/examples/exDerivative.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include using namespace std; using namespace Latan; diff --git a/examples/exFit.cpp b/examples/exFit.cpp index 1340d3a..1da0ad4 100644 --- a/examples/exFit.cpp +++ b/examples/exFit.cpp @@ -1,10 +1,10 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace std; using namespace Latan; diff --git a/examples/exFitSample.cpp b/examples/exFitSample.cpp index 9babd53..0504312 100644 --- a/examples/exFitSample.cpp +++ b/examples/exFitSample.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include using namespace std; using namespace Latan; diff --git a/examples/exIntegrator.cpp b/examples/exIntegrator.cpp index 45a0968..bce3f47 100644 --- a/examples/exIntegrator.cpp +++ b/examples/exIntegrator.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include using namespace std; using namespace Latan; diff --git a/examples/exInterp.cpp b/examples/exInterp.cpp index 00d0b46..4822508 100644 --- a/examples/exInterp.cpp +++ b/examples/exInterp.cpp @@ -1,4 +1,4 @@ -#include +#include int main(void) { diff --git a/examples/exMat.cpp b/examples/exMat.cpp index 2a0fad2..c4b7553 100644 --- a/examples/exMat.cpp +++ b/examples/exMat.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include using namespace std; using namespace Latan; diff --git a/examples/exMathInterpreter.cpp b/examples/exMathInterpreter.cpp index 2dd4c69..c43c2c8 100644 --- a/examples/exMathInterpreter.cpp +++ b/examples/exMathInterpreter.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include using namespace std; using namespace Latan; diff --git a/examples/exMin.cpp b/examples/exMin.cpp index b902573..bfad90e 100644 --- a/examples/exMin.cpp +++ b/examples/exMin.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include using namespace std; using namespace Latan; diff --git a/examples/exPlot.cpp b/examples/exPlot.cpp index 356508f..444f5ce 100644 --- a/examples/exPlot.cpp +++ b/examples/exPlot.cpp @@ -1,7 +1,7 @@ -#include -#include -#include -#include +#include +#include +#include +#include using namespace std; using namespace Latan; diff --git a/examples/exRand.cpp b/examples/exRand.cpp index 23fc64d..06a64a0 100644 --- a/examples/exRand.cpp +++ b/examples/exRand.cpp @@ -1,6 +1,6 @@ -#include -#include -#include +#include +#include +#include using namespace std; using namespace Latan; diff --git a/examples/exRootFinder.cpp b/examples/exRootFinder.cpp index 181352a..26aacdc 100644 --- a/examples/exRootFinder.cpp +++ b/examples/exRootFinder.cpp @@ -1,5 +1,5 @@ -#include -#include +#include +#include using namespace std; using namespace Latan; diff --git a/lib/Core/Eigen.hpp b/lib/Core/Eigen.hpp new file mode 100644 index 0000000..2684259 --- /dev/null +++ b/lib/Core/Eigen.hpp @@ -0,0 +1,123 @@ +/* + * Eigen.hpp, part of LatAnalyze 3 + * + * Copyright (C) 2013 - 2016 Antonin Portelli + * + * LatAnalyze 3 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LatAnalyze 3 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. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LatAnalyze 3. If not, see . + */ + +// Eigen inclusion +#define EIGEN_DONT_PARALLELIZE +#define EIGEN_MATRIXBASE_PLUGIN +#include + +// copy/assignement from Eigen expression +#define EIGEN_EXPR_CTOR(ctorName, Class, Base, ExprType) \ +template \ +ctorName(const ExprType &m): Base(m) {}\ +template\ +Class & operator=(const ExprType &m)\ +{\ + this->Base::operator=(m);\ + return *this;\ +} + +#define FOR_MAT(mat, i, j) \ +for (Latan::Index j = 0; j < mat.cols(); ++j)\ +for (Latan::Index i = 0; i < mat.rows(); ++i) + +BEGIN_LATAN_NAMESPACE + +const int dynamic = Eigen::Dynamic; + +// array types +template +using ArrayExpr = Eigen::ArrayBase; + +template +using Array = Eigen::Array; + +// matrix types +template +using MatExpr = Eigen::MatrixBase; + +template +using MatBase = Eigen::Matrix; + +template +using SFMat = Eigen::Matrix; + +template +using SDMat = Eigen::Matrix; + +template +using SCMat = Eigen::Matrix, nRow, nCol>; + +// vector types +template +using Vec = MatBase; + +template +using SIVec = Vec; + +template +using SUVec = Vec; + +template +using SFVec = Vec; + +template +using SDVec = Vec; + +template +using SCVec = Vec, size>; + +typedef SIVec IVec; +typedef SUVec UVec; +typedef SDVec DVec; +typedef SCVec CVec; + +// block types +template +using Block = Eigen::Block; +template +using ConstBlock = const Eigen::Block; + +template +using Row = typename Derived::RowXpr; +template +using ConstRow = typename Derived::ConstRowXpr; + +template +using Col = typename Derived::ColXpr; +template +using ConstCol = typename Derived::ConstColXpr; + +// map type +template +using InnerStride = Eigen::InnerStride; +template +using Stride = Eigen::Stride; +template > +using Map = Eigen::Map; +template > +using ConstMap = Eigen::Map; + +// Index type ////////////////////////////////////////////////////////////////// +typedef MatBase::Index Index; + +#define FOR_VEC(vec, i) for (Latan::Index i = 0; i < (vec).size(); ++i) +#define FOR_ARRAY(ar, i) FOR_VEC(ar, i) + +END_LATAN_NAMESPACE diff --git a/lib/Core/EigenPlugin.hpp b/lib/Core/EigenPlugin.hpp new file mode 100644 index 0000000..48bd820 --- /dev/null +++ b/lib/Core/EigenPlugin.hpp @@ -0,0 +1,60 @@ +/* + * EigenPlugin.hpp, part of LatAnalyze + * + * Copyright (C) 2015 Antonin Portelli + * + * LatAnalyze is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LatAnalyze 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. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LatAnalyze. If not, see . + */ + +Derived pInverse(const double tolerance = 1.0e-10) +{ + auto svd = jacobiSvd(Eigen::ComputeThinU|Eigen::ComputeThinV); + const auto u = svd.matrixU(); + const auto v = svd.matrixV(); + auto s = svd.singularValues(); + double maxsv = 0.; + unsigned int elim = 0; + + for (Index i = 0; i < s.rows(); ++i) + { + if (fabs(s(i)) > maxsv) maxsv = fabs(s(i)); + } + for (Index i = 0; i < s.rows(); ++i) + { + if (fabs(s(i)) > maxsv*tolerance) + { + s(i) = 1./s(i); + } + else + { + elim++; + s(i) = 0.; + } + } + if (elim) + { + std::cerr << "warning: pseudoinverse: " << elim << "/"; + std::cerr << s.rows() << " singular value(s) eliminated (tolerance= "; + std::cerr << tolerance << ")" << std::endl; + } + + return v*s.asDiagonal()*u.transpose(); +} + +Derived singularValues(void) +{ + auto svd = jacobiSvd(); + + return svd.singularValues(); +} diff --git a/lib/Exceptions.cpp b/lib/Core/Exceptions.cpp similarity index 97% rename from lib/Exceptions.cpp rename to lib/Core/Exceptions.cpp index 1b9dc30..a3a1378 100644 --- a/lib/Exceptions.cpp +++ b/lib/Core/Exceptions.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include #ifndef ERR_SUFF diff --git a/lib/Exceptions.hpp b/lib/Core/Exceptions.hpp similarity index 100% rename from lib/Exceptions.hpp rename to lib/Core/Exceptions.hpp diff --git a/lib/Mat.cpp b/lib/Core/Mat.cpp similarity index 97% rename from lib/Mat.cpp rename to lib/Core/Mat.cpp index c5c4bb2..2749054 100644 --- a/lib/Mat.cpp +++ b/lib/Core/Mat.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include using namespace std; diff --git a/lib/Mat.hpp b/lib/Core/Mat.hpp similarity index 93% rename from lib/Mat.hpp rename to lib/Core/Mat.hpp index 70cab8c..e9b0af8 100644 --- a/lib/Mat.hpp +++ b/lib/Core/Mat.hpp @@ -21,11 +21,7 @@ #define Latan_Mat_hpp_ #include -#include - -#define FOR_MAT(mat, i, j) \ -for (Latan::Index j = 0; j < mat.cols(); ++j)\ -for (Latan::Index i = 0; i < mat.rows(); ++i) +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/Math.cpp b/lib/Core/Math.cpp similarity index 98% rename from lib/Math.cpp rename to lib/Core/Math.cpp index d582e1f..cca44dd 100644 --- a/lib/Math.cpp +++ b/lib/Core/Math.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include #include diff --git a/lib/Math.hpp b/lib/Core/Math.hpp similarity index 97% rename from lib/Math.hpp rename to lib/Core/Math.hpp index 8bebbbb..cac584a 100644 --- a/lib/Math.hpp +++ b/lib/Core/Math.hpp @@ -21,8 +21,8 @@ #define Latan_Math_hpp_ #include -#include -#include +#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/MathInterpreter.cpp b/lib/Core/MathInterpreter.cpp similarity index 99% rename from lib/MathInterpreter.cpp rename to lib/Core/MathInterpreter.cpp index 4787ab7..ae8a2de 100644 --- a/lib/MathInterpreter.cpp +++ b/lib/Core/MathInterpreter.cpp @@ -17,9 +17,9 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include -#include +#include using namespace std; using namespace Latan; diff --git a/lib/MathInterpreter.hpp b/lib/Core/MathInterpreter.hpp similarity index 99% rename from lib/MathInterpreter.hpp rename to lib/Core/MathInterpreter.hpp index 0238ee3..1804d4e 100644 --- a/lib/MathInterpreter.hpp +++ b/lib/Core/MathInterpreter.hpp @@ -20,9 +20,9 @@ #ifndef Latan_MathInterpreter_hpp_ #define Latan_MathInterpreter_hpp_ -#include +#include #include -#include +#include #define MAXIDLENGTH 256 diff --git a/lib/MathLexer.lpp b/lib/Core/MathLexer.lpp similarity index 98% rename from lib/MathLexer.lpp rename to lib/Core/MathLexer.lpp index 1e5f6ef..5d78191 100644 --- a/lib/MathLexer.lpp +++ b/lib/Core/MathLexer.lpp @@ -25,7 +25,7 @@ %option yylineno %{ - #include + #include #include "MathParser.hpp" using namespace std; diff --git a/lib/MathParser.ypp b/lib/Core/MathParser.ypp similarity index 98% rename from lib/MathParser.ypp rename to lib/Core/MathParser.ypp index a52a7b3..b22bd3f 100644 --- a/lib/MathParser.ypp +++ b/lib/Core/MathParser.ypp @@ -19,7 +19,7 @@ %{ #include - #include + #include using namespace std; using namespace Latan; diff --git a/lib/Core/OptParser.cpp b/lib/Core/OptParser.cpp new file mode 100644 index 0000000..bb22d67 --- /dev/null +++ b/lib/Core/OptParser.cpp @@ -0,0 +1,272 @@ +/* + * OptParser.cpp, part of LatAnalyze + * + * Copyright (C) 2016 Antonin Portelli + * + * LatAnalyze is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LatAnalyze 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. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LatAnalyze. If not, see . + */ + +#include +#include + +using namespace std; +using namespace Latan; + +static char optRegex[] = "(-([a-zA-Z])(.+)?)|(--([a-zA-Z_-]+)=?(.+)?)"; + +/****************************************************************************** + * OptParser implementation * + ******************************************************************************/ +// regular expressions ///////////////////////////////////////////////////////// +const regex OptParser::optRegex_(optRegex); + +// access ////////////////////////////////////////////////////////////////////// +void OptParser::addOption(const std::string shortName, + const std::string longName, + const OptType type, const bool optional, + const std::string helpMessage, + const std::string defaultVal) +{ + OptPar par; + + par.shortName = shortName; + par.longName = longName; + par.defaultVal = defaultVal; + par.helpMessage = helpMessage; + par.type = type; + par.optional = optional; + opt_.push_back(par); +} + +bool OptParser::gotOption(const std::string name) const +{ + int i = optIndex(name); + + if (result_.size() != opt_.size()) + { + throw(runtime_error("options not parsed")); + } + if (i >= 0) + { + return result_[i].present; + } + else + { + throw(out_of_range("no option with name '" + name + "'")); + } +} + +const vector & OptParser::getArgs(void) const +{ + return arg_; +} + +// parse /////////////////////////////////////////////////////////////////////// +bool OptParser::parse(int argc, char *argv[]) +{ + smatch sm; + queue arg; + int expectVal = -1; + bool isCorrect = true; + + for (int i = 1; i < argc; ++i) + { + arg.push(argv[i]); + } + result_.clear(); + result_.resize(opt_.size()); + arg_.clear(); + for (unsigned int i = 0; i < opt_.size(); ++i) + { + result_[i].value = opt_[i].defaultVal; + } + while (!arg.empty()) + { + // option + if (regex_match(arg.front(), sm, optRegex_)) + { + // should it be a value? + if (expectVal >= 0) + { + cerr << "warning: expected value for option "; + cerr << optName(opt_[expectVal]); + cerr << ", got option '" << arg.front() << "' instead" << endl; + expectVal = -1; + isCorrect = false; + } + // short option + if (sm[1].matched) + { + string optName = sm[2].str(); + + // find option + auto it = find_if(opt_.begin(), opt_.end(), + [&optName](const OptPar &p) + { + return (p.shortName == optName); + }); + + // parse if found + if (it != opt_.end()) + { + unsigned int i = it - opt_.begin(); + + result_[i].present = true; + if (opt_[i].type == OptType::value) + { + if (sm[3].matched) + { + result_[i].value = sm[3].str(); + } + else + { + expectVal = i; + } + } + } + // warning if not found + else + { + cerr << "warning: unknown option '" << arg.front() << "'"; + cerr << endl; + } + } + // long option + else if (sm[4].matched) + { + string optName = sm[5].str(); + + // find option + auto it = find_if(opt_.begin(), opt_.end(), + [&optName](const OptPar &p) + { + return (p.longName == optName); + }); + + // parse if found + if (it != opt_.end()) + { + unsigned int i = it - opt_.begin(); + + result_[i].present = true; + if (opt_[i].type == OptType::value) + { + if (sm[6].matched) + { + result_[i].value = sm[6].str(); + } + else + { + expectVal = i; + } + } + } + // warning if not found + else + { + cerr << "warning: unknown option '" << arg.front() << "'"; + cerr << endl; + } + } + } + else if (expectVal >= 0) + { + result_[expectVal].value = arg.front(); + expectVal = -1; + } + else + { + arg_.push_back(arg.front()); + } + arg.pop(); + } + if (expectVal >= 0) + { + cerr << "warning: expected value for option "; + cerr << optName(opt_[expectVal]) << endl; + expectVal = -1; + isCorrect = false; + } + for (unsigned int i = 0; i < opt_.size(); ++i) + { + if (!opt_[i].optional and !result_[i].present) + { + cerr << "warning: mandatory option " << optName(opt_[i]); + cerr << " is missing" << endl; + isCorrect = false; + } + } + + return isCorrect; +} + +// find option index /////////////////////////////////////////////////////////// +int OptParser::optIndex(const string name) const +{ + auto it = find_if(opt_.begin(), opt_.end(), [&name](const OptPar &p) + { + return (p.shortName == name) or (p.longName == name); + }); + + if (it != opt_.end()) + { + return static_cast(it - opt_.begin()); + } + else + { + return -1; + } +} + +// option name for messages //////////////////////////////////////////////////// +std::string OptParser::optName(const OptPar &opt) +{ + std::string res = ""; + + if (!opt.shortName.empty()) + { + res += "-" + opt.shortName; + if (!opt.longName.empty()) + { + res += "/"; + } + } + if (!opt.longName.empty()) + { + res += "--" + opt.longName; + if (opt.type == OptParser::OptType::value) + { + res += "="; + } + } + + return res; +} + +// print option list /////////////////////////////////////////////////////////// +std::ostream & Latan::operator<<(std::ostream &out, const OptParser &parser) +{ + for (auto &o: parser.opt_) + { + out << setw(20) << OptParser::optName(o); + out << ": " << o.helpMessage; + if (!o.defaultVal.empty()) + { + out << " (default: " << o.defaultVal << ")"; + } + out << endl; + } + + return out; +} diff --git a/lib/Core/OptParser.hpp b/lib/Core/OptParser.hpp new file mode 100644 index 0000000..5916c11 --- /dev/null +++ b/lib/Core/OptParser.hpp @@ -0,0 +1,103 @@ +/* + * OptParser.hpp, part of LatAnalyze + * + * Copyright (C) 2016 Antonin Portelli + * + * LatAnalyze is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LatAnalyze 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. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LatAnalyze. If not, see . + */ + +#ifndef LatAnalyze_OptParser_hpp_ +#define LatAnalyze_OptParser_hpp_ + +#include + +BEGIN_LATAN_NAMESPACE + +/****************************************************************************** + * command-line option parser * + ******************************************************************************/ +class OptParser +{ +public: + enum class OptType {value, trigger}; +private: + struct OptPar + { + std::string shortName, longName, defaultVal, helpMessage; + OptType type; + bool optional; + }; + struct OptRes + { + std::string value; + bool present; + }; +public: + // constructor + OptParser(void) = default; + // destructor + virtual ~OptParser(void) = default; + // access + void addOption(const std::string shortName, const std::string longName, + const OptType type, const bool optional = false, + const std::string helpMessage = "", + const std::string defaultVal = ""); + bool gotOption(const std::string name) const; + template + T optionValue(const std::string name) const; + const std::vector & getArgs(void) const; + // parse + bool parse(int argc, char *argv[]); + // print option list + friend std::ostream & operator<<(std::ostream &out, + const OptParser &parser); +private: + // find option index + int optIndex(const std::string name) const; + // option name for messages + static std::string optName(const OptPar &opt); +private: + std::vector opt_; + std::vector result_; + std::vector arg_; + static const std::regex optRegex_; +}; + +std::ostream & operator<<(std::ostream &out, const OptParser &parser); + +/****************************************************************************** + * OptParser template implementation * + ******************************************************************************/ +template +T OptParser::optionValue(const std::string name) const +{ + int i = optIndex(name); + + if (result_.size() != opt_.size()) + { + throw(std::runtime_error("options not parsed")); + } + if (i >= 0) + { + return strTo(result_[i].value); + } + else + { + throw(std::out_of_range("no option with name '" + name + "'")); + } +} + +END_LATAN_NAMESPACE + +#endif // LatAnalyze_OptParser_hpp_ diff --git a/lib/ParserState.hpp b/lib/Core/ParserState.hpp similarity index 100% rename from lib/ParserState.hpp rename to lib/Core/ParserState.hpp diff --git a/lib/Plot.cpp b/lib/Core/Plot.cpp similarity index 99% rename from lib/Plot.cpp rename to lib/Core/Plot.cpp index 13c6f4b..b36e19c 100644 --- a/lib/Plot.cpp +++ b/lib/Core/Plot.cpp @@ -17,9 +17,9 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include -#include +#include using namespace std; using namespace Latan; diff --git a/lib/Plot.hpp b/lib/Core/Plot.hpp similarity index 97% rename from lib/Plot.hpp rename to lib/Core/Plot.hpp index a6d9e81..7db96ac 100644 --- a/lib/Plot.hpp +++ b/lib/Core/Plot.hpp @@ -21,11 +21,11 @@ #define Latan_Plot_hpp_ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include // gnuplot default parameters #ifndef GNUPLOT_BIN diff --git a/lib/Core/Utilities.cpp b/lib/Core/Utilities.cpp new file mode 100644 index 0000000..5178401 --- /dev/null +++ b/lib/Core/Utilities.cpp @@ -0,0 +1,137 @@ +/* + * Utilities.cpp, part of LatAnalyze + * + * Copyright (C) 2013 - 2015 Antonin Portelli + * + * LatAnalyze is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LatAnalyze 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. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LatAnalyze. If not, see . + */ + +#include +#include + +using namespace std; +using namespace Latan; + +void Latan::testFunction(void) +{} + +ostream & Latan::operator<<(ostream &out, const ProgressBar &&bar) +{ + const Index nTick = bar.nCol_*bar.current_/bar.total_; + + out << "["; + for (Index i = 0; i < nTick; ++i) + { + out << "="; + } + for (Index i = nTick; i < bar.nCol_; ++i) + { + out << " "; + } + out << "] " << bar.current_ << "/" << bar.total_; + out.flush(); + + return out; +} + +int Latan::mkdir(const std::string dirName) +{ + if (access(dirName.c_str(), R_OK|W_OK|X_OK)) + { + mode_t mode755; + char tmp[MAX_PATH_LENGTH]; + char *p = NULL; + size_t len; + + mode755 = S_IRWXU|S_IRGRP|S_IXGRP|S_IROTH|S_IXOTH; + + snprintf(tmp, sizeof(tmp), "%s", dirName.c_str()); + len = strlen(tmp); + if(tmp[len - 1] == '/') + { + tmp[len - 1] = 0; + } + for(p = tmp + 1; *p; p++) + { + if(*p == '/') + { + *p = 0; + ::mkdir(tmp, mode755); + *p = '/'; + } + } + + return ::mkdir(tmp, mode755); + } + else + { + return 0; + } +} + +string Latan::basename(const string &s) +{ + constexpr char sep = '/'; + size_t i = s.rfind(sep, s.length()); + + if (i != string::npos) + { + return s.substr(i+1, s.length() - i); + } + else + { + return s; + } +} + +std::string Latan::dirname(const std::string &s) +{ + constexpr char sep = '/'; + size_t i = s.rfind(sep, s.length()); + + if (i != std::string::npos) + { + return s.substr(0, i); + } + else + { + return ""; + } +} + +VarName::VarName(const string defName) +: defName_(defName) +{} + +string VarName::getName(const Index i) const +{ + if (hasName(i)) + { + return name_.at(i); + } + else + { + return defName_ + "_" + strFrom(i); + } +} + +void VarName::setName(const Index i, const string name) +{ + name_[i] = name; +} + +bool VarName::hasName(const Index i) const +{ + return (name_.find(i) != name_.end()); +} diff --git a/lib/Core/Utilities.hpp b/lib/Core/Utilities.hpp new file mode 100644 index 0000000..926aecc --- /dev/null +++ b/lib/Core/Utilities.hpp @@ -0,0 +1,250 @@ +/* + * Utilities.hpp, part of LatAnalyze + * + * Copyright (C) 2013 - 2015 Antonin Portelli + * + * LatAnalyze is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LatAnalyze 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. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LatAnalyze. If not, see . + */ + +#ifndef LatAnalyze_Utilities_hpp_ +#define LatAnalyze_Utilities_hpp_ + +#ifndef LATAN_GLOBAL_HPP_ +#include +#endif + +BEGIN_LATAN_NAMESPACE + +// Random seed type //////////////////////////////////////////////////////////// +typedef std::random_device::result_type SeedType; + +// Type utilities ////////////////////////////////////////////////////////////// +// pointer type test +template +inline bool isDerivedFrom(const Base *pt) +{ + return (dynamic_cast(pt) != nullptr); +} + +// static logical or +template +struct static_or; + +template +struct static_or : static_or {}; + +template +struct static_or : std::false_type {}; + +template <> +struct static_or<> : std::true_type {}; + +// Environment ///////////////////////////////////////////////////////////////// +void testFunction(void); + +// String utilities //////////////////////////////////////////////////////////// +inline std::string extension(const std::string fileName) +{ + return fileName.substr(fileName.find_last_of(".") + 1); +} + +template +inline T strTo(const std::string &str) +{ + T buf; + std::istringstream stream(str); + + stream >> buf; + + return buf; +} + +// optimized specializations +template <> +inline float strTo(const std::string &str) +{ + return strtof(str.c_str(), (char **)NULL); +} +template <> +inline double strTo(const std::string &str) +{ + return strtod(str.c_str(), (char **)NULL); +} +template <> +inline int strTo(const std::string &str) +{ + return (int)(strtol(str.c_str(), (char **)NULL, 10)); +} +template <> +inline long strTo(const std::string &str) +{ + return strtol(str.c_str(), (char **)NULL, 10); +} +template <> +inline std::string strTo(const std::string &str) +{ + return str; +} + +template +inline std::string strFrom(const T x) +{ + std::ostringstream stream; + + stream << x; + + return stream.str(); +} + +// specialization for vectors +template<> +inline DVec strTo(const std::string &str) +{ + DVec res; + std::vector vbuf; + double buf; + std::istringstream stream(str); + + while (!stream.eof()) + { + stream >> buf; + vbuf.push_back(buf); + } + res = Map(vbuf.data(), static_cast(vbuf.size())); + + return res; +} + +template<> +inline IVec strTo(const std::string &str) +{ + IVec res; + std::vector vbuf; + int buf; + std::istringstream stream(str); + + while (!stream.eof()) + { + stream >> buf; + vbuf.push_back(buf); + } + res = Map(vbuf.data(), static_cast(vbuf.size())); + + return res; +} + +template<> +inline UVec strTo(const std::string &str) +{ + UVec res; + std::vector vbuf; + unsigned int buf; + std::istringstream stream(str); + + while (!stream.eof()) + { + stream >> buf; + vbuf.push_back(buf); + } + res = Map(vbuf.data(), static_cast(vbuf.size())); + + return res; +} + +template +void tokenReplace(std::string &str, const std::string token, + const T &x, const std::string mark = "@") +{ + std::string fullToken = mark + token + mark; + + auto pos = str.find(fullToken); + if (pos != std::string::npos) + { + str.replace(pos, fullToken.size(), strFrom(x)); + } +} + +// Manifest file reader //////////////////////////////////////////////////////// +inline std::vector readManifest(const std::string manFileName) +{ + std::vector list; + std::ifstream manFile; + char buf[MAX_PATH_LENGTH]; + + manFile.open(manFileName); + while (!manFile.eof()) + { + manFile.getline(buf, MAX_PATH_LENGTH); + if (!std::string(buf).empty()) + { + list.push_back(buf); + } + } + manFile.close(); + + return list; +} + +// Recursive directory creation //////////////////////////////////////////////// +int mkdir(const std::string dirName); + +// C++ version of basename/dirname ///////////////////////////////////////////// +std::string basename(const std::string& s); +std::string dirname(const std::string& s); + +// Progress bar class ////////////////////////////////////////////////////////// +class ProgressBar +{ +public: + // constructor + template + ProgressBar(const A current, const B total, const Index nCol = 60); + // IO + friend std::ostream & operator<<(std::ostream &out, + const ProgressBar &&bar); +private: + Index current_, total_, nCol_; +}; + +template +ProgressBar::ProgressBar(const A current, const B total, const Index nCol) +: current_(static_cast(current)) +, total_(static_cast(total)) +, nCol_(nCol) +{} + +std::ostream & operator<<(std::ostream &out, const ProgressBar &&bar); + +// named variable interface //////////////////////////////////////////////////// +// FIXME: check redundant names and variable number limit +class VarName +{ +public: + // constructor + VarName(const std::string defName); + // destructor + virtual ~VarName(void) = default; + // access + std::string getName(const Index i) const; + void setName(const Index i, const std::string name); + // test + bool hasName(const Index i) const; +private: + std::string defName_; + std::unordered_map name_; +}; + +END_LATAN_NAMESPACE + +#endif // LatAnalyze_Utilities_hpp_ diff --git a/lib/Core/stdincludes.hpp b/lib/Core/stdincludes.hpp new file mode 100644 index 0000000..24e4ff3 --- /dev/null +++ b/lib/Core/stdincludes.hpp @@ -0,0 +1,56 @@ +/* + * stdincludes.hpp, part of LatAnalyze 3 + * + * Copyright (C) 2013 - 2016 Antonin Portelli + * + * LatAnalyze 3 is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LatAnalyze 3 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. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LatAnalyze 3. If not, see . + */ + +#ifndef Latan_stdincludes_hpp_ +#define Latan_stdincludes_hpp_ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#endif // Latan_stdincludes_hpp_ diff --git a/lib/CompiledFunction.cpp b/lib/Functional/CompiledFunction.cpp similarity index 97% rename from lib/CompiledFunction.cpp rename to lib/Functional/CompiledFunction.cpp index 11ad585..40c4265 100644 --- a/lib/CompiledFunction.cpp +++ b/lib/Functional/CompiledFunction.cpp @@ -17,8 +17,8 @@ * along with LatAnalyze 3. If not, see . */ -#include -#include +#include +#include #include using namespace std; diff --git a/lib/CompiledFunction.hpp b/lib/Functional/CompiledFunction.hpp similarity index 96% rename from lib/CompiledFunction.hpp rename to lib/Functional/CompiledFunction.hpp index 9fe9ada..ebdf71e 100644 --- a/lib/CompiledFunction.hpp +++ b/lib/Functional/CompiledFunction.hpp @@ -21,8 +21,8 @@ #define Latan_CompiledFunction_hpp_ #include -#include -#include +#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/CompiledModel.cpp b/lib/Functional/CompiledModel.cpp similarity index 98% rename from lib/CompiledModel.cpp rename to lib/Functional/CompiledModel.cpp index ebf3cef..cf5b779 100644 --- a/lib/CompiledModel.cpp +++ b/lib/Functional/CompiledModel.cpp @@ -17,8 +17,8 @@ * along with LatAnalyze 3. If not, see . */ -#include -#include +#include +#include #include using namespace std; diff --git a/lib/CompiledModel.hpp b/lib/Functional/CompiledModel.hpp similarity index 96% rename from lib/CompiledModel.hpp rename to lib/Functional/CompiledModel.hpp index c32b9d0..8c7cf5d 100644 --- a/lib/CompiledModel.hpp +++ b/lib/Functional/CompiledModel.hpp @@ -21,8 +21,8 @@ #define Latan_CompiledModel_hpp_ #include -#include -#include +#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/Function.cpp b/lib/Functional/Function.cpp similarity index 99% rename from lib/Function.cpp rename to lib/Functional/Function.cpp index b436c9d..3216fbe 100644 --- a/lib/Function.cpp +++ b/lib/Functional/Function.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include using namespace std; diff --git a/lib/Function.hpp b/lib/Functional/Function.hpp similarity index 98% rename from lib/Function.hpp rename to lib/Functional/Function.hpp index ecffa98..724d61e 100644 --- a/lib/Function.hpp +++ b/lib/Functional/Function.hpp @@ -21,8 +21,8 @@ #define Latan_Function_hpp_ #include -#include -#include +#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/Model.cpp b/lib/Functional/Model.cpp similarity index 98% rename from lib/Model.cpp rename to lib/Functional/Model.cpp index dc3849b..5537572 100644 --- a/lib/Model.cpp +++ b/lib/Functional/Model.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include using namespace std; diff --git a/lib/Model.hpp b/lib/Functional/Model.hpp similarity index 97% rename from lib/Model.hpp rename to lib/Functional/Model.hpp index f25c7b9..ba01c3e 100644 --- a/lib/Model.hpp +++ b/lib/Functional/Model.hpp @@ -21,8 +21,8 @@ #define Latan_Model_hpp_ #include -#include -#include +#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/TabFunction.cpp b/lib/Functional/TabFunction.cpp similarity index 99% rename from lib/TabFunction.cpp rename to lib/Functional/TabFunction.cpp index da5685b..f7778cd 100644 --- a/lib/TabFunction.cpp +++ b/lib/Functional/TabFunction.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include using namespace std; diff --git a/lib/TabFunction.hpp b/lib/Functional/TabFunction.hpp similarity index 94% rename from lib/TabFunction.hpp rename to lib/Functional/TabFunction.hpp index d285dd6..ea5517d 100644 --- a/lib/TabFunction.hpp +++ b/lib/Functional/TabFunction.hpp @@ -21,9 +21,9 @@ #define Latan_TabFunction_hpp_ #include -#include -#include -#include +#include +#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/Global.hpp b/lib/Global.hpp index 0f0e583..bedafc2 100644 --- a/lib/Global.hpp +++ b/lib/Global.hpp @@ -20,13 +20,27 @@ #ifndef Latan_Global_hpp_ #define Latan_Global_hpp_ -#include +#include #define BEGIN_LATAN_NAMESPACE \ -namespace Latan {\ -using namespace LatCore; +namespace Latan { #define END_LATAN_NAMESPACE } +// macro utilities +#define unique_arg(...) __VA_ARGS__ +#define DEBUG_VAR(x) std::cout << #x << "= " << x << std::endl +#define DEBUG_MAT(m) std::cout << #m << "=\n" << m << std::endl + +// attribute to switch off unused warnings with gcc +#ifdef __GNUC__ +#define __dumb __attribute__((unused)) +#else +#define __dumb +#endif + +// max length for paths +#define MAX_PATH_LENGTH 512u + BEGIN_LATAN_NAMESPACE // Placeholder type //////////////////////////////////////////////////////////// @@ -47,6 +61,8 @@ namespace Env END_LATAN_NAMESPACE -#include +#include +#include +#include #endif // Latan_Global_hpp_ diff --git a/lib/AsciiFile.cpp b/lib/Io/AsciiFile.cpp similarity index 99% rename from lib/AsciiFile.cpp rename to lib/Io/AsciiFile.cpp index 24bc899..f8af712 100644 --- a/lib/AsciiFile.cpp +++ b/lib/Io/AsciiFile.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include using namespace std; diff --git a/lib/AsciiFile.hpp b/lib/Io/AsciiFile.hpp similarity index 94% rename from lib/AsciiFile.hpp rename to lib/Io/AsciiFile.hpp index 884c11b..0282ea8 100644 --- a/lib/AsciiFile.hpp +++ b/lib/Io/AsciiFile.hpp @@ -21,10 +21,10 @@ #define Latan_AsciiFile_hpp_ #include -#include -#include -#include -#include +#include +#include +#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/AsciiLexer.lpp b/lib/Io/AsciiLexer.lpp similarity index 98% rename from lib/AsciiLexer.lpp rename to lib/Io/AsciiLexer.lpp index 910a72e..e4766fa 100644 --- a/lib/AsciiLexer.lpp +++ b/lib/Io/AsciiLexer.lpp @@ -25,7 +25,7 @@ %option yylineno %{ - #include + #include #include "AsciiParser.hpp" using namespace std; diff --git a/lib/AsciiParser.ypp b/lib/Io/AsciiParser.ypp similarity index 97% rename from lib/AsciiParser.ypp rename to lib/Io/AsciiParser.ypp index f09f81a..b1265ed 100644 --- a/lib/AsciiParser.ypp +++ b/lib/Io/AsciiParser.ypp @@ -19,9 +19,9 @@ %{ #include - #include - #include - #include + #include + #include + #include using namespace std; using namespace Latan; diff --git a/lib/Io/BinReader.cpp b/lib/Io/BinReader.cpp new file mode 100644 index 0000000..a116f69 --- /dev/null +++ b/lib/Io/BinReader.cpp @@ -0,0 +1,81 @@ +/* + * BinReader.cpp, part of LatAnalyze + * + * Copyright (C) 2015 Antonin Portelli + * + * LatAnalyze is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LatAnalyze 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. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LatAnalyze. If not, see . + */ + +#include +#include + +#if (defined __GNUC__)||(defined __clang__) +#pragma GCC diagnostic ignored "-Wunreachable-code" +#endif + +using namespace std; +using namespace Latan; + +BinIO::BinIO(string msg, string loc) +: runtime_error("Binary reader error: " + msg + " (" + loc + ")") +{} + +/****************************************************************************** + * BinReader implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +BinReader::BinReader(const string fileName, const uint32_t endianness, + const bool isColMaj) +{ + open(fileName, endianness, isColMaj); +} + +// I/O ///////////////////////////////////////////////////////////////////////// +void BinReader::open(const string fileName, const uint32_t endianness, + const bool isColMaj) +{ + fileName_ = fileName; + endianness_ = endianness; + isColMaj_ = isColMaj; + file_.reset(new ifstream(fileName_, ios::in|ios::binary|ios::ate)); + if (!file_->is_open()) + { + LATAN_ERROR(Io, "impossible to open file '" + fileName_ + "'"); + } + size_ = static_cast(file_->tellg()); + file_->seekg(0, ios::beg); +} + +void BinReader::close(void) +{ + file_.reset(nullptr); +} + +template <> +std::string BinReader::read(void) +{ + std::string s; + char c = 'a'; + + while (c != '\n') + { + c = read(); + if (c != '\n') + { + s.push_back(c); + } + } + + return s; +} diff --git a/lib/Io/BinReader.hpp b/lib/Io/BinReader.hpp new file mode 100644 index 0000000..8429a02 --- /dev/null +++ b/lib/Io/BinReader.hpp @@ -0,0 +1,196 @@ +/* + * BinReader.hpp, part of LatAnalyze + * + * Copyright (C) 2015 Antonin Portelli + * + * LatAnalyze is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LatAnalyze 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. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LatAnalyze. If not, see . + */ + +#ifndef LatAnalyze_BinReader_hpp_ +#define LatAnalyze_BinReader_hpp_ + +#include + +BEGIN_LATAN_NAMESPACE + +// I/O exception +class BinIO: public std::runtime_error +{ +public: + BinIO(std::string msg, std::string loc); +}; + +/****************************************************************************** + * Byte manipulation utilities * + ******************************************************************************/ +class Endianness +{ +public: + enum: uint32_t + { + little = 0x00000001, + big = 0x01000000, + unknown = 0xffffffff + }; +}; + +class ByteManip +{ +public: + static constexpr uint32_t getHostEndianness(void) + { + return ((0xffffffff & 1) == Endianness::little) ? Endianness::little + : (((0xffffffff & 1) == Endianness::big) ? Endianness::big + : Endianness::unknown); + } + template + static T swapBytes(const T); +}; + +/****************************************************************************** + * template implementation * + ******************************************************************************/ +template +T ByteManip::swapBytes(const T u) +{ + static_assert (CHAR_BIT == 8, "CHAR_BIT != 8"); + + union + { + T u; + unsigned char u8[sizeof(T)]; + } source, dest; + + source.u = u; + for (size_t k = 0; k < sizeof(T); ++k) + { + dest.u8[k] = source.u8[sizeof(T) - k - 1]; + } + + return dest.u; +} + +/****************************************************************************** + * Utility to read binary files * + ******************************************************************************/ +class BinReader +{ +public: + // constructor + BinReader(void) = default; + BinReader(const std::string fileName, + const uint32_t endianness = ByteManip::getHostEndianness(), + const bool isColMaj = false); + // destructor + virtual ~BinReader(void) = default; + // I/O + void open(const std::string fileName, + const uint32_t endianness = ByteManip::getHostEndianness(), + const bool isColMaj = false); + void close(void); + template + void read(T *pt, Index size); + template + T read(void); + template + MatBase read(const Index nRow, const Index nCol); +private: + std::unique_ptr file_{nullptr}; + std::string fileName_; + size_t size_; + uint32_t endianness_; + bool isColMaj_; +}; + +/****************************************************************************** + * template implementation * + ******************************************************************************/ +template +void BinReader::read(T *pt, Index n) +{ + if (file_ != nullptr) + { + file_->read(reinterpret_cast(pt), + static_cast(sizeof(T))*n); + if (endianness_ != ByteManip::getHostEndianness()) + { + for (Index i = 0; i < n; ++i) + { + pt[i] = ByteManip::swapBytes(pt[i]); + } + } + + } + else + { + LATAN_ERROR(Io, "file is not opened"); + } +} + +template +T BinReader::read(void) +{ + T x; + + if (file_ != nullptr) + { + read(&x, 1); + } + else + { + LATAN_ERROR(Io, "file is not opened"); + } + + return x; +} + +template <> +std::string BinReader::read(void); + +template +MatBase BinReader::read(const Index nRow, const Index nCol) +{ + MatBase m; + + // Eigen matrices use column-major ordering + if (isColMaj_) + { + m.resize(nRow, nCol); + } + else + { + m.resize(nCol, nRow); + } + if (file_ != nullptr) + { + read(m.data(), nRow*nCol); + } + else + { + LATAN_ERROR(Io, "file is not opened"); + } + if (isColMaj_) + { + return m; + } + else + { + return m.transpose(); + + } +} + +END_LATAN_NAMESPACE + +#endif // LatAnalyze_BinReader_hpp_ diff --git a/lib/File.cpp b/lib/Io/File.cpp similarity index 98% rename from lib/File.cpp rename to lib/Io/File.cpp index b534737..52c218d 100644 --- a/lib/File.cpp +++ b/lib/Io/File.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include using namespace std; diff --git a/lib/File.hpp b/lib/Io/File.hpp similarity index 96% rename from lib/File.hpp rename to lib/Io/File.hpp index a8e1719..84d7c27 100644 --- a/lib/File.hpp +++ b/lib/Io/File.hpp @@ -21,9 +21,9 @@ #define Latan_File_hpp_ #include -#include -#include -#include +#include +#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/Hdf5File.cpp b/lib/Io/Hdf5File.cpp similarity index 99% rename from lib/Hdf5File.cpp rename to lib/Io/Hdf5File.cpp index 053bc75..c6dc888 100644 --- a/lib/Hdf5File.cpp +++ b/lib/Io/Hdf5File.cpp @@ -17,8 +17,8 @@ * along with LatAnalyze 3. If not, see . */ -#include -#include +#include +#include #include using namespace std; diff --git a/lib/Hdf5File.hpp b/lib/Io/Hdf5File.hpp similarity index 95% rename from lib/Hdf5File.hpp rename to lib/Io/Hdf5File.hpp index 94a3e96..74ac345 100644 --- a/lib/Hdf5File.hpp +++ b/lib/Io/Hdf5File.hpp @@ -21,9 +21,9 @@ #define Latan_Hdf5File_hpp_ #include -#include -#include -#include +#include +#include +#include #include BEGIN_LATAN_NAMESPACE diff --git a/lib/Io.cpp b/lib/Io/Io.cpp similarity index 92% rename from lib/Io.cpp rename to lib/Io/Io.cpp index 32812e0..574abc4 100644 --- a/lib/Io.cpp +++ b/lib/Io/Io.cpp @@ -17,10 +17,10 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include -#include -#include +#include +#include using namespace std; using namespace Latan; diff --git a/lib/Io.hpp b/lib/Io/Io.hpp similarity index 99% rename from lib/Io.hpp rename to lib/Io/Io.hpp index 1ed747d..719706d 100644 --- a/lib/Io.hpp +++ b/lib/Io/Io.hpp @@ -21,7 +21,7 @@ #define Latan_Io_hpp_ #include -#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/IoObject.hpp b/lib/Io/IoObject.hpp similarity index 100% rename from lib/IoObject.hpp rename to lib/Io/IoObject.hpp diff --git a/lib/Io/Xml/tinyxml2.cpp b/lib/Io/Xml/tinyxml2.cpp new file mode 100644 index 0000000..cc7c626 --- /dev/null +++ b/lib/Io/Xml/tinyxml2.cpp @@ -0,0 +1,2791 @@ +/* +Original code by Lee Thomason (www.grinninglizard.com) + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any +damages arising from the use of this software. + +Permission is granted to anyone to use this software for any +purpose, including commercial applications, and to alter it and +redistribute it freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must +not claim that you wrote the original software. If you use this +software in a product, an acknowledgment in the product documentation +would be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and +must not be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source +distribution. +*/ + +#include "tinyxml2.hpp" + +#include // yes, this one new style header, is in the Android SDK. +#if defined(ANDROID_NDK) || defined(__BORLANDC__) || defined(__QNXNTO__) +# include +# include +#else +# include +# include +#endif + +#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (!defined WINCE) + // Microsoft Visual Studio, version 2005 and higher. Not WinCE. + /*int _snprintf_s( + char *buffer, + size_t sizeOfBuffer, + size_t count, + const char *format [, + argument] ... + );*/ + static inline int TIXML_SNPRINTF( char* buffer, size_t size, const char* format, ... ) + { + va_list va; + va_start( va, format ); + int result = vsnprintf_s( buffer, size, _TRUNCATE, format, va ); + va_end( va ); + return result; + } + + static inline int TIXML_VSNPRINTF( char* buffer, size_t size, const char* format, va_list va ) + { + int result = vsnprintf_s( buffer, size, _TRUNCATE, format, va ); + return result; + } + + #define TIXML_VSCPRINTF _vscprintf + #define TIXML_SSCANF sscanf_s +#elif defined _MSC_VER + // Microsoft Visual Studio 2003 and earlier or WinCE + #define TIXML_SNPRINTF _snprintf + #define TIXML_VSNPRINTF _vsnprintf + #define TIXML_SSCANF sscanf + #if (_MSC_VER < 1400 ) && (!defined WINCE) + // Microsoft Visual Studio 2003 and not WinCE. + #define TIXML_VSCPRINTF _vscprintf // VS2003's C runtime has this, but VC6 C runtime or WinCE SDK doesn't have. + #else + // Microsoft Visual Studio 2003 and earlier or WinCE. + static inline int TIXML_VSCPRINTF( const char* format, va_list va ) + { + int len = 512; + for (;;) { + len = len*2; + char* str = new char[len](); + const int required = _vsnprintf(str, len, format, va); + delete[] str; + if ( required != -1 ) { + TIXMLASSERT( required >= 0 ); + len = required; + break; + } + } + TIXMLASSERT( len >= 0 ); + return len; + } + #endif +#else + // GCC version 3 and higher + //#warning( "Using sn* functions." ) + #define TIXML_SNPRINTF snprintf + #define TIXML_VSNPRINTF vsnprintf + static inline int TIXML_VSCPRINTF( const char* format, va_list va ) + { + int len = vsnprintf( 0, 0, format, va ); + TIXMLASSERT( len >= 0 ); + return len; + } + #define TIXML_SSCANF sscanf +#endif + + +static const char LINE_FEED = (char)0x0a; // all line endings are normalized to LF +static const char LF = LINE_FEED; +static const char CARRIAGE_RETURN = (char)0x0d; // CR gets filtered out +static const char CR = CARRIAGE_RETURN; +static const char SINGLE_QUOTE = '\''; +static const char DOUBLE_QUOTE = '\"'; + +// Bunch of unicode info at: +// http://www.unicode.org/faq/utf_bom.html +// ef bb bf (Microsoft "lead bytes") - designates UTF-8 + +static const unsigned char TIXML_UTF_LEAD_0 = 0xefU; +static const unsigned char TIXML_UTF_LEAD_1 = 0xbbU; +static const unsigned char TIXML_UTF_LEAD_2 = 0xbfU; + +namespace tinyxml2 +{ + +struct Entity { + const char* pattern; + int length; + char value; +}; + +static const int NUM_ENTITIES = 5; +static const Entity entities[NUM_ENTITIES] = { + { "quot", 4, DOUBLE_QUOTE }, + { "amp", 3, '&' }, + { "apos", 4, SINGLE_QUOTE }, + { "lt", 2, '<' }, + { "gt", 2, '>' } +}; + + +StrPair::~StrPair() +{ + Reset(); +} + + +void StrPair::TransferTo( StrPair* other ) +{ + if ( this == other ) { + return; + } + // This in effect implements the assignment operator by "moving" + // ownership (as in auto_ptr). + + TIXMLASSERT( other != 0 ); + TIXMLASSERT( other->_flags == 0 ); + TIXMLASSERT( other->_start == 0 ); + TIXMLASSERT( other->_end == 0 ); + + other->Reset(); + + other->_flags = _flags; + other->_start = _start; + other->_end = _end; + + _flags = 0; + _start = 0; + _end = 0; +} + + +void StrPair::Reset() +{ + if ( _flags & NEEDS_DELETE ) { + delete [] _start; + } + _flags = 0; + _start = 0; + _end = 0; +} + + +void StrPair::SetStr( const char* str, int flags ) +{ + TIXMLASSERT( str ); + Reset(); + size_t len = strlen( str ); + TIXMLASSERT( _start == 0 ); + _start = new char[ len+1 ]; + memcpy( _start, str, len+1 ); + _end = _start + len; + _flags = flags | NEEDS_DELETE; +} + + +char* StrPair::ParseText( char* p, const char* endTag, int strFlags, int* curLineNumPtr ) +{ + TIXMLASSERT( p ); + TIXMLASSERT( endTag && *endTag ); + TIXMLASSERT(curLineNumPtr); + + char* start = p; + char endChar = *endTag; + size_t length = strlen( endTag ); + + // Inner loop of text parsing. + while ( *p ) { + if ( *p == endChar && strncmp( p, endTag, length ) == 0 ) { + Set( start, p, strFlags ); + return p + length; + } else if (*p == '\n') { + ++(*curLineNumPtr); + } + ++p; + TIXMLASSERT( p ); + } + return 0; +} + + +char* StrPair::ParseName( char* p ) +{ + if ( !p || !(*p) ) { + return 0; + } + if ( !XMLUtil::IsNameStartChar( *p ) ) { + return 0; + } + + char* const start = p; + ++p; + while ( *p && XMLUtil::IsNameChar( *p ) ) { + ++p; + } + + Set( start, p, 0 ); + return p; +} + + +void StrPair::CollapseWhitespace() +{ + // Adjusting _start would cause undefined behavior on delete[] + TIXMLASSERT( ( _flags & NEEDS_DELETE ) == 0 ); + // Trim leading space. + _start = XMLUtil::SkipWhiteSpace( _start, 0 ); + + if ( *_start ) { + const char* p = _start; // the read pointer + char* q = _start; // the write pointer + + while( *p ) { + if ( XMLUtil::IsWhiteSpace( *p )) { + p = XMLUtil::SkipWhiteSpace( p, 0 ); + if ( *p == 0 ) { + break; // don't write to q; this trims the trailing space. + } + *q = ' '; + ++q; + } + *q = *p; + ++q; + ++p; + } + *q = 0; + } +} + + +const char* StrPair::GetStr() +{ + TIXMLASSERT( _start ); + TIXMLASSERT( _end ); + if ( _flags & NEEDS_FLUSH ) { + *_end = 0; + _flags ^= NEEDS_FLUSH; + + if ( _flags ) { + const char* p = _start; // the read pointer + char* q = _start; // the write pointer + + while( p < _end ) { + if ( (_flags & NEEDS_NEWLINE_NORMALIZATION) && *p == CR ) { + // CR-LF pair becomes LF + // CR alone becomes LF + // LF-CR becomes LF + if ( *(p+1) == LF ) { + p += 2; + } + else { + ++p; + } + *q = LF; + ++q; + } + else if ( (_flags & NEEDS_NEWLINE_NORMALIZATION) && *p == LF ) { + if ( *(p+1) == CR ) { + p += 2; + } + else { + ++p; + } + *q = LF; + ++q; + } + else if ( (_flags & NEEDS_ENTITY_PROCESSING) && *p == '&' ) { + // Entities handled by tinyXML2: + // - special entities in the entity table [in/out] + // - numeric character reference [in] + // 中 or 中 + + if ( *(p+1) == '#' ) { + const int buflen = 10; + char buf[buflen] = { 0 }; + int len = 0; + char* adjusted = const_cast( XMLUtil::GetCharacterRef( p, buf, &len ) ); + if ( adjusted == 0 ) { + *q = *p; + ++p; + ++q; + } + else { + TIXMLASSERT( 0 <= len && len <= buflen ); + TIXMLASSERT( q + len <= adjusted ); + p = adjusted; + memcpy( q, buf, len ); + q += len; + } + } + else { + bool entityFound = false; + for( int i = 0; i < NUM_ENTITIES; ++i ) { + const Entity& entity = entities[i]; + if ( strncmp( p + 1, entity.pattern, entity.length ) == 0 + && *( p + entity.length + 1 ) == ';' ) { + // Found an entity - convert. + *q = entity.value; + ++q; + p += entity.length + 2; + entityFound = true; + break; + } + } + if ( !entityFound ) { + // fixme: treat as error? + ++p; + ++q; + } + } + } + else { + *q = *p; + ++p; + ++q; + } + } + *q = 0; + } + // The loop below has plenty going on, and this + // is a less useful mode. Break it out. + if ( _flags & NEEDS_WHITESPACE_COLLAPSING ) { + CollapseWhitespace(); + } + _flags = (_flags & NEEDS_DELETE); + } + TIXMLASSERT( _start ); + return _start; +} + + + + +// --------- XMLUtil ----------- // + +const char* XMLUtil::writeBoolTrue = "true"; +const char* XMLUtil::writeBoolFalse = "false"; + +void XMLUtil::SetBoolSerialization(const char* writeTrue, const char* writeFalse) +{ + static const char* defTrue = "true"; + static const char* defFalse = "false"; + + writeBoolTrue = (writeTrue) ? writeTrue : defTrue; + writeBoolFalse = (writeFalse) ? writeFalse : defFalse; +} + + +const char* XMLUtil::ReadBOM( const char* p, bool* bom ) +{ + TIXMLASSERT( p ); + TIXMLASSERT( bom ); + *bom = false; + const unsigned char* pu = reinterpret_cast(p); + // Check for BOM: + if ( *(pu+0) == TIXML_UTF_LEAD_0 + && *(pu+1) == TIXML_UTF_LEAD_1 + && *(pu+2) == TIXML_UTF_LEAD_2 ) { + *bom = true; + p += 3; + } + TIXMLASSERT( p ); + return p; +} + + +void XMLUtil::ConvertUTF32ToUTF8( unsigned long input, char* output, int* length ) +{ + const unsigned long BYTE_MASK = 0xBF; + const unsigned long BYTE_MARK = 0x80; + const unsigned long FIRST_BYTE_MARK[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC }; + + if (input < 0x80) { + *length = 1; + } + else if ( input < 0x800 ) { + *length = 2; + } + else if ( input < 0x10000 ) { + *length = 3; + } + else if ( input < 0x200000 ) { + *length = 4; + } + else { + *length = 0; // This code won't convert this correctly anyway. + return; + } + + output += *length; + + // Scary scary fall throughs are annotated with carefully designed comments + // to suppress compiler warnings such as -Wimplicit-fallthrough in gcc + switch (*length) { + case 4: + --output; + *output = (char)((input | BYTE_MARK) & BYTE_MASK); + input >>= 6; + //fall through + case 3: + --output; + *output = (char)((input | BYTE_MARK) & BYTE_MASK); + input >>= 6; + //fall through + case 2: + --output; + *output = (char)((input | BYTE_MARK) & BYTE_MASK); + input >>= 6; + //fall through + case 1: + --output; + *output = (char)(input | FIRST_BYTE_MARK[*length]); + break; + default: + TIXMLASSERT( false ); + } +} + + +const char* XMLUtil::GetCharacterRef( const char* p, char* value, int* length ) +{ + // Presume an entity, and pull it out. + *length = 0; + + if ( *(p+1) == '#' && *(p+2) ) { + unsigned long ucs = 0; + TIXMLASSERT( sizeof( ucs ) >= 4 ); + ptrdiff_t delta = 0; + unsigned mult = 1; + static const char SEMICOLON = ';'; + + if ( *(p+2) == 'x' ) { + // Hexadecimal. + const char* q = p+3; + if ( !(*q) ) { + return 0; + } + + q = strchr( q, SEMICOLON ); + + if ( !q ) { + return 0; + } + TIXMLASSERT( *q == SEMICOLON ); + + delta = q-p; + --q; + + while ( *q != 'x' ) { + unsigned int digit = 0; + + if ( *q >= '0' && *q <= '9' ) { + digit = *q - '0'; + } + else if ( *q >= 'a' && *q <= 'f' ) { + digit = *q - 'a' + 10; + } + else if ( *q >= 'A' && *q <= 'F' ) { + digit = *q - 'A' + 10; + } + else { + return 0; + } + TIXMLASSERT( digit < 16 ); + TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit ); + const unsigned int digitScaled = mult * digit; + TIXMLASSERT( ucs <= ULONG_MAX - digitScaled ); + ucs += digitScaled; + TIXMLASSERT( mult <= UINT_MAX / 16 ); + mult *= 16; + --q; + } + } + else { + // Decimal. + const char* q = p+2; + if ( !(*q) ) { + return 0; + } + + q = strchr( q, SEMICOLON ); + + if ( !q ) { + return 0; + } + TIXMLASSERT( *q == SEMICOLON ); + + delta = q-p; + --q; + + while ( *q != '#' ) { + if ( *q >= '0' && *q <= '9' ) { + const unsigned int digit = *q - '0'; + TIXMLASSERT( digit < 10 ); + TIXMLASSERT( digit == 0 || mult <= UINT_MAX / digit ); + const unsigned int digitScaled = mult * digit; + TIXMLASSERT( ucs <= ULONG_MAX - digitScaled ); + ucs += digitScaled; + } + else { + return 0; + } + TIXMLASSERT( mult <= UINT_MAX / 10 ); + mult *= 10; + --q; + } + } + // convert the UCS to UTF-8 + ConvertUTF32ToUTF8( ucs, value, length ); + return p + delta + 1; + } + return p+1; +} + + +void XMLUtil::ToStr( int v, char* buffer, int bufferSize ) +{ + TIXML_SNPRINTF( buffer, bufferSize, "%d", v ); +} + + +void XMLUtil::ToStr( unsigned v, char* buffer, int bufferSize ) +{ + TIXML_SNPRINTF( buffer, bufferSize, "%u", v ); +} + + +void XMLUtil::ToStr( bool v, char* buffer, int bufferSize ) +{ + TIXML_SNPRINTF( buffer, bufferSize, "%s", v ? writeBoolTrue : writeBoolFalse); +} + +/* + ToStr() of a number is a very tricky topic. + https://github.com/leethomason/tinyxml2/issues/106 +*/ +void XMLUtil::ToStr( float v, char* buffer, int bufferSize ) +{ + TIXML_SNPRINTF( buffer, bufferSize, "%.8g", v ); +} + + +void XMLUtil::ToStr( double v, char* buffer, int bufferSize ) +{ + TIXML_SNPRINTF( buffer, bufferSize, "%.17g", v ); +} + + +void XMLUtil::ToStr(int64_t v, char* buffer, int bufferSize) +{ + // horrible syntax trick to make the compiler happy about %lld + TIXML_SNPRINTF(buffer, bufferSize, "%lld", (long long)v); +} + + +bool XMLUtil::ToInt( const char* str, int* value ) +{ + if ( TIXML_SSCANF( str, "%d", value ) == 1 ) { + return true; + } + return false; +} + +bool XMLUtil::ToUnsigned( const char* str, unsigned *value ) +{ + if ( TIXML_SSCANF( str, "%u", value ) == 1 ) { + return true; + } + return false; +} + +bool XMLUtil::ToBool( const char* str, bool* value ) +{ + int ival = 0; + if ( ToInt( str, &ival )) { + *value = (ival==0) ? false : true; + return true; + } + if ( StringEqual( str, "true" ) ) { + *value = true; + return true; + } + else if ( StringEqual( str, "false" ) ) { + *value = false; + return true; + } + return false; +} + + +bool XMLUtil::ToFloat( const char* str, float* value ) +{ + if ( TIXML_SSCANF( str, "%f", value ) == 1 ) { + return true; + } + return false; +} + + +bool XMLUtil::ToDouble( const char* str, double* value ) +{ + if ( TIXML_SSCANF( str, "%lf", value ) == 1 ) { + return true; + } + return false; +} + + +bool XMLUtil::ToInt64(const char* str, int64_t* value) +{ + long long v = 0; // horrible syntax trick to make the compiler happy about %lld + if (TIXML_SSCANF(str, "%lld", &v) == 1) { + *value = (int64_t)v; + return true; + } + return false; +} + + +char* XMLDocument::Identify( char* p, XMLNode** node ) +{ + TIXMLASSERT( node ); + TIXMLASSERT( p ); + char* const start = p; + int const startLine = _parseCurLineNum; + p = XMLUtil::SkipWhiteSpace( p, &_parseCurLineNum ); + if( !*p ) { + *node = 0; + TIXMLASSERT( p ); + return p; + } + + // These strings define the matching patterns: + static const char* xmlHeader = { "( _commentPool ); + returnNode->_parseLineNum = _parseCurLineNum; + p += xmlHeaderLen; + } + else if ( XMLUtil::StringEqual( p, commentHeader, commentHeaderLen ) ) { + returnNode = CreateUnlinkedNode( _commentPool ); + returnNode->_parseLineNum = _parseCurLineNum; + p += commentHeaderLen; + } + else if ( XMLUtil::StringEqual( p, cdataHeader, cdataHeaderLen ) ) { + XMLText* text = CreateUnlinkedNode( _textPool ); + returnNode = text; + returnNode->_parseLineNum = _parseCurLineNum; + p += cdataHeaderLen; + text->SetCData( true ); + } + else if ( XMLUtil::StringEqual( p, dtdHeader, dtdHeaderLen ) ) { + returnNode = CreateUnlinkedNode( _commentPool ); + returnNode->_parseLineNum = _parseCurLineNum; + p += dtdHeaderLen; + } + else if ( XMLUtil::StringEqual( p, elementHeader, elementHeaderLen ) ) { + returnNode = CreateUnlinkedNode( _elementPool ); + returnNode->_parseLineNum = _parseCurLineNum; + p += elementHeaderLen; + } + else { + returnNode = CreateUnlinkedNode( _textPool ); + returnNode->_parseLineNum = _parseCurLineNum; // Report line of first non-whitespace character + p = start; // Back it up, all the text counts. + _parseCurLineNum = startLine; + } + + TIXMLASSERT( returnNode ); + TIXMLASSERT( p ); + *node = returnNode; + return p; +} + + +bool XMLDocument::Accept( XMLVisitor* visitor ) const +{ + TIXMLASSERT( visitor ); + if ( visitor->VisitEnter( *this ) ) { + for ( const XMLNode* node=FirstChild(); node; node=node->NextSibling() ) { + if ( !node->Accept( visitor ) ) { + break; + } + } + } + return visitor->VisitExit( *this ); +} + + +// --------- XMLNode ----------- // + +XMLNode::XMLNode( XMLDocument* doc ) : + _document( doc ), + _parent( 0 ), + _value(), + _parseLineNum( 0 ), + _firstChild( 0 ), _lastChild( 0 ), + _prev( 0 ), _next( 0 ), + _userData( 0 ), + _memPool( 0 ) +{ +} + + +XMLNode::~XMLNode() +{ + DeleteChildren(); + if ( _parent ) { + _parent->Unlink( this ); + } +} + +const char* XMLNode::Value() const +{ + // Edge case: XMLDocuments don't have a Value. Return null. + if ( this->ToDocument() ) + return 0; + return _value.GetStr(); +} + +void XMLNode::SetValue( const char* str, bool staticMem ) +{ + if ( staticMem ) { + _value.SetInternedStr( str ); + } + else { + _value.SetStr( str ); + } +} + +XMLNode* XMLNode::DeepClone(XMLDocument* target) const +{ + XMLNode* clone = this->ShallowClone(target); + if (!clone) return 0; + + for (const XMLNode* child = this->FirstChild(); child; child = child->NextSibling()) { + XMLNode* childClone = child->DeepClone(target); + TIXMLASSERT(childClone); + clone->InsertEndChild(childClone); + } + return clone; +} + +void XMLNode::DeleteChildren() +{ + while( _firstChild ) { + TIXMLASSERT( _lastChild ); + DeleteChild( _firstChild ); + } + _firstChild = _lastChild = 0; +} + + +void XMLNode::Unlink( XMLNode* child ) +{ + TIXMLASSERT( child ); + TIXMLASSERT( child->_document == _document ); + TIXMLASSERT( child->_parent == this ); + if ( child == _firstChild ) { + _firstChild = _firstChild->_next; + } + if ( child == _lastChild ) { + _lastChild = _lastChild->_prev; + } + + if ( child->_prev ) { + child->_prev->_next = child->_next; + } + if ( child->_next ) { + child->_next->_prev = child->_prev; + } + child->_next = 0; + child->_prev = 0; + child->_parent = 0; +} + + +void XMLNode::DeleteChild( XMLNode* node ) +{ + TIXMLASSERT( node ); + TIXMLASSERT( node->_document == _document ); + TIXMLASSERT( node->_parent == this ); + Unlink( node ); + TIXMLASSERT(node->_prev == 0); + TIXMLASSERT(node->_next == 0); + TIXMLASSERT(node->_parent == 0); + DeleteNode( node ); +} + + +XMLNode* XMLNode::InsertEndChild( XMLNode* addThis ) +{ + TIXMLASSERT( addThis ); + if ( addThis->_document != _document ) { + TIXMLASSERT( false ); + return 0; + } + InsertChildPreamble( addThis ); + + if ( _lastChild ) { + TIXMLASSERT( _firstChild ); + TIXMLASSERT( _lastChild->_next == 0 ); + _lastChild->_next = addThis; + addThis->_prev = _lastChild; + _lastChild = addThis; + + addThis->_next = 0; + } + else { + TIXMLASSERT( _firstChild == 0 ); + _firstChild = _lastChild = addThis; + + addThis->_prev = 0; + addThis->_next = 0; + } + addThis->_parent = this; + return addThis; +} + + +XMLNode* XMLNode::InsertFirstChild( XMLNode* addThis ) +{ + TIXMLASSERT( addThis ); + if ( addThis->_document != _document ) { + TIXMLASSERT( false ); + return 0; + } + InsertChildPreamble( addThis ); + + if ( _firstChild ) { + TIXMLASSERT( _lastChild ); + TIXMLASSERT( _firstChild->_prev == 0 ); + + _firstChild->_prev = addThis; + addThis->_next = _firstChild; + _firstChild = addThis; + + addThis->_prev = 0; + } + else { + TIXMLASSERT( _lastChild == 0 ); + _firstChild = _lastChild = addThis; + + addThis->_prev = 0; + addThis->_next = 0; + } + addThis->_parent = this; + return addThis; +} + + +XMLNode* XMLNode::InsertAfterChild( XMLNode* afterThis, XMLNode* addThis ) +{ + TIXMLASSERT( addThis ); + if ( addThis->_document != _document ) { + TIXMLASSERT( false ); + return 0; + } + + TIXMLASSERT( afterThis ); + + if ( afterThis->_parent != this ) { + TIXMLASSERT( false ); + return 0; + } + if ( afterThis == addThis ) { + // Current state: BeforeThis -> AddThis -> OneAfterAddThis + // Now AddThis must disappear from it's location and then + // reappear between BeforeThis and OneAfterAddThis. + // So just leave it where it is. + return addThis; + } + + if ( afterThis->_next == 0 ) { + // The last node or the only node. + return InsertEndChild( addThis ); + } + InsertChildPreamble( addThis ); + addThis->_prev = afterThis; + addThis->_next = afterThis->_next; + afterThis->_next->_prev = addThis; + afterThis->_next = addThis; + addThis->_parent = this; + return addThis; +} + + + + +const XMLElement* XMLNode::FirstChildElement( const char* name ) const +{ + for( const XMLNode* node = _firstChild; node; node = node->_next ) { + const XMLElement* element = node->ToElementWithName( name ); + if ( element ) { + return element; + } + } + return 0; +} + + +const XMLElement* XMLNode::LastChildElement( const char* name ) const +{ + for( const XMLNode* node = _lastChild; node; node = node->_prev ) { + const XMLElement* element = node->ToElementWithName( name ); + if ( element ) { + return element; + } + } + return 0; +} + + +const XMLElement* XMLNode::NextSiblingElement( const char* name ) const +{ + for( const XMLNode* node = _next; node; node = node->_next ) { + const XMLElement* element = node->ToElementWithName( name ); + if ( element ) { + return element; + } + } + return 0; +} + + +const XMLElement* XMLNode::PreviousSiblingElement( const char* name ) const +{ + for( const XMLNode* node = _prev; node; node = node->_prev ) { + const XMLElement* element = node->ToElementWithName( name ); + if ( element ) { + return element; + } + } + return 0; +} + + +char* XMLNode::ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ) +{ + // This is a recursive method, but thinking about it "at the current level" + // it is a pretty simple flat list: + // + // + // + // With a special case: + // + // + // + // + // Where the closing element (/foo) *must* be the next thing after the opening + // element, and the names must match. BUT the tricky bit is that the closing + // element will be read by the child. + // + // 'endTag' is the end tag for this node, it is returned by a call to a child. + // 'parentEnd' is the end tag for the parent, which is filled in and returned. + + while( p && *p ) { + XMLNode* node = 0; + + p = _document->Identify( p, &node ); + TIXMLASSERT( p ); + if ( node == 0 ) { + break; + } + + int initialLineNum = node->_parseLineNum; + + StrPair endTag; + p = node->ParseDeep( p, &endTag, curLineNumPtr ); + if ( !p ) { + DeleteNode( node ); + if ( !_document->Error() ) { + _document->SetError( XML_ERROR_PARSING, initialLineNum, 0); + } + break; + } + + XMLDeclaration* decl = node->ToDeclaration(); + if ( decl ) { + // Declarations are only allowed at document level + bool wellLocated = ( ToDocument() != 0 ); + if ( wellLocated ) { + // Multiple declarations are allowed but all declarations + // must occur before anything else + for ( const XMLNode* existingNode = _document->FirstChild(); existingNode; existingNode = existingNode->NextSibling() ) { + if ( !existingNode->ToDeclaration() ) { + wellLocated = false; + break; + } + } + } + if ( !wellLocated ) { + _document->SetError( XML_ERROR_PARSING_DECLARATION, initialLineNum, "XMLDeclaration value=%s", decl->Value()); + DeleteNode( node ); + break; + } + } + + XMLElement* ele = node->ToElement(); + if ( ele ) { + // We read the end tag. Return it to the parent. + if ( ele->ClosingType() == XMLElement::CLOSING ) { + if ( parentEndTag ) { + ele->_value.TransferTo( parentEndTag ); + } + node->_memPool->SetTracked(); // created and then immediately deleted. + DeleteNode( node ); + return p; + } + + // Handle an end tag returned to this level. + // And handle a bunch of annoying errors. + bool mismatch = false; + if ( endTag.Empty() ) { + if ( ele->ClosingType() == XMLElement::OPEN ) { + mismatch = true; + } + } + else { + if ( ele->ClosingType() != XMLElement::OPEN ) { + mismatch = true; + } + else if ( !XMLUtil::StringEqual( endTag.GetStr(), ele->Name() ) ) { + mismatch = true; + } + } + if ( mismatch ) { + _document->SetError( XML_ERROR_MISMATCHED_ELEMENT, initialLineNum, "XMLElement name=%s", ele->Name()); + DeleteNode( node ); + break; + } + } + InsertEndChild( node ); + } + return 0; +} + +/*static*/ void XMLNode::DeleteNode( XMLNode* node ) +{ + if ( node == 0 ) { + return; + } + TIXMLASSERT(node->_document); + if (!node->ToDocument()) { + node->_document->MarkInUse(node); + } + + MemPool* pool = node->_memPool; + node->~XMLNode(); + pool->Free( node ); +} + +void XMLNode::InsertChildPreamble( XMLNode* insertThis ) const +{ + TIXMLASSERT( insertThis ); + TIXMLASSERT( insertThis->_document == _document ); + + if (insertThis->_parent) { + insertThis->_parent->Unlink( insertThis ); + } + else { + insertThis->_document->MarkInUse(insertThis); + insertThis->_memPool->SetTracked(); + } +} + +const XMLElement* XMLNode::ToElementWithName( const char* name ) const +{ + const XMLElement* element = this->ToElement(); + if ( element == 0 ) { + return 0; + } + if ( name == 0 ) { + return element; + } + if ( XMLUtil::StringEqual( element->Name(), name ) ) { + return element; + } + return 0; +} + +// --------- XMLText ---------- // +char* XMLText::ParseDeep( char* p, StrPair*, int* curLineNumPtr ) +{ + if ( this->CData() ) { + p = _value.ParseText( p, "]]>", StrPair::NEEDS_NEWLINE_NORMALIZATION, curLineNumPtr ); + if ( !p ) { + _document->SetError( XML_ERROR_PARSING_CDATA, _parseLineNum, 0 ); + } + return p; + } + else { + int flags = _document->ProcessEntities() ? StrPair::TEXT_ELEMENT : StrPair::TEXT_ELEMENT_LEAVE_ENTITIES; + if ( _document->WhitespaceMode() == COLLAPSE_WHITESPACE ) { + flags |= StrPair::NEEDS_WHITESPACE_COLLAPSING; + } + + p = _value.ParseText( p, "<", flags, curLineNumPtr ); + if ( p && *p ) { + return p-1; + } + if ( !p ) { + _document->SetError( XML_ERROR_PARSING_TEXT, _parseLineNum, 0 ); + } + } + return 0; +} + + +XMLNode* XMLText::ShallowClone( XMLDocument* doc ) const +{ + if ( !doc ) { + doc = _document; + } + XMLText* text = doc->NewText( Value() ); // fixme: this will always allocate memory. Intern? + text->SetCData( this->CData() ); + return text; +} + + +bool XMLText::ShallowEqual( const XMLNode* compare ) const +{ + TIXMLASSERT( compare ); + const XMLText* text = compare->ToText(); + return ( text && XMLUtil::StringEqual( text->Value(), Value() ) ); +} + + +bool XMLText::Accept( XMLVisitor* visitor ) const +{ + TIXMLASSERT( visitor ); + return visitor->Visit( *this ); +} + + +// --------- XMLComment ---------- // + +XMLComment::XMLComment( XMLDocument* doc ) : XMLNode( doc ) +{ +} + + +XMLComment::~XMLComment() +{ +} + + +char* XMLComment::ParseDeep( char* p, StrPair*, int* curLineNumPtr ) +{ + // Comment parses as text. + p = _value.ParseText( p, "-->", StrPair::COMMENT, curLineNumPtr ); + if ( p == 0 ) { + _document->SetError( XML_ERROR_PARSING_COMMENT, _parseLineNum, 0 ); + } + return p; +} + + +XMLNode* XMLComment::ShallowClone( XMLDocument* doc ) const +{ + if ( !doc ) { + doc = _document; + } + XMLComment* comment = doc->NewComment( Value() ); // fixme: this will always allocate memory. Intern? + return comment; +} + + +bool XMLComment::ShallowEqual( const XMLNode* compare ) const +{ + TIXMLASSERT( compare ); + const XMLComment* comment = compare->ToComment(); + return ( comment && XMLUtil::StringEqual( comment->Value(), Value() )); +} + + +bool XMLComment::Accept( XMLVisitor* visitor ) const +{ + TIXMLASSERT( visitor ); + return visitor->Visit( *this ); +} + + +// --------- XMLDeclaration ---------- // + +XMLDeclaration::XMLDeclaration( XMLDocument* doc ) : XMLNode( doc ) +{ +} + + +XMLDeclaration::~XMLDeclaration() +{ + //printf( "~XMLDeclaration\n" ); +} + + +char* XMLDeclaration::ParseDeep( char* p, StrPair*, int* curLineNumPtr ) +{ + // Declaration parses as text. + p = _value.ParseText( p, "?>", StrPair::NEEDS_NEWLINE_NORMALIZATION, curLineNumPtr ); + if ( p == 0 ) { + _document->SetError( XML_ERROR_PARSING_DECLARATION, _parseLineNum, 0 ); + } + return p; +} + + +XMLNode* XMLDeclaration::ShallowClone( XMLDocument* doc ) const +{ + if ( !doc ) { + doc = _document; + } + XMLDeclaration* dec = doc->NewDeclaration( Value() ); // fixme: this will always allocate memory. Intern? + return dec; +} + + +bool XMLDeclaration::ShallowEqual( const XMLNode* compare ) const +{ + TIXMLASSERT( compare ); + const XMLDeclaration* declaration = compare->ToDeclaration(); + return ( declaration && XMLUtil::StringEqual( declaration->Value(), Value() )); +} + + + +bool XMLDeclaration::Accept( XMLVisitor* visitor ) const +{ + TIXMLASSERT( visitor ); + return visitor->Visit( *this ); +} + +// --------- XMLUnknown ---------- // + +XMLUnknown::XMLUnknown( XMLDocument* doc ) : XMLNode( doc ) +{ +} + + +XMLUnknown::~XMLUnknown() +{ +} + + +char* XMLUnknown::ParseDeep( char* p, StrPair*, int* curLineNumPtr ) +{ + // Unknown parses as text. + p = _value.ParseText( p, ">", StrPair::NEEDS_NEWLINE_NORMALIZATION, curLineNumPtr ); + if ( !p ) { + _document->SetError( XML_ERROR_PARSING_UNKNOWN, _parseLineNum, 0 ); + } + return p; +} + + +XMLNode* XMLUnknown::ShallowClone( XMLDocument* doc ) const +{ + if ( !doc ) { + doc = _document; + } + XMLUnknown* text = doc->NewUnknown( Value() ); // fixme: this will always allocate memory. Intern? + return text; +} + + +bool XMLUnknown::ShallowEqual( const XMLNode* compare ) const +{ + TIXMLASSERT( compare ); + const XMLUnknown* unknown = compare->ToUnknown(); + return ( unknown && XMLUtil::StringEqual( unknown->Value(), Value() )); +} + + +bool XMLUnknown::Accept( XMLVisitor* visitor ) const +{ + TIXMLASSERT( visitor ); + return visitor->Visit( *this ); +} + +// --------- XMLAttribute ---------- // + +const char* XMLAttribute::Name() const +{ + return _name.GetStr(); +} + +const char* XMLAttribute::Value() const +{ + return _value.GetStr(); +} + +char* XMLAttribute::ParseDeep( char* p, bool processEntities, int* curLineNumPtr ) +{ + // Parse using the name rules: bug fix, was using ParseText before + p = _name.ParseName( p ); + if ( !p || !*p ) { + return 0; + } + + // Skip white space before = + p = XMLUtil::SkipWhiteSpace( p, curLineNumPtr ); + if ( *p != '=' ) { + return 0; + } + + ++p; // move up to opening quote + p = XMLUtil::SkipWhiteSpace( p, curLineNumPtr ); + if ( *p != '\"' && *p != '\'' ) { + return 0; + } + + char endTag[2] = { *p, 0 }; + ++p; // move past opening quote + + p = _value.ParseText( p, endTag, processEntities ? StrPair::ATTRIBUTE_VALUE : StrPair::ATTRIBUTE_VALUE_LEAVE_ENTITIES, curLineNumPtr ); + return p; +} + + +void XMLAttribute::SetName( const char* n ) +{ + _name.SetStr( n ); +} + + +XMLError XMLAttribute::QueryIntValue( int* value ) const +{ + if ( XMLUtil::ToInt( Value(), value )) { + return XML_SUCCESS; + } + return XML_WRONG_ATTRIBUTE_TYPE; +} + + +XMLError XMLAttribute::QueryUnsignedValue( unsigned int* value ) const +{ + if ( XMLUtil::ToUnsigned( Value(), value )) { + return XML_SUCCESS; + } + return XML_WRONG_ATTRIBUTE_TYPE; +} + + +XMLError XMLAttribute::QueryInt64Value(int64_t* value) const +{ + if (XMLUtil::ToInt64(Value(), value)) { + return XML_SUCCESS; + } + return XML_WRONG_ATTRIBUTE_TYPE; +} + + +XMLError XMLAttribute::QueryBoolValue( bool* value ) const +{ + if ( XMLUtil::ToBool( Value(), value )) { + return XML_SUCCESS; + } + return XML_WRONG_ATTRIBUTE_TYPE; +} + + +XMLError XMLAttribute::QueryFloatValue( float* value ) const +{ + if ( XMLUtil::ToFloat( Value(), value )) { + return XML_SUCCESS; + } + return XML_WRONG_ATTRIBUTE_TYPE; +} + + +XMLError XMLAttribute::QueryDoubleValue( double* value ) const +{ + if ( XMLUtil::ToDouble( Value(), value )) { + return XML_SUCCESS; + } + return XML_WRONG_ATTRIBUTE_TYPE; +} + + +void XMLAttribute::SetAttribute( const char* v ) +{ + _value.SetStr( v ); +} + + +void XMLAttribute::SetAttribute( int v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + _value.SetStr( buf ); +} + + +void XMLAttribute::SetAttribute( unsigned v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + _value.SetStr( buf ); +} + + +void XMLAttribute::SetAttribute(int64_t v) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr(v, buf, BUF_SIZE); + _value.SetStr(buf); +} + + + +void XMLAttribute::SetAttribute( bool v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + _value.SetStr( buf ); +} + +void XMLAttribute::SetAttribute( double v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + _value.SetStr( buf ); +} + +void XMLAttribute::SetAttribute( float v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + _value.SetStr( buf ); +} + + +// --------- XMLElement ---------- // +XMLElement::XMLElement( XMLDocument* doc ) : XMLNode( doc ), + _closingType( OPEN ), + _rootAttribute( 0 ) +{ +} + + +XMLElement::~XMLElement() +{ + while( _rootAttribute ) { + XMLAttribute* next = _rootAttribute->_next; + DeleteAttribute( _rootAttribute ); + _rootAttribute = next; + } +} + + +const XMLAttribute* XMLElement::FindAttribute( const char* name ) const +{ + for( XMLAttribute* a = _rootAttribute; a; a = a->_next ) { + if ( XMLUtil::StringEqual( a->Name(), name ) ) { + return a; + } + } + return 0; +} + + +const char* XMLElement::Attribute( const char* name, const char* value ) const +{ + const XMLAttribute* a = FindAttribute( name ); + if ( !a ) { + return 0; + } + if ( !value || XMLUtil::StringEqual( a->Value(), value )) { + return a->Value(); + } + return 0; +} + +int XMLElement::IntAttribute(const char* name, int defaultValue) const +{ + int i = defaultValue; + QueryIntAttribute(name, &i); + return i; +} + +unsigned XMLElement::UnsignedAttribute(const char* name, unsigned defaultValue) const +{ + unsigned i = defaultValue; + QueryUnsignedAttribute(name, &i); + return i; +} + +int64_t XMLElement::Int64Attribute(const char* name, int64_t defaultValue) const +{ + int64_t i = defaultValue; + QueryInt64Attribute(name, &i); + return i; +} + +bool XMLElement::BoolAttribute(const char* name, bool defaultValue) const +{ + bool b = defaultValue; + QueryBoolAttribute(name, &b); + return b; +} + +double XMLElement::DoubleAttribute(const char* name, double defaultValue) const +{ + double d = defaultValue; + QueryDoubleAttribute(name, &d); + return d; +} + +float XMLElement::FloatAttribute(const char* name, float defaultValue) const +{ + float f = defaultValue; + QueryFloatAttribute(name, &f); + return f; +} + +const char* XMLElement::GetText() const +{ + if ( FirstChild() && FirstChild()->ToText() ) { + return FirstChild()->Value(); + } + return 0; +} + + +void XMLElement::SetText( const char* inText ) +{ + if ( FirstChild() && FirstChild()->ToText() ) + FirstChild()->SetValue( inText ); + else { + XMLText* theText = GetDocument()->NewText( inText ); + InsertFirstChild( theText ); + } +} + + +void XMLElement::SetText( int v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + SetText( buf ); +} + + +void XMLElement::SetText( unsigned v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + SetText( buf ); +} + + +void XMLElement::SetText(int64_t v) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr(v, buf, BUF_SIZE); + SetText(buf); +} + + +void XMLElement::SetText( bool v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + SetText( buf ); +} + + +void XMLElement::SetText( float v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + SetText( buf ); +} + + +void XMLElement::SetText( double v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + SetText( buf ); +} + + +XMLError XMLElement::QueryIntText( int* ival ) const +{ + if ( FirstChild() && FirstChild()->ToText() ) { + const char* t = FirstChild()->Value(); + if ( XMLUtil::ToInt( t, ival ) ) { + return XML_SUCCESS; + } + return XML_CAN_NOT_CONVERT_TEXT; + } + return XML_NO_TEXT_NODE; +} + + +XMLError XMLElement::QueryUnsignedText( unsigned* uval ) const +{ + if ( FirstChild() && FirstChild()->ToText() ) { + const char* t = FirstChild()->Value(); + if ( XMLUtil::ToUnsigned( t, uval ) ) { + return XML_SUCCESS; + } + return XML_CAN_NOT_CONVERT_TEXT; + } + return XML_NO_TEXT_NODE; +} + + +XMLError XMLElement::QueryInt64Text(int64_t* ival) const +{ + if (FirstChild() && FirstChild()->ToText()) { + const char* t = FirstChild()->Value(); + if (XMLUtil::ToInt64(t, ival)) { + return XML_SUCCESS; + } + return XML_CAN_NOT_CONVERT_TEXT; + } + return XML_NO_TEXT_NODE; +} + + +XMLError XMLElement::QueryBoolText( bool* bval ) const +{ + if ( FirstChild() && FirstChild()->ToText() ) { + const char* t = FirstChild()->Value(); + if ( XMLUtil::ToBool( t, bval ) ) { + return XML_SUCCESS; + } + return XML_CAN_NOT_CONVERT_TEXT; + } + return XML_NO_TEXT_NODE; +} + + +XMLError XMLElement::QueryDoubleText( double* dval ) const +{ + if ( FirstChild() && FirstChild()->ToText() ) { + const char* t = FirstChild()->Value(); + if ( XMLUtil::ToDouble( t, dval ) ) { + return XML_SUCCESS; + } + return XML_CAN_NOT_CONVERT_TEXT; + } + return XML_NO_TEXT_NODE; +} + + +XMLError XMLElement::QueryFloatText( float* fval ) const +{ + if ( FirstChild() && FirstChild()->ToText() ) { + const char* t = FirstChild()->Value(); + if ( XMLUtil::ToFloat( t, fval ) ) { + return XML_SUCCESS; + } + return XML_CAN_NOT_CONVERT_TEXT; + } + return XML_NO_TEXT_NODE; +} + +int XMLElement::IntText(int defaultValue) const +{ + int i = defaultValue; + QueryIntText(&i); + return i; +} + +unsigned XMLElement::UnsignedText(unsigned defaultValue) const +{ + unsigned i = defaultValue; + QueryUnsignedText(&i); + return i; +} + +int64_t XMLElement::Int64Text(int64_t defaultValue) const +{ + int64_t i = defaultValue; + QueryInt64Text(&i); + return i; +} + +bool XMLElement::BoolText(bool defaultValue) const +{ + bool b = defaultValue; + QueryBoolText(&b); + return b; +} + +double XMLElement::DoubleText(double defaultValue) const +{ + double d = defaultValue; + QueryDoubleText(&d); + return d; +} + +float XMLElement::FloatText(float defaultValue) const +{ + float f = defaultValue; + QueryFloatText(&f); + return f; +} + + +XMLAttribute* XMLElement::FindOrCreateAttribute( const char* name ) +{ + XMLAttribute* last = 0; + XMLAttribute* attrib = 0; + for( attrib = _rootAttribute; + attrib; + last = attrib, attrib = attrib->_next ) { + if ( XMLUtil::StringEqual( attrib->Name(), name ) ) { + break; + } + } + if ( !attrib ) { + attrib = CreateAttribute(); + TIXMLASSERT( attrib ); + if ( last ) { + TIXMLASSERT( last->_next == 0 ); + last->_next = attrib; + } + else { + TIXMLASSERT( _rootAttribute == 0 ); + _rootAttribute = attrib; + } + attrib->SetName( name ); + } + return attrib; +} + + +void XMLElement::DeleteAttribute( const char* name ) +{ + XMLAttribute* prev = 0; + for( XMLAttribute* a=_rootAttribute; a; a=a->_next ) { + if ( XMLUtil::StringEqual( name, a->Name() ) ) { + if ( prev ) { + prev->_next = a->_next; + } + else { + _rootAttribute = a->_next; + } + DeleteAttribute( a ); + break; + } + prev = a; + } +} + + +char* XMLElement::ParseAttributes( char* p, int* curLineNumPtr ) +{ + XMLAttribute* prevAttribute = 0; + + // Read the attributes. + while( p ) { + p = XMLUtil::SkipWhiteSpace( p, curLineNumPtr ); + if ( !(*p) ) { + _document->SetError( XML_ERROR_PARSING_ELEMENT, _parseLineNum, "XMLElement name=%s", Name() ); + return 0; + } + + // attribute. + if (XMLUtil::IsNameStartChar( *p ) ) { + XMLAttribute* attrib = CreateAttribute(); + TIXMLASSERT( attrib ); + attrib->_parseLineNum = _document->_parseCurLineNum; + + int attrLineNum = attrib->_parseLineNum; + + p = attrib->ParseDeep( p, _document->ProcessEntities(), curLineNumPtr ); + if ( !p || Attribute( attrib->Name() ) ) { + DeleteAttribute( attrib ); + _document->SetError( XML_ERROR_PARSING_ATTRIBUTE, attrLineNum, "XMLElement name=%s", Name() ); + return 0; + } + // There is a minor bug here: if the attribute in the source xml + // document is duplicated, it will not be detected and the + // attribute will be doubly added. However, tracking the 'prevAttribute' + // avoids re-scanning the attribute list. Preferring performance for + // now, may reconsider in the future. + if ( prevAttribute ) { + TIXMLASSERT( prevAttribute->_next == 0 ); + prevAttribute->_next = attrib; + } + else { + TIXMLASSERT( _rootAttribute == 0 ); + _rootAttribute = attrib; + } + prevAttribute = attrib; + } + // end of the tag + else if ( *p == '>' ) { + ++p; + break; + } + // end of the tag + else if ( *p == '/' && *(p+1) == '>' ) { + _closingType = CLOSED; + return p+2; // done; sealed element. + } + else { + _document->SetError( XML_ERROR_PARSING_ELEMENT, _parseLineNum, 0 ); + return 0; + } + } + return p; +} + +void XMLElement::DeleteAttribute( XMLAttribute* attribute ) +{ + if ( attribute == 0 ) { + return; + } + MemPool* pool = attribute->_memPool; + attribute->~XMLAttribute(); + pool->Free( attribute ); +} + +XMLAttribute* XMLElement::CreateAttribute() +{ + TIXMLASSERT( sizeof( XMLAttribute ) == _document->_attributePool.ItemSize() ); + XMLAttribute* attrib = new (_document->_attributePool.Alloc() ) XMLAttribute(); + TIXMLASSERT( attrib ); + attrib->_memPool = &_document->_attributePool; + attrib->_memPool->SetTracked(); + return attrib; +} + +// +// +// foobar +// +char* XMLElement::ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ) +{ + // Read the element name. + p = XMLUtil::SkipWhiteSpace( p, curLineNumPtr ); + + // The closing element is the form. It is + // parsed just like a regular element then deleted from + // the DOM. + if ( *p == '/' ) { + _closingType = CLOSING; + ++p; + } + + p = _value.ParseName( p ); + if ( _value.Empty() ) { + return 0; + } + + p = ParseAttributes( p, curLineNumPtr ); + if ( !p || !*p || _closingType != OPEN ) { + return p; + } + + p = XMLNode::ParseDeep( p, parentEndTag, curLineNumPtr ); + return p; +} + + + +XMLNode* XMLElement::ShallowClone( XMLDocument* doc ) const +{ + if ( !doc ) { + doc = _document; + } + XMLElement* element = doc->NewElement( Value() ); // fixme: this will always allocate memory. Intern? + for( const XMLAttribute* a=FirstAttribute(); a; a=a->Next() ) { + element->SetAttribute( a->Name(), a->Value() ); // fixme: this will always allocate memory. Intern? + } + return element; +} + + +bool XMLElement::ShallowEqual( const XMLNode* compare ) const +{ + TIXMLASSERT( compare ); + const XMLElement* other = compare->ToElement(); + if ( other && XMLUtil::StringEqual( other->Name(), Name() )) { + + const XMLAttribute* a=FirstAttribute(); + const XMLAttribute* b=other->FirstAttribute(); + + while ( a && b ) { + if ( !XMLUtil::StringEqual( a->Value(), b->Value() ) ) { + return false; + } + a = a->Next(); + b = b->Next(); + } + if ( a || b ) { + // different count + return false; + } + return true; + } + return false; +} + + +bool XMLElement::Accept( XMLVisitor* visitor ) const +{ + TIXMLASSERT( visitor ); + if ( visitor->VisitEnter( *this, _rootAttribute ) ) { + for ( const XMLNode* node=FirstChild(); node; node=node->NextSibling() ) { + if ( !node->Accept( visitor ) ) { + break; + } + } + } + return visitor->VisitExit( *this ); +} + + +// --------- XMLDocument ----------- // + +// Warning: List must match 'enum XMLError' +const char* XMLDocument::_errorNames[XML_ERROR_COUNT] = { + "XML_SUCCESS", + "XML_NO_ATTRIBUTE", + "XML_WRONG_ATTRIBUTE_TYPE", + "XML_ERROR_FILE_NOT_FOUND", + "XML_ERROR_FILE_COULD_NOT_BE_OPENED", + "XML_ERROR_FILE_READ_ERROR", + "UNUSED_XML_ERROR_ELEMENT_MISMATCH", + "XML_ERROR_PARSING_ELEMENT", + "XML_ERROR_PARSING_ATTRIBUTE", + "UNUSED_XML_ERROR_IDENTIFYING_TAG", + "XML_ERROR_PARSING_TEXT", + "XML_ERROR_PARSING_CDATA", + "XML_ERROR_PARSING_COMMENT", + "XML_ERROR_PARSING_DECLARATION", + "XML_ERROR_PARSING_UNKNOWN", + "XML_ERROR_EMPTY_DOCUMENT", + "XML_ERROR_MISMATCHED_ELEMENT", + "XML_ERROR_PARSING", + "XML_CAN_NOT_CONVERT_TEXT", + "XML_NO_TEXT_NODE" +}; + + +XMLDocument::XMLDocument( bool processEntities, Whitespace whitespaceMode ) : + XMLNode( 0 ), + _writeBOM( false ), + _processEntities( processEntities ), + _errorID(XML_SUCCESS), + _whitespaceMode( whitespaceMode ), + _errorStr(), + _errorLineNum( 0 ), + _charBuffer( 0 ), + _parseCurLineNum( 0 ), + _unlinked(), + _elementPool(), + _attributePool(), + _textPool(), + _commentPool() +{ + // avoid VC++ C4355 warning about 'this' in initializer list (C4355 is off by default in VS2012+) + _document = this; +} + + +XMLDocument::~XMLDocument() +{ + Clear(); +} + + +void XMLDocument::MarkInUse(XMLNode* node) +{ + TIXMLASSERT(node); + TIXMLASSERT(node->_parent == 0); + + for (int i = 0; i < _unlinked.Size(); ++i) { + if (node == _unlinked[i]) { + _unlinked.SwapRemove(i); + break; + } + } +} + +void XMLDocument::Clear() +{ + DeleteChildren(); + while( _unlinked.Size()) { + DeleteNode(_unlinked[0]); // Will remove from _unlinked as part of delete. + } + +#ifdef DEBUG + const bool hadError = Error(); +#endif + ClearError(); + + delete [] _charBuffer; + _charBuffer = 0; + +#if 0 + _textPool.Trace( "text" ); + _elementPool.Trace( "element" ); + _commentPool.Trace( "comment" ); + _attributePool.Trace( "attribute" ); +#endif + +#ifdef DEBUG + if ( !hadError ) { + TIXMLASSERT( _elementPool.CurrentAllocs() == _elementPool.Untracked() ); + TIXMLASSERT( _attributePool.CurrentAllocs() == _attributePool.Untracked() ); + TIXMLASSERT( _textPool.CurrentAllocs() == _textPool.Untracked() ); + TIXMLASSERT( _commentPool.CurrentAllocs() == _commentPool.Untracked() ); + } +#endif +} + + +void XMLDocument::DeepCopy(XMLDocument* target) const +{ + TIXMLASSERT(target); + if (target == this) { + return; // technically success - a no-op. + } + + target->Clear(); + for (const XMLNode* node = this->FirstChild(); node; node = node->NextSibling()) { + target->InsertEndChild(node->DeepClone(target)); + } +} + +XMLElement* XMLDocument::NewElement( const char* name ) +{ + XMLElement* ele = CreateUnlinkedNode( _elementPool ); + ele->SetName( name ); + return ele; +} + + +XMLComment* XMLDocument::NewComment( const char* str ) +{ + XMLComment* comment = CreateUnlinkedNode( _commentPool ); + comment->SetValue( str ); + return comment; +} + + +XMLText* XMLDocument::NewText( const char* str ) +{ + XMLText* text = CreateUnlinkedNode( _textPool ); + text->SetValue( str ); + return text; +} + + +XMLDeclaration* XMLDocument::NewDeclaration( const char* str ) +{ + XMLDeclaration* dec = CreateUnlinkedNode( _commentPool ); + dec->SetValue( str ? str : "xml version=\"1.0\" encoding=\"UTF-8\"" ); + return dec; +} + + +XMLUnknown* XMLDocument::NewUnknown( const char* str ) +{ + XMLUnknown* unk = CreateUnlinkedNode( _commentPool ); + unk->SetValue( str ); + return unk; +} + +static FILE* callfopen( const char* filepath, const char* mode ) +{ + TIXMLASSERT( filepath ); + TIXMLASSERT( mode ); +#if defined(_MSC_VER) && (_MSC_VER >= 1400 ) && (!defined WINCE) + FILE* fp = 0; + errno_t err = fopen_s( &fp, filepath, mode ); + if ( err ) { + return 0; + } +#else + FILE* fp = fopen( filepath, mode ); +#endif + return fp; +} + +void XMLDocument::DeleteNode( XMLNode* node ) { + TIXMLASSERT( node ); + TIXMLASSERT(node->_document == this ); + if (node->_parent) { + node->_parent->DeleteChild( node ); + } + else { + // Isn't in the tree. + // Use the parent delete. + // Also, we need to mark it tracked: we 'know' + // it was never used. + node->_memPool->SetTracked(); + // Call the static XMLNode version: + XMLNode::DeleteNode(node); + } +} + + +XMLError XMLDocument::LoadFile( const char* filename ) +{ + Clear(); + FILE* fp = callfopen( filename, "rb" ); + if ( !fp ) { + SetError( XML_ERROR_FILE_NOT_FOUND, 0, "filename=%s", filename ? filename : ""); + return _errorID; + } + LoadFile( fp ); + fclose( fp ); + return _errorID; +} + +// This is likely overengineered template art to have a check that unsigned long value incremented +// by one still fits into size_t. If size_t type is larger than unsigned long type +// (x86_64-w64-mingw32 target) then the check is redundant and gcc and clang emit +// -Wtype-limits warning. This piece makes the compiler select code with a check when a check +// is useful and code with no check when a check is redundant depending on how size_t and unsigned long +// types sizes relate to each other. +template += sizeof(size_t))> +struct LongFitsIntoSizeTMinusOne { + static bool Fits( unsigned long value ) + { + return value < (size_t)-1; + } +}; + +template <> +struct LongFitsIntoSizeTMinusOne { + static bool Fits( unsigned long ) + { + return true; + } +}; + +XMLError XMLDocument::LoadFile( FILE* fp ) +{ + Clear(); + + fseek( fp, 0, SEEK_SET ); + if ( fgetc( fp ) == EOF && ferror( fp ) != 0 ) { + SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); + return _errorID; + } + + fseek( fp, 0, SEEK_END ); + const long filelength = ftell( fp ); + fseek( fp, 0, SEEK_SET ); + if ( filelength == -1L ) { + SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); + return _errorID; + } + TIXMLASSERT( filelength >= 0 ); + + if ( !LongFitsIntoSizeTMinusOne<>::Fits( filelength ) ) { + // Cannot handle files which won't fit in buffer together with null terminator + SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); + return _errorID; + } + + if ( filelength == 0 ) { + SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 ); + return _errorID; + } + + const size_t size = filelength; + TIXMLASSERT( _charBuffer == 0 ); + _charBuffer = new char[size+1]; + size_t read = fread( _charBuffer, 1, size, fp ); + if ( read != size ) { + SetError( XML_ERROR_FILE_READ_ERROR, 0, 0 ); + return _errorID; + } + + _charBuffer[size] = 0; + + Parse(); + return _errorID; +} + + +XMLError XMLDocument::SaveFile( const char* filename, bool compact ) +{ + FILE* fp = callfopen( filename, "w" ); + if ( !fp ) { + SetError( XML_ERROR_FILE_COULD_NOT_BE_OPENED, 0, "filename=%s", filename ? filename : ""); + return _errorID; + } + SaveFile(fp, compact); + fclose( fp ); + return _errorID; +} + + +XMLError XMLDocument::SaveFile( FILE* fp, bool compact ) +{ + // Clear any error from the last save, otherwise it will get reported + // for *this* call. + ClearError(); + XMLPrinter stream( fp, compact ); + Print( &stream ); + return _errorID; +} + + +XMLError XMLDocument::Parse( const char* p, size_t len ) +{ + Clear(); + + if ( len == 0 || !p || !*p ) { + SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 ); + return _errorID; + } + if ( len == (size_t)(-1) ) { + len = strlen( p ); + } + TIXMLASSERT( _charBuffer == 0 ); + _charBuffer = new char[ len+1 ]; + memcpy( _charBuffer, p, len ); + _charBuffer[len] = 0; + + Parse(); + if ( Error() ) { + // clean up now essentially dangling memory. + // and the parse fail can put objects in the + // pools that are dead and inaccessible. + DeleteChildren(); + _elementPool.Clear(); + _attributePool.Clear(); + _textPool.Clear(); + _commentPool.Clear(); + } + return _errorID; +} + + +void XMLDocument::Print( XMLPrinter* streamer ) const +{ + if ( streamer ) { + Accept( streamer ); + } + else { + XMLPrinter stdoutStreamer( stdout ); + Accept( &stdoutStreamer ); + } +} + + +void XMLDocument::SetError( XMLError error, int lineNum, const char* format, ... ) +{ + TIXMLASSERT( error >= 0 && error < XML_ERROR_COUNT ); + _errorID = error; + _errorLineNum = lineNum; + _errorStr.Reset(); + + if (format) { + size_t BUFFER_SIZE = 1000; + char* buffer = new char[BUFFER_SIZE]; + TIXML_SNPRINTF(buffer, BUFFER_SIZE, "Error=%s ErrorID=%d (0x%x) Line number=%d: ", ErrorIDToName(error), int(error), int(error), lineNum); + size_t len = strlen(buffer); + + va_list va; + va_start( va, format ); + TIXML_VSNPRINTF( buffer + len, BUFFER_SIZE - len, format, va ); + va_end( va ); + + _errorStr.SetStr(buffer); + delete [] buffer; + } +} + + +/*static*/ const char* XMLDocument::ErrorIDToName(XMLError errorID) +{ + TIXMLASSERT( errorID >= 0 && errorID < XML_ERROR_COUNT ); + const char* errorName = _errorNames[errorID]; + TIXMLASSERT( errorName && errorName[0] ); + return errorName; +} + +const char* XMLDocument::ErrorStr() const +{ + return _errorStr.Empty() ? "" : _errorStr.GetStr(); +} + + +void XMLDocument::PrintError() const +{ + printf("%s\n", ErrorStr()); +} + +const char* XMLDocument::ErrorName() const +{ + return ErrorIDToName(_errorID); +} + +void XMLDocument::Parse() +{ + TIXMLASSERT( NoChildren() ); // Clear() must have been called previously + TIXMLASSERT( _charBuffer ); + _parseCurLineNum = 1; + _parseLineNum = 1; + char* p = _charBuffer; + p = XMLUtil::SkipWhiteSpace( p, &_parseCurLineNum ); + p = const_cast( XMLUtil::ReadBOM( p, &_writeBOM ) ); + if ( !*p ) { + SetError( XML_ERROR_EMPTY_DOCUMENT, 0, 0 ); + return; + } + ParseDeep(p, 0, &_parseCurLineNum ); +} + +XMLPrinter::XMLPrinter( FILE* file, bool compact, int depth ) : + _elementJustOpened( false ), + _stack(), + _firstElement( true ), + _fp( file ), + _depth( depth ), + _textDepth( -1 ), + _processEntities( true ), + _compactMode( compact ), + _buffer() +{ + for( int i=0; i'] = true; // not required, but consistency is nice + _buffer.Push( 0 ); +} + + +void XMLPrinter::Print( const char* format, ... ) +{ + va_list va; + va_start( va, format ); + + if ( _fp ) { + vfprintf( _fp, format, va ); + } + else { + const int len = TIXML_VSCPRINTF( format, va ); + // Close out and re-start the va-args + va_end( va ); + TIXMLASSERT( len >= 0 ); + va_start( va, format ); + TIXMLASSERT( _buffer.Size() > 0 && _buffer[_buffer.Size() - 1] == 0 ); + char* p = _buffer.PushArr( len ) - 1; // back up over the null terminator. + TIXML_VSNPRINTF( p, len+1, format, va ); + } + va_end( va ); +} + + +void XMLPrinter::Write( const char* data, size_t size ) +{ + if ( _fp ) { + fwrite ( data , sizeof(char), size, _fp); + } + else { + char* p = _buffer.PushArr( size ) - 1; // back up over the null terminator. + memcpy( p, data, size ); + p[size] = 0; + } +} + + +void XMLPrinter::Putc( char ch ) +{ + if ( _fp ) { + fputc ( ch, _fp); + } + else { + char* p = _buffer.PushArr( sizeof(char) ) - 1; // back up over the null terminator. + p[0] = ch; + p[1] = 0; + } +} + + +void XMLPrinter::PrintSpace( int depth ) +{ + for( int i=0; i 0 && *q < ENTITY_RANGE ) { + // Check for entities. If one is found, flush + // the stream up until the entity, write the + // entity, and keep looking. + if ( flag[(unsigned char)(*q)] ) { + while ( p < q ) { + const size_t delta = q - p; + const int toPrint = ( INT_MAX < delta ) ? INT_MAX : (int)delta; + Write( p, toPrint ); + p += toPrint; + } + bool entityPatternPrinted = false; + for( int i=0; i( bom ) ); + } + if ( writeDec ) { + PushDeclaration( "xml version=\"1.0\"" ); + } +} + + +void XMLPrinter::OpenElement( const char* name, bool compactMode ) +{ + SealElementIfJustOpened(); + _stack.Push( name ); + + if ( _textDepth < 0 && !_firstElement && !compactMode ) { + Putc( '\n' ); + } + if ( !compactMode ) { + PrintSpace( _depth ); + } + + Write ( "<" ); + Write ( name ); + + _elementJustOpened = true; + _firstElement = false; + ++_depth; +} + + +void XMLPrinter::PushAttribute( const char* name, const char* value ) +{ + TIXMLASSERT( _elementJustOpened ); + Putc ( ' ' ); + Write( name ); + Write( "=\"" ); + PrintString( value, false ); + Putc ( '\"' ); +} + + +void XMLPrinter::PushAttribute( const char* name, int v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + PushAttribute( name, buf ); +} + + +void XMLPrinter::PushAttribute( const char* name, unsigned v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + PushAttribute( name, buf ); +} + + +void XMLPrinter::PushAttribute(const char* name, int64_t v) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr(v, buf, BUF_SIZE); + PushAttribute(name, buf); +} + + +void XMLPrinter::PushAttribute( const char* name, bool v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + PushAttribute( name, buf ); +} + + +void XMLPrinter::PushAttribute( const char* name, double v ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( v, buf, BUF_SIZE ); + PushAttribute( name, buf ); +} + + +void XMLPrinter::CloseElement( bool compactMode ) +{ + --_depth; + const char* name = _stack.Pop(); + + if ( _elementJustOpened ) { + Write( "/>" ); + } + else { + if ( _textDepth < 0 && !compactMode) { + Putc( '\n' ); + PrintSpace( _depth ); + } + Write ( "" ); + } + + if ( _textDepth == _depth ) { + _textDepth = -1; + } + if ( _depth == 0 && !compactMode) { + Putc( '\n' ); + } + _elementJustOpened = false; +} + + +void XMLPrinter::SealElementIfJustOpened() +{ + if ( !_elementJustOpened ) { + return; + } + _elementJustOpened = false; + Putc( '>' ); +} + + +void XMLPrinter::PushText( const char* text, bool cdata ) +{ + _textDepth = _depth-1; + + SealElementIfJustOpened(); + if ( cdata ) { + Write( "" ); + } + else { + PrintString( text, true ); + } +} + +void XMLPrinter::PushText( int64_t value ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( value, buf, BUF_SIZE ); + PushText( buf, false ); +} + +void XMLPrinter::PushText( int value ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( value, buf, BUF_SIZE ); + PushText( buf, false ); +} + + +void XMLPrinter::PushText( unsigned value ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( value, buf, BUF_SIZE ); + PushText( buf, false ); +} + + +void XMLPrinter::PushText( bool value ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( value, buf, BUF_SIZE ); + PushText( buf, false ); +} + + +void XMLPrinter::PushText( float value ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( value, buf, BUF_SIZE ); + PushText( buf, false ); +} + + +void XMLPrinter::PushText( double value ) +{ + char buf[BUF_SIZE]; + XMLUtil::ToStr( value, buf, BUF_SIZE ); + PushText( buf, false ); +} + + +void XMLPrinter::PushComment( const char* comment ) +{ + SealElementIfJustOpened(); + if ( _textDepth < 0 && !_firstElement && !_compactMode) { + Putc( '\n' ); + PrintSpace( _depth ); + } + _firstElement = false; + + Write( "" ); +} + + +void XMLPrinter::PushDeclaration( const char* value ) +{ + SealElementIfJustOpened(); + if ( _textDepth < 0 && !_firstElement && !_compactMode) { + Putc( '\n' ); + PrintSpace( _depth ); + } + _firstElement = false; + + Write( "" ); +} + + +void XMLPrinter::PushUnknown( const char* value ) +{ + SealElementIfJustOpened(); + if ( _textDepth < 0 && !_firstElement && !_compactMode) { + Putc( '\n' ); + PrintSpace( _depth ); + } + _firstElement = false; + + Write( "' ); +} + + +bool XMLPrinter::VisitEnter( const XMLDocument& doc ) +{ + _processEntities = doc.ProcessEntities(); + if ( doc.HasBOM() ) { + PushHeader( true, false ); + } + return true; +} + + +bool XMLPrinter::VisitEnter( const XMLElement& element, const XMLAttribute* attribute ) +{ + const XMLElement* parentElem = 0; + if ( element.Parent() ) { + parentElem = element.Parent()->ToElement(); + } + const bool compactMode = parentElem ? CompactMode( *parentElem ) : _compactMode; + OpenElement( element.Name(), compactMode ); + while ( attribute ) { + PushAttribute( attribute->Name(), attribute->Value() ); + attribute = attribute->Next(); + } + return true; +} + + +bool XMLPrinter::VisitExit( const XMLElement& element ) +{ + CloseElement( CompactMode(element) ); + return true; +} + + +bool XMLPrinter::Visit( const XMLText& text ) +{ + PushText( text.Value(), text.CData() ); + return true; +} + + +bool XMLPrinter::Visit( const XMLComment& comment ) +{ + PushComment( comment.Value() ); + return true; +} + +bool XMLPrinter::Visit( const XMLDeclaration& declaration ) +{ + PushDeclaration( declaration.Value() ); + return true; +} + + +bool XMLPrinter::Visit( const XMLUnknown& unknown ) +{ + PushUnknown( unknown.Value() ); + return true; +} + +} // namespace tinyxml2 + diff --git a/lib/Io/Xml/tinyxml2.hpp b/lib/Io/Xml/tinyxml2.hpp new file mode 100644 index 0000000..1331615 --- /dev/null +++ b/lib/Io/Xml/tinyxml2.hpp @@ -0,0 +1,2272 @@ +/* +Original code by Lee Thomason (www.grinninglizard.com) + +This software is provided 'as-is', without any express or implied +warranty. In no event will the authors be held liable for any +damages arising from the use of this software. + +Permission is granted to anyone to use this software for any +purpose, including commercial applications, and to alter it and +redistribute it freely, subject to the following restrictions: + +1. The origin of this software must not be misrepresented; you must +not claim that you wrote the original software. If you use this +software in a product, an acknowledgment in the product documentation +would be appreciated but is not required. + +2. Altered source versions must be plainly marked as such, and +must not be misrepresented as being the original software. + +3. This notice may not be removed or altered from any source +distribution. +*/ + +#ifndef TINYXML2_INCLUDED +#define TINYXML2_INCLUDED + +#if defined(ANDROID_NDK) || defined(__BORLANDC__) || defined(__QNXNTO__) +# include +# include +# include +# include +# include +# if defined(__PS3__) +# include +# endif +#else +# include +# include +# include +# include +# include +#endif +#include + +/* + TODO: intern strings instead of allocation. +*/ +/* + gcc: + g++ -Wall -DDEBUG tinyxml2.cpp xmltest.cpp -o gccxmltest.exe + + Formatting, Artistic Style: + AStyle.exe --style=1tbs --indent-switches --break-closing-brackets --indent-preprocessor tinyxml2.cpp tinyxml2.h +*/ + +#if defined( _DEBUG ) || defined (__DEBUG__) +# ifndef DEBUG +# define DEBUG +# endif +#endif + +#ifdef _MSC_VER +# pragma warning(push) +# pragma warning(disable: 4251) +#endif + +#ifdef _WIN32 +# ifdef TINYXML2_EXPORT +# define TINYXML2_LIB __declspec(dllexport) +# elif defined(TINYXML2_IMPORT) +# define TINYXML2_LIB __declspec(dllimport) +# else +# define TINYXML2_LIB +# endif +#elif __GNUC__ >= 4 +# define TINYXML2_LIB __attribute__((visibility("default"))) +#else +# define TINYXML2_LIB +#endif + + +#if defined(DEBUG) +# if defined(_MSC_VER) +# // "(void)0," is for suppressing C4127 warning in "assert(false)", "assert(true)" and the like +# define TIXMLASSERT( x ) if ( !((void)0,(x))) { __debugbreak(); } +# elif defined (ANDROID_NDK) +# include +# define TIXMLASSERT( x ) if ( !(x)) { __android_log_assert( "assert", "grinliz", "ASSERT in '%s' at %d.", __FILE__, __LINE__ ); } +# else +# include +# define TIXMLASSERT assert +# endif +#else +# define TIXMLASSERT( x ) {} +#endif + + +/* Versioning, past 1.0.14: + http://semver.org/ +*/ +static const int TIXML2_MAJOR_VERSION = 5; +static const int TIXML2_MINOR_VERSION = 0; +static const int TIXML2_PATCH_VERSION = 1; + +namespace tinyxml2 +{ +class XMLDocument; +class XMLElement; +class XMLAttribute; +class XMLComment; +class XMLText; +class XMLDeclaration; +class XMLUnknown; +class XMLPrinter; + +/* + A class that wraps strings. Normally stores the start and end + pointers into the XML file itself, and will apply normalization + and entity translation if actually read. Can also store (and memory + manage) a traditional char[] +*/ +class StrPair +{ +public: + enum { + NEEDS_ENTITY_PROCESSING = 0x01, + NEEDS_NEWLINE_NORMALIZATION = 0x02, + NEEDS_WHITESPACE_COLLAPSING = 0x04, + + TEXT_ELEMENT = NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION, + TEXT_ELEMENT_LEAVE_ENTITIES = NEEDS_NEWLINE_NORMALIZATION, + ATTRIBUTE_NAME = 0, + ATTRIBUTE_VALUE = NEEDS_ENTITY_PROCESSING | NEEDS_NEWLINE_NORMALIZATION, + ATTRIBUTE_VALUE_LEAVE_ENTITIES = NEEDS_NEWLINE_NORMALIZATION, + COMMENT = NEEDS_NEWLINE_NORMALIZATION + }; + + StrPair() : _flags( 0 ), _start( 0 ), _end( 0 ) {} + ~StrPair(); + + void Set( char* start, char* end, int flags ) { + TIXMLASSERT( start ); + TIXMLASSERT( end ); + Reset(); + _start = start; + _end = end; + _flags = flags | NEEDS_FLUSH; + } + + const char* GetStr(); + + bool Empty() const { + return _start == _end; + } + + void SetInternedStr( const char* str ) { + Reset(); + _start = const_cast(str); + } + + void SetStr( const char* str, int flags=0 ); + + char* ParseText( char* in, const char* endTag, int strFlags, int* curLineNumPtr ); + char* ParseName( char* in ); + + void TransferTo( StrPair* other ); + void Reset(); + +private: + void CollapseWhitespace(); + + enum { + NEEDS_FLUSH = 0x100, + NEEDS_DELETE = 0x200 + }; + + int _flags; + char* _start; + char* _end; + + StrPair( const StrPair& other ); // not supported + void operator=( StrPair& other ); // not supported, use TransferTo() +}; + + +/* + A dynamic array of Plain Old Data. Doesn't support constructors, etc. + Has a small initial memory pool, so that low or no usage will not + cause a call to new/delete +*/ +template +class DynArray +{ +public: + DynArray() : + _mem( _pool ), + _allocated( INITIAL_SIZE ), + _size( 0 ) + { + } + + ~DynArray() { + if ( _mem != _pool ) { + delete [] _mem; + } + } + + void Clear() { + _size = 0; + } + + void Push( T t ) { + TIXMLASSERT( _size < INT_MAX ); + EnsureCapacity( _size+1 ); + _mem[_size] = t; + ++_size; + } + + T* PushArr( int count ) { + TIXMLASSERT( count >= 0 ); + TIXMLASSERT( _size <= INT_MAX - count ); + EnsureCapacity( _size+count ); + T* ret = &_mem[_size]; + _size += count; + return ret; + } + + T Pop() { + TIXMLASSERT( _size > 0 ); + --_size; + return _mem[_size]; + } + + void PopArr( int count ) { + TIXMLASSERT( _size >= count ); + _size -= count; + } + + bool Empty() const { + return _size == 0; + } + + T& operator[](int i) { + TIXMLASSERT( i>= 0 && i < _size ); + return _mem[i]; + } + + const T& operator[](int i) const { + TIXMLASSERT( i>= 0 && i < _size ); + return _mem[i]; + } + + const T& PeekTop() const { + TIXMLASSERT( _size > 0 ); + return _mem[ _size - 1]; + } + + int Size() const { + TIXMLASSERT( _size >= 0 ); + return _size; + } + + int Capacity() const { + TIXMLASSERT( _allocated >= INITIAL_SIZE ); + return _allocated; + } + + void SwapRemove(int i) { + TIXMLASSERT(i >= 0 && i < _size); + TIXMLASSERT(_size > 0); + _mem[i] = _mem[_size - 1]; + --_size; + } + + const T* Mem() const { + TIXMLASSERT( _mem ); + return _mem; + } + + T* Mem() { + TIXMLASSERT( _mem ); + return _mem; + } + +private: + DynArray( const DynArray& ); // not supported + void operator=( const DynArray& ); // not supported + + void EnsureCapacity( int cap ) { + TIXMLASSERT( cap > 0 ); + if ( cap > _allocated ) { + TIXMLASSERT( cap <= INT_MAX / 2 ); + int newAllocated = cap * 2; + T* newMem = new T[newAllocated]; + TIXMLASSERT( newAllocated >= _size ); + memcpy( newMem, _mem, sizeof(T)*_size ); // warning: not using constructors, only works for PODs + if ( _mem != _pool ) { + delete [] _mem; + } + _mem = newMem; + _allocated = newAllocated; + } + } + + T* _mem; + T _pool[INITIAL_SIZE]; + int _allocated; // objects allocated + int _size; // number objects in use +}; + + +/* + Parent virtual class of a pool for fast allocation + and deallocation of objects. +*/ +class MemPool +{ +public: + MemPool() {} + virtual ~MemPool() {} + + virtual int ItemSize() const = 0; + virtual void* Alloc() = 0; + virtual void Free( void* ) = 0; + virtual void SetTracked() = 0; + virtual void Clear() = 0; +}; + + +/* + Template child class to create pools of the correct type. +*/ +template< int ITEM_SIZE > +class MemPoolT : public MemPool +{ +public: + MemPoolT() : _blockPtrs(), _root(0), _currentAllocs(0), _nAllocs(0), _maxAllocs(0), _nUntracked(0) {} + ~MemPoolT() { + Clear(); + } + + void Clear() { + // Delete the blocks. + while( !_blockPtrs.Empty()) { + Block* lastBlock = _blockPtrs.Pop(); + delete lastBlock; + } + _root = 0; + _currentAllocs = 0; + _nAllocs = 0; + _maxAllocs = 0; + _nUntracked = 0; + } + + virtual int ItemSize() const { + return ITEM_SIZE; + } + int CurrentAllocs() const { + return _currentAllocs; + } + + virtual void* Alloc() { + if ( !_root ) { + // Need a new block. + Block* block = new Block(); + _blockPtrs.Push( block ); + + Item* blockItems = block->items; + for( int i = 0; i < ITEMS_PER_BLOCK - 1; ++i ) { + blockItems[i].next = &(blockItems[i + 1]); + } + blockItems[ITEMS_PER_BLOCK - 1].next = 0; + _root = blockItems; + } + Item* const result = _root; + TIXMLASSERT( result != 0 ); + _root = _root->next; + + ++_currentAllocs; + if ( _currentAllocs > _maxAllocs ) { + _maxAllocs = _currentAllocs; + } + ++_nAllocs; + ++_nUntracked; + return result; + } + + virtual void Free( void* mem ) { + if ( !mem ) { + return; + } + --_currentAllocs; + Item* item = static_cast( mem ); +#ifdef DEBUG + memset( item, 0xfe, sizeof( *item ) ); +#endif + item->next = _root; + _root = item; + } + void Trace( const char* name ) { + printf( "Mempool %s watermark=%d [%dk] current=%d size=%d nAlloc=%d blocks=%d\n", + name, _maxAllocs, _maxAllocs * ITEM_SIZE / 1024, _currentAllocs, + ITEM_SIZE, _nAllocs, _blockPtrs.Size() ); + } + + void SetTracked() { + --_nUntracked; + } + + int Untracked() const { + return _nUntracked; + } + + // This number is perf sensitive. 4k seems like a good tradeoff on my machine. + // The test file is large, 170k. + // Release: VS2010 gcc(no opt) + // 1k: 4000 + // 2k: 4000 + // 4k: 3900 21000 + // 16k: 5200 + // 32k: 4300 + // 64k: 4000 21000 + // Declared public because some compilers do not accept to use ITEMS_PER_BLOCK + // in private part if ITEMS_PER_BLOCK is private + enum { ITEMS_PER_BLOCK = (4 * 1024) / ITEM_SIZE }; + +private: + MemPoolT( const MemPoolT& ); // not supported + void operator=( const MemPoolT& ); // not supported + + union Item { + Item* next; + char itemData[ITEM_SIZE]; + }; + struct Block { + Item items[ITEMS_PER_BLOCK]; + }; + DynArray< Block*, 10 > _blockPtrs; + Item* _root; + + int _currentAllocs; + int _nAllocs; + int _maxAllocs; + int _nUntracked; +}; + + + +/** + Implements the interface to the "Visitor pattern" (see the Accept() method.) + If you call the Accept() method, it requires being passed a XMLVisitor + class to handle callbacks. For nodes that contain other nodes (Document, Element) + you will get called with a VisitEnter/VisitExit pair. Nodes that are always leafs + are simply called with Visit(). + + If you return 'true' from a Visit method, recursive parsing will continue. If you return + false, no children of this node or its siblings will be visited. + + All flavors of Visit methods have a default implementation that returns 'true' (continue + visiting). You need to only override methods that are interesting to you. + + Generally Accept() is called on the XMLDocument, although all nodes support visiting. + + You should never change the document from a callback. + + @sa XMLNode::Accept() +*/ +class TINYXML2_LIB XMLVisitor +{ +public: + virtual ~XMLVisitor() {} + + /// Visit a document. + virtual bool VisitEnter( const XMLDocument& /*doc*/ ) { + return true; + } + /// Visit a document. + virtual bool VisitExit( const XMLDocument& /*doc*/ ) { + return true; + } + + /// Visit an element. + virtual bool VisitEnter( const XMLElement& /*element*/, const XMLAttribute* /*firstAttribute*/ ) { + return true; + } + /// Visit an element. + virtual bool VisitExit( const XMLElement& /*element*/ ) { + return true; + } + + /// Visit a declaration. + virtual bool Visit( const XMLDeclaration& /*declaration*/ ) { + return true; + } + /// Visit a text node. + virtual bool Visit( const XMLText& /*text*/ ) { + return true; + } + /// Visit a comment node. + virtual bool Visit( const XMLComment& /*comment*/ ) { + return true; + } + /// Visit an unknown node. + virtual bool Visit( const XMLUnknown& /*unknown*/ ) { + return true; + } +}; + +// WARNING: must match XMLDocument::_errorNames[] +enum XMLError { + XML_SUCCESS = 0, + XML_NO_ATTRIBUTE, + XML_WRONG_ATTRIBUTE_TYPE, + XML_ERROR_FILE_NOT_FOUND, + XML_ERROR_FILE_COULD_NOT_BE_OPENED, + XML_ERROR_FILE_READ_ERROR, + UNUSED_XML_ERROR_ELEMENT_MISMATCH, // remove at next major version + XML_ERROR_PARSING_ELEMENT, + XML_ERROR_PARSING_ATTRIBUTE, + UNUSED_XML_ERROR_IDENTIFYING_TAG, // remove at next major version + XML_ERROR_PARSING_TEXT, + XML_ERROR_PARSING_CDATA, + XML_ERROR_PARSING_COMMENT, + XML_ERROR_PARSING_DECLARATION, + XML_ERROR_PARSING_UNKNOWN, + XML_ERROR_EMPTY_DOCUMENT, + XML_ERROR_MISMATCHED_ELEMENT, + XML_ERROR_PARSING, + XML_CAN_NOT_CONVERT_TEXT, + XML_NO_TEXT_NODE, + + XML_ERROR_COUNT +}; + + +/* + Utility functionality. +*/ +class TINYXML2_LIB XMLUtil +{ +public: + static const char* SkipWhiteSpace( const char* p, int* curLineNumPtr ) { + TIXMLASSERT( p ); + + while( IsWhiteSpace(*p) ) { + if (curLineNumPtr && *p == '\n') { + ++(*curLineNumPtr); + } + ++p; + } + TIXMLASSERT( p ); + return p; + } + static char* SkipWhiteSpace( char* p, int* curLineNumPtr ) { + return const_cast( SkipWhiteSpace( const_cast(p), curLineNumPtr ) ); + } + + // Anything in the high order range of UTF-8 is assumed to not be whitespace. This isn't + // correct, but simple, and usually works. + static bool IsWhiteSpace( char p ) { + return !IsUTF8Continuation(p) && isspace( static_cast(p) ); + } + + inline static bool IsNameStartChar( unsigned char ch ) { + if ( ch >= 128 ) { + // This is a heuristic guess in attempt to not implement Unicode-aware isalpha() + return true; + } + if ( isalpha( ch ) ) { + return true; + } + return ch == ':' || ch == '_'; + } + + inline static bool IsNameChar( unsigned char ch ) { + return IsNameStartChar( ch ) + || isdigit( ch ) + || ch == '.' + || ch == '-'; + } + + inline static bool StringEqual( const char* p, const char* q, int nChar=INT_MAX ) { + if ( p == q ) { + return true; + } + TIXMLASSERT( p ); + TIXMLASSERT( q ); + TIXMLASSERT( nChar >= 0 ); + return strncmp( p, q, nChar ) == 0; + } + + inline static bool IsUTF8Continuation( char p ) { + return ( p & 0x80 ) != 0; + } + + static const char* ReadBOM( const char* p, bool* hasBOM ); + // p is the starting location, + // the UTF-8 value of the entity will be placed in value, and length filled in. + static const char* GetCharacterRef( const char* p, char* value, int* length ); + static void ConvertUTF32ToUTF8( unsigned long input, char* output, int* length ); + + // converts primitive types to strings + static void ToStr( int v, char* buffer, int bufferSize ); + static void ToStr( unsigned v, char* buffer, int bufferSize ); + static void ToStr( bool v, char* buffer, int bufferSize ); + static void ToStr( float v, char* buffer, int bufferSize ); + static void ToStr( double v, char* buffer, int bufferSize ); + static void ToStr(int64_t v, char* buffer, int bufferSize); + + // converts strings to primitive types + static bool ToInt( const char* str, int* value ); + static bool ToUnsigned( const char* str, unsigned* value ); + static bool ToBool( const char* str, bool* value ); + static bool ToFloat( const char* str, float* value ); + static bool ToDouble( const char* str, double* value ); + static bool ToInt64(const char* str, int64_t* value); + + // Changes what is serialized for a boolean value. + // Default to "true" and "false". Shouldn't be changed + // unless you have a special testing or compatibility need. + // Be careful: static, global, & not thread safe. + // Be sure to set static const memory as parameters. + static void SetBoolSerialization(const char* writeTrue, const char* writeFalse); + +private: + static const char* writeBoolTrue; + static const char* writeBoolFalse; +}; + + +/** XMLNode is a base class for every object that is in the + XML Document Object Model (DOM), except XMLAttributes. + Nodes have siblings, a parent, and children which can + be navigated. A node is always in a XMLDocument. + The type of a XMLNode can be queried, and it can + be cast to its more defined type. + + A XMLDocument allocates memory for all its Nodes. + When the XMLDocument gets deleted, all its Nodes + will also be deleted. + + @verbatim + A Document can contain: Element (container or leaf) + Comment (leaf) + Unknown (leaf) + Declaration( leaf ) + + An Element can contain: Element (container or leaf) + Text (leaf) + Attributes (not on tree) + Comment (leaf) + Unknown (leaf) + + @endverbatim +*/ +class TINYXML2_LIB XMLNode +{ + friend class XMLDocument; + friend class XMLElement; +public: + + /// Get the XMLDocument that owns this XMLNode. + const XMLDocument* GetDocument() const { + TIXMLASSERT( _document ); + return _document; + } + /// Get the XMLDocument that owns this XMLNode. + XMLDocument* GetDocument() { + TIXMLASSERT( _document ); + return _document; + } + + /// Safely cast to an Element, or null. + virtual XMLElement* ToElement() { + return 0; + } + /// Safely cast to Text, or null. + virtual XMLText* ToText() { + return 0; + } + /// Safely cast to a Comment, or null. + virtual XMLComment* ToComment() { + return 0; + } + /// Safely cast to a Document, or null. + virtual XMLDocument* ToDocument() { + return 0; + } + /// Safely cast to a Declaration, or null. + virtual XMLDeclaration* ToDeclaration() { + return 0; + } + /// Safely cast to an Unknown, or null. + virtual XMLUnknown* ToUnknown() { + return 0; + } + + virtual const XMLElement* ToElement() const { + return 0; + } + virtual const XMLText* ToText() const { + return 0; + } + virtual const XMLComment* ToComment() const { + return 0; + } + virtual const XMLDocument* ToDocument() const { + return 0; + } + virtual const XMLDeclaration* ToDeclaration() const { + return 0; + } + virtual const XMLUnknown* ToUnknown() const { + return 0; + } + + /** The meaning of 'value' changes for the specific type. + @verbatim + Document: empty (NULL is returned, not an empty string) + Element: name of the element + Comment: the comment text + Unknown: the tag contents + Text: the text string + @endverbatim + */ + const char* Value() const; + + /** Set the Value of an XML node. + @sa Value() + */ + void SetValue( const char* val, bool staticMem=false ); + + /// Gets the line number the node is in, if the document was parsed from a file. + int GetLineNum() const { return _parseLineNum; } + + /// Get the parent of this node on the DOM. + const XMLNode* Parent() const { + return _parent; + } + + XMLNode* Parent() { + return _parent; + } + + /// Returns true if this node has no children. + bool NoChildren() const { + return !_firstChild; + } + + /// Get the first child node, or null if none exists. + const XMLNode* FirstChild() const { + return _firstChild; + } + + XMLNode* FirstChild() { + return _firstChild; + } + + /** Get the first child element, or optionally the first child + element with the specified name. + */ + const XMLElement* FirstChildElement( const char* name = 0 ) const; + + XMLElement* FirstChildElement( const char* name = 0 ) { + return const_cast(const_cast(this)->FirstChildElement( name )); + } + + /// Get the last child node, or null if none exists. + const XMLNode* LastChild() const { + return _lastChild; + } + + XMLNode* LastChild() { + return _lastChild; + } + + /** Get the last child element or optionally the last child + element with the specified name. + */ + const XMLElement* LastChildElement( const char* name = 0 ) const; + + XMLElement* LastChildElement( const char* name = 0 ) { + return const_cast(const_cast(this)->LastChildElement(name) ); + } + + /// Get the previous (left) sibling node of this node. + const XMLNode* PreviousSibling() const { + return _prev; + } + + XMLNode* PreviousSibling() { + return _prev; + } + + /// Get the previous (left) sibling element of this node, with an optionally supplied name. + const XMLElement* PreviousSiblingElement( const char* name = 0 ) const ; + + XMLElement* PreviousSiblingElement( const char* name = 0 ) { + return const_cast(const_cast(this)->PreviousSiblingElement( name ) ); + } + + /// Get the next (right) sibling node of this node. + const XMLNode* NextSibling() const { + return _next; + } + + XMLNode* NextSibling() { + return _next; + } + + /// Get the next (right) sibling element of this node, with an optionally supplied name. + const XMLElement* NextSiblingElement( const char* name = 0 ) const; + + XMLElement* NextSiblingElement( const char* name = 0 ) { + return const_cast(const_cast(this)->NextSiblingElement( name ) ); + } + + /** + Add a child node as the last (right) child. + If the child node is already part of the document, + it is moved from its old location to the new location. + Returns the addThis argument or 0 if the node does not + belong to the same document. + */ + XMLNode* InsertEndChild( XMLNode* addThis ); + + XMLNode* LinkEndChild( XMLNode* addThis ) { + return InsertEndChild( addThis ); + } + /** + Add a child node as the first (left) child. + If the child node is already part of the document, + it is moved from its old location to the new location. + Returns the addThis argument or 0 if the node does not + belong to the same document. + */ + XMLNode* InsertFirstChild( XMLNode* addThis ); + /** + Add a node after the specified child node. + If the child node is already part of the document, + it is moved from its old location to the new location. + Returns the addThis argument or 0 if the afterThis node + is not a child of this node, or if the node does not + belong to the same document. + */ + XMLNode* InsertAfterChild( XMLNode* afterThis, XMLNode* addThis ); + + /** + Delete all the children of this node. + */ + void DeleteChildren(); + + /** + Delete a child of this node. + */ + void DeleteChild( XMLNode* node ); + + /** + Make a copy of this node, but not its children. + You may pass in a Document pointer that will be + the owner of the new Node. If the 'document' is + null, then the node returned will be allocated + from the current Document. (this->GetDocument()) + + Note: if called on a XMLDocument, this will return null. + */ + virtual XMLNode* ShallowClone( XMLDocument* document ) const = 0; + + /** + Make a copy of this node and all its children. + + If the 'target' is null, then the nodes will + be allocated in the current document. If 'target' + is specified, the memory will be allocated is the + specified XMLDocument. + + NOTE: This is probably not the correct tool to + copy a document, since XMLDocuments can have multiple + top level XMLNodes. You probably want to use + XMLDocument::DeepCopy() + */ + XMLNode* DeepClone( XMLDocument* target ) const; + + /** + Test if 2 nodes are the same, but don't test children. + The 2 nodes do not need to be in the same Document. + + Note: if called on a XMLDocument, this will return false. + */ + virtual bool ShallowEqual( const XMLNode* compare ) const = 0; + + /** Accept a hierarchical visit of the nodes in the TinyXML-2 DOM. Every node in the + XML tree will be conditionally visited and the host will be called back + via the XMLVisitor interface. + + This is essentially a SAX interface for TinyXML-2. (Note however it doesn't re-parse + the XML for the callbacks, so the performance of TinyXML-2 is unchanged by using this + interface versus any other.) + + The interface has been based on ideas from: + + - http://www.saxproject.org/ + - http://c2.com/cgi/wiki?HierarchicalVisitorPattern + + Which are both good references for "visiting". + + An example of using Accept(): + @verbatim + XMLPrinter printer; + tinyxmlDoc.Accept( &printer ); + const char* xmlcstr = printer.CStr(); + @endverbatim + */ + virtual bool Accept( XMLVisitor* visitor ) const = 0; + + /** + Set user data into the XMLNode. TinyXML-2 in + no way processes or interprets user data. + It is initially 0. + */ + void SetUserData(void* userData) { _userData = userData; } + + /** + Get user data set into the XMLNode. TinyXML-2 in + no way processes or interprets user data. + It is initially 0. + */ + void* GetUserData() const { return _userData; } + +protected: + XMLNode( XMLDocument* ); + virtual ~XMLNode(); + + virtual char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr); + + XMLDocument* _document; + XMLNode* _parent; + mutable StrPair _value; + int _parseLineNum; + + XMLNode* _firstChild; + XMLNode* _lastChild; + + XMLNode* _prev; + XMLNode* _next; + + void* _userData; + +private: + MemPool* _memPool; + void Unlink( XMLNode* child ); + static void DeleteNode( XMLNode* node ); + void InsertChildPreamble( XMLNode* insertThis ) const; + const XMLElement* ToElementWithName( const char* name ) const; + + XMLNode( const XMLNode& ); // not supported + XMLNode& operator=( const XMLNode& ); // not supported +}; + + +/** XML text. + + Note that a text node can have child element nodes, for example: + @verbatim + This is bold + @endverbatim + + A text node can have 2 ways to output the next. "normal" output + and CDATA. It will default to the mode it was parsed from the XML file and + you generally want to leave it alone, but you can change the output mode with + SetCData() and query it with CData(). +*/ +class TINYXML2_LIB XMLText : public XMLNode +{ + friend class XMLDocument; +public: + virtual bool Accept( XMLVisitor* visitor ) const; + + virtual XMLText* ToText() { + return this; + } + virtual const XMLText* ToText() const { + return this; + } + + /// Declare whether this should be CDATA or standard text. + void SetCData( bool isCData ) { + _isCData = isCData; + } + /// Returns true if this is a CDATA text element. + bool CData() const { + return _isCData; + } + + virtual XMLNode* ShallowClone( XMLDocument* document ) const; + virtual bool ShallowEqual( const XMLNode* compare ) const; + +protected: + XMLText( XMLDocument* doc ) : XMLNode( doc ), _isCData( false ) {} + virtual ~XMLText() {} + + char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ); + +private: + bool _isCData; + + XMLText( const XMLText& ); // not supported + XMLText& operator=( const XMLText& ); // not supported +}; + + +/** An XML Comment. */ +class TINYXML2_LIB XMLComment : public XMLNode +{ + friend class XMLDocument; +public: + virtual XMLComment* ToComment() { + return this; + } + virtual const XMLComment* ToComment() const { + return this; + } + + virtual bool Accept( XMLVisitor* visitor ) const; + + virtual XMLNode* ShallowClone( XMLDocument* document ) const; + virtual bool ShallowEqual( const XMLNode* compare ) const; + +protected: + XMLComment( XMLDocument* doc ); + virtual ~XMLComment(); + + char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr); + +private: + XMLComment( const XMLComment& ); // not supported + XMLComment& operator=( const XMLComment& ); // not supported +}; + + +/** In correct XML the declaration is the first entry in the file. + @verbatim + + @endverbatim + + TinyXML-2 will happily read or write files without a declaration, + however. + + The text of the declaration isn't interpreted. It is parsed + and written as a string. +*/ +class TINYXML2_LIB XMLDeclaration : public XMLNode +{ + friend class XMLDocument; +public: + virtual XMLDeclaration* ToDeclaration() { + return this; + } + virtual const XMLDeclaration* ToDeclaration() const { + return this; + } + + virtual bool Accept( XMLVisitor* visitor ) const; + + virtual XMLNode* ShallowClone( XMLDocument* document ) const; + virtual bool ShallowEqual( const XMLNode* compare ) const; + +protected: + XMLDeclaration( XMLDocument* doc ); + virtual ~XMLDeclaration(); + + char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ); + +private: + XMLDeclaration( const XMLDeclaration& ); // not supported + XMLDeclaration& operator=( const XMLDeclaration& ); // not supported +}; + + +/** Any tag that TinyXML-2 doesn't recognize is saved as an + unknown. It is a tag of text, but should not be modified. + It will be written back to the XML, unchanged, when the file + is saved. + + DTD tags get thrown into XMLUnknowns. +*/ +class TINYXML2_LIB XMLUnknown : public XMLNode +{ + friend class XMLDocument; +public: + virtual XMLUnknown* ToUnknown() { + return this; + } + virtual const XMLUnknown* ToUnknown() const { + return this; + } + + virtual bool Accept( XMLVisitor* visitor ) const; + + virtual XMLNode* ShallowClone( XMLDocument* document ) const; + virtual bool ShallowEqual( const XMLNode* compare ) const; + +protected: + XMLUnknown( XMLDocument* doc ); + virtual ~XMLUnknown(); + + char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ); + +private: + XMLUnknown( const XMLUnknown& ); // not supported + XMLUnknown& operator=( const XMLUnknown& ); // not supported +}; + + + +/** An attribute is a name-value pair. Elements have an arbitrary + number of attributes, each with a unique name. + + @note The attributes are not XMLNodes. You may only query the + Next() attribute in a list. +*/ +class TINYXML2_LIB XMLAttribute +{ + friend class XMLElement; +public: + /// The name of the attribute. + const char* Name() const; + + /// The value of the attribute. + const char* Value() const; + + /// Gets the line number the attribute is in, if the document was parsed from a file. + int GetLineNum() const { return _parseLineNum; } + + /// The next attribute in the list. + const XMLAttribute* Next() const { + return _next; + } + + /** IntValue interprets the attribute as an integer, and returns the value. + If the value isn't an integer, 0 will be returned. There is no error checking; + use QueryIntValue() if you need error checking. + */ + int IntValue() const { + int i = 0; + QueryIntValue(&i); + return i; + } + + int64_t Int64Value() const { + int64_t i = 0; + QueryInt64Value(&i); + return i; + } + + /// Query as an unsigned integer. See IntValue() + unsigned UnsignedValue() const { + unsigned i=0; + QueryUnsignedValue( &i ); + return i; + } + /// Query as a boolean. See IntValue() + bool BoolValue() const { + bool b=false; + QueryBoolValue( &b ); + return b; + } + /// Query as a double. See IntValue() + double DoubleValue() const { + double d=0; + QueryDoubleValue( &d ); + return d; + } + /// Query as a float. See IntValue() + float FloatValue() const { + float f=0; + QueryFloatValue( &f ); + return f; + } + + /** QueryIntValue interprets the attribute as an integer, and returns the value + in the provided parameter. The function will return XML_SUCCESS on success, + and XML_WRONG_ATTRIBUTE_TYPE if the conversion is not successful. + */ + XMLError QueryIntValue( int* value ) const; + /// See QueryIntValue + XMLError QueryUnsignedValue( unsigned int* value ) const; + /// See QueryIntValue + XMLError QueryInt64Value(int64_t* value) const; + /// See QueryIntValue + XMLError QueryBoolValue( bool* value ) const; + /// See QueryIntValue + XMLError QueryDoubleValue( double* value ) const; + /// See QueryIntValue + XMLError QueryFloatValue( float* value ) const; + + /// Set the attribute to a string value. + void SetAttribute( const char* value ); + /// Set the attribute to value. + void SetAttribute( int value ); + /// Set the attribute to value. + void SetAttribute( unsigned value ); + /// Set the attribute to value. + void SetAttribute(int64_t value); + /// Set the attribute to value. + void SetAttribute( bool value ); + /// Set the attribute to value. + void SetAttribute( double value ); + /// Set the attribute to value. + void SetAttribute( float value ); + +private: + enum { BUF_SIZE = 200 }; + + XMLAttribute() : _name(), _value(),_parseLineNum( 0 ), _next( 0 ), _memPool( 0 ) {} + virtual ~XMLAttribute() {} + + XMLAttribute( const XMLAttribute& ); // not supported + void operator=( const XMLAttribute& ); // not supported + void SetName( const char* name ); + + char* ParseDeep( char* p, bool processEntities, int* curLineNumPtr ); + + mutable StrPair _name; + mutable StrPair _value; + int _parseLineNum; + XMLAttribute* _next; + MemPool* _memPool; +}; + + +/** The element is a container class. It has a value, the element name, + and can contain other elements, text, comments, and unknowns. + Elements also contain an arbitrary number of attributes. +*/ +class TINYXML2_LIB XMLElement : public XMLNode +{ + friend class XMLDocument; +public: + /// Get the name of an element (which is the Value() of the node.) + const char* Name() const { + return Value(); + } + /// Set the name of the element. + void SetName( const char* str, bool staticMem=false ) { + SetValue( str, staticMem ); + } + + virtual XMLElement* ToElement() { + return this; + } + virtual const XMLElement* ToElement() const { + return this; + } + virtual bool Accept( XMLVisitor* visitor ) const; + + /** Given an attribute name, Attribute() returns the value + for the attribute of that name, or null if none + exists. For example: + + @verbatim + const char* value = ele->Attribute( "foo" ); + @endverbatim + + The 'value' parameter is normally null. However, if specified, + the attribute will only be returned if the 'name' and 'value' + match. This allow you to write code: + + @verbatim + if ( ele->Attribute( "foo", "bar" ) ) callFooIsBar(); + @endverbatim + + rather than: + @verbatim + if ( ele->Attribute( "foo" ) ) { + if ( strcmp( ele->Attribute( "foo" ), "bar" ) == 0 ) callFooIsBar(); + } + @endverbatim + */ + const char* Attribute( const char* name, const char* value=0 ) const; + + /** Given an attribute name, IntAttribute() returns the value + of the attribute interpreted as an integer. The default + value will be returned if the attribute isn't present, + or if there is an error. (For a method with error + checking, see QueryIntAttribute()). + */ + int IntAttribute(const char* name, int defaultValue = 0) const; + /// See IntAttribute() + unsigned UnsignedAttribute(const char* name, unsigned defaultValue = 0) const; + /// See IntAttribute() + int64_t Int64Attribute(const char* name, int64_t defaultValue = 0) const; + /// See IntAttribute() + bool BoolAttribute(const char* name, bool defaultValue = false) const; + /// See IntAttribute() + double DoubleAttribute(const char* name, double defaultValue = 0) const; + /// See IntAttribute() + float FloatAttribute(const char* name, float defaultValue = 0) const; + + /** Given an attribute name, QueryIntAttribute() returns + XML_SUCCESS, XML_WRONG_ATTRIBUTE_TYPE if the conversion + can't be performed, or XML_NO_ATTRIBUTE if the attribute + doesn't exist. If successful, the result of the conversion + will be written to 'value'. If not successful, nothing will + be written to 'value'. This allows you to provide default + value: + + @verbatim + int value = 10; + QueryIntAttribute( "foo", &value ); // if "foo" isn't found, value will still be 10 + @endverbatim + */ + XMLError QueryIntAttribute( const char* name, int* value ) const { + const XMLAttribute* a = FindAttribute( name ); + if ( !a ) { + return XML_NO_ATTRIBUTE; + } + return a->QueryIntValue( value ); + } + + /// See QueryIntAttribute() + XMLError QueryUnsignedAttribute( const char* name, unsigned int* value ) const { + const XMLAttribute* a = FindAttribute( name ); + if ( !a ) { + return XML_NO_ATTRIBUTE; + } + return a->QueryUnsignedValue( value ); + } + + /// See QueryIntAttribute() + XMLError QueryInt64Attribute(const char* name, int64_t* value) const { + const XMLAttribute* a = FindAttribute(name); + if (!a) { + return XML_NO_ATTRIBUTE; + } + return a->QueryInt64Value(value); + } + + /// See QueryIntAttribute() + XMLError QueryBoolAttribute( const char* name, bool* value ) const { + const XMLAttribute* a = FindAttribute( name ); + if ( !a ) { + return XML_NO_ATTRIBUTE; + } + return a->QueryBoolValue( value ); + } + /// See QueryIntAttribute() + XMLError QueryDoubleAttribute( const char* name, double* value ) const { + const XMLAttribute* a = FindAttribute( name ); + if ( !a ) { + return XML_NO_ATTRIBUTE; + } + return a->QueryDoubleValue( value ); + } + /// See QueryIntAttribute() + XMLError QueryFloatAttribute( const char* name, float* value ) const { + const XMLAttribute* a = FindAttribute( name ); + if ( !a ) { + return XML_NO_ATTRIBUTE; + } + return a->QueryFloatValue( value ); + } + + + /** Given an attribute name, QueryAttribute() returns + XML_SUCCESS, XML_WRONG_ATTRIBUTE_TYPE if the conversion + can't be performed, or XML_NO_ATTRIBUTE if the attribute + doesn't exist. It is overloaded for the primitive types, + and is a generally more convenient replacement of + QueryIntAttribute() and related functions. + + If successful, the result of the conversion + will be written to 'value'. If not successful, nothing will + be written to 'value'. This allows you to provide default + value: + + @verbatim + int value = 10; + QueryAttribute( "foo", &value ); // if "foo" isn't found, value will still be 10 + @endverbatim + */ + int QueryAttribute( const char* name, int* value ) const { + return QueryIntAttribute( name, value ); + } + + int QueryAttribute( const char* name, unsigned int* value ) const { + return QueryUnsignedAttribute( name, value ); + } + + int QueryAttribute(const char* name, int64_t* value) const { + return QueryInt64Attribute(name, value); + } + + int QueryAttribute( const char* name, bool* value ) const { + return QueryBoolAttribute( name, value ); + } + + int QueryAttribute( const char* name, double* value ) const { + return QueryDoubleAttribute( name, value ); + } + + int QueryAttribute( const char* name, float* value ) const { + return QueryFloatAttribute( name, value ); + } + + /// Sets the named attribute to value. + void SetAttribute( const char* name, const char* value ) { + XMLAttribute* a = FindOrCreateAttribute( name ); + a->SetAttribute( value ); + } + /// Sets the named attribute to value. + void SetAttribute( const char* name, int value ) { + XMLAttribute* a = FindOrCreateAttribute( name ); + a->SetAttribute( value ); + } + /// Sets the named attribute to value. + void SetAttribute( const char* name, unsigned value ) { + XMLAttribute* a = FindOrCreateAttribute( name ); + a->SetAttribute( value ); + } + + /// Sets the named attribute to value. + void SetAttribute(const char* name, int64_t value) { + XMLAttribute* a = FindOrCreateAttribute(name); + a->SetAttribute(value); + } + + /// Sets the named attribute to value. + void SetAttribute( const char* name, bool value ) { + XMLAttribute* a = FindOrCreateAttribute( name ); + a->SetAttribute( value ); + } + /// Sets the named attribute to value. + void SetAttribute( const char* name, double value ) { + XMLAttribute* a = FindOrCreateAttribute( name ); + a->SetAttribute( value ); + } + /// Sets the named attribute to value. + void SetAttribute( const char* name, float value ) { + XMLAttribute* a = FindOrCreateAttribute( name ); + a->SetAttribute( value ); + } + + /** + Delete an attribute. + */ + void DeleteAttribute( const char* name ); + + /// Return the first attribute in the list. + const XMLAttribute* FirstAttribute() const { + return _rootAttribute; + } + /// Query a specific attribute in the list. + const XMLAttribute* FindAttribute( const char* name ) const; + + /** Convenience function for easy access to the text inside an element. Although easy + and concise, GetText() is limited compared to getting the XMLText child + and accessing it directly. + + If the first child of 'this' is a XMLText, the GetText() + returns the character string of the Text node, else null is returned. + + This is a convenient method for getting the text of simple contained text: + @verbatim + This is text + const char* str = fooElement->GetText(); + @endverbatim + + 'str' will be a pointer to "This is text". + + Note that this function can be misleading. If the element foo was created from + this XML: + @verbatim + This is text + @endverbatim + + then the value of str would be null. The first child node isn't a text node, it is + another element. From this XML: + @verbatim + This is text + @endverbatim + GetText() will return "This is ". + */ + const char* GetText() const; + + /** Convenience function for easy access to the text inside an element. Although easy + and concise, SetText() is limited compared to creating an XMLText child + and mutating it directly. + + If the first child of 'this' is a XMLText, SetText() sets its value to + the given string, otherwise it will create a first child that is an XMLText. + + This is a convenient method for setting the text of simple contained text: + @verbatim + This is text + fooElement->SetText( "Hullaballoo!" ); + Hullaballoo! + @endverbatim + + Note that this function can be misleading. If the element foo was created from + this XML: + @verbatim + This is text + @endverbatim + + then it will not change "This is text", but rather prefix it with a text element: + @verbatim + Hullaballoo!This is text + @endverbatim + + For this XML: + @verbatim + + @endverbatim + SetText() will generate + @verbatim + Hullaballoo! + @endverbatim + */ + void SetText( const char* inText ); + /// Convenience method for setting text inside an element. See SetText() for important limitations. + void SetText( int value ); + /// Convenience method for setting text inside an element. See SetText() for important limitations. + void SetText( unsigned value ); + /// Convenience method for setting text inside an element. See SetText() for important limitations. + void SetText(int64_t value); + /// Convenience method for setting text inside an element. See SetText() for important limitations. + void SetText( bool value ); + /// Convenience method for setting text inside an element. See SetText() for important limitations. + void SetText( double value ); + /// Convenience method for setting text inside an element. See SetText() for important limitations. + void SetText( float value ); + + /** + Convenience method to query the value of a child text node. This is probably best + shown by example. Given you have a document is this form: + @verbatim + + 1 + 1.4 + + @endverbatim + + The QueryIntText() and similar functions provide a safe and easier way to get to the + "value" of x and y. + + @verbatim + int x = 0; + float y = 0; // types of x and y are contrived for example + const XMLElement* xElement = pointElement->FirstChildElement( "x" ); + const XMLElement* yElement = pointElement->FirstChildElement( "y" ); + xElement->QueryIntText( &x ); + yElement->QueryFloatText( &y ); + @endverbatim + + @returns XML_SUCCESS (0) on success, XML_CAN_NOT_CONVERT_TEXT if the text cannot be converted + to the requested type, and XML_NO_TEXT_NODE if there is no child text to query. + + */ + XMLError QueryIntText( int* ival ) const; + /// See QueryIntText() + XMLError QueryUnsignedText( unsigned* uval ) const; + /// See QueryIntText() + XMLError QueryInt64Text(int64_t* uval) const; + /// See QueryIntText() + XMLError QueryBoolText( bool* bval ) const; + /// See QueryIntText() + XMLError QueryDoubleText( double* dval ) const; + /// See QueryIntText() + XMLError QueryFloatText( float* fval ) const; + + int IntText(int defaultValue = 0) const; + + /// See QueryIntText() + unsigned UnsignedText(unsigned defaultValue = 0) const; + /// See QueryIntText() + int64_t Int64Text(int64_t defaultValue = 0) const; + /// See QueryIntText() + bool BoolText(bool defaultValue = false) const; + /// See QueryIntText() + double DoubleText(double defaultValue = 0) const; + /// See QueryIntText() + float FloatText(float defaultValue = 0) const; + + // internal: + enum ElementClosingType { + OPEN, // + CLOSED, // + CLOSING // + }; + ElementClosingType ClosingType() const { + return _closingType; + } + virtual XMLNode* ShallowClone( XMLDocument* document ) const; + virtual bool ShallowEqual( const XMLNode* compare ) const; + +protected: + char* ParseDeep( char* p, StrPair* parentEndTag, int* curLineNumPtr ); + +private: + XMLElement( XMLDocument* doc ); + virtual ~XMLElement(); + XMLElement( const XMLElement& ); // not supported + void operator=( const XMLElement& ); // not supported + + XMLAttribute* FindAttribute( const char* name ) { + return const_cast(const_cast(this)->FindAttribute( name )); + } + XMLAttribute* FindOrCreateAttribute( const char* name ); + //void LinkAttribute( XMLAttribute* attrib ); + char* ParseAttributes( char* p, int* curLineNumPtr ); + static void DeleteAttribute( XMLAttribute* attribute ); + XMLAttribute* CreateAttribute(); + + enum { BUF_SIZE = 200 }; + ElementClosingType _closingType; + // The attribute list is ordered; there is no 'lastAttribute' + // because the list needs to be scanned for dupes before adding + // a new attribute. + XMLAttribute* _rootAttribute; +}; + + +enum Whitespace { + PRESERVE_WHITESPACE, + COLLAPSE_WHITESPACE +}; + + +/** A Document binds together all the functionality. + It can be saved, loaded, and printed to the screen. + All Nodes are connected and allocated to a Document. + If the Document is deleted, all its Nodes are also deleted. +*/ +class TINYXML2_LIB XMLDocument : public XMLNode +{ + friend class XMLElement; + // Gives access to SetError, but over-access for everything else. + // Wishing C++ had "internal" scope. + friend class XMLNode; + friend class XMLText; + friend class XMLComment; + friend class XMLDeclaration; + friend class XMLUnknown; +public: + /// constructor + XMLDocument( bool processEntities = true, Whitespace whitespaceMode = PRESERVE_WHITESPACE ); + ~XMLDocument(); + + virtual XMLDocument* ToDocument() { + TIXMLASSERT( this == _document ); + return this; + } + virtual const XMLDocument* ToDocument() const { + TIXMLASSERT( this == _document ); + return this; + } + + /** + Parse an XML file from a character string. + Returns XML_SUCCESS (0) on success, or + an errorID. + + You may optionally pass in the 'nBytes', which is + the number of bytes which will be parsed. If not + specified, TinyXML-2 will assume 'xml' points to a + null terminated string. + */ + XMLError Parse( const char* xml, size_t nBytes=(size_t)(-1) ); + + /** + Load an XML file from disk. + Returns XML_SUCCESS (0) on success, or + an errorID. + */ + XMLError LoadFile( const char* filename ); + + /** + Load an XML file from disk. You are responsible + for providing and closing the FILE*. + + NOTE: The file should be opened as binary ("rb") + not text in order for TinyXML-2 to correctly + do newline normalization. + + Returns XML_SUCCESS (0) on success, or + an errorID. + */ + XMLError LoadFile( FILE* ); + + /** + Save the XML file to disk. + Returns XML_SUCCESS (0) on success, or + an errorID. + */ + XMLError SaveFile( const char* filename, bool compact = false ); + + /** + Save the XML file to disk. You are responsible + for providing and closing the FILE*. + + Returns XML_SUCCESS (0) on success, or + an errorID. + */ + XMLError SaveFile( FILE* fp, bool compact = false ); + + bool ProcessEntities() const { + return _processEntities; + } + Whitespace WhitespaceMode() const { + return _whitespaceMode; + } + + /** + Returns true if this document has a leading Byte Order Mark of UTF8. + */ + bool HasBOM() const { + return _writeBOM; + } + /** Sets whether to write the BOM when writing the file. + */ + void SetBOM( bool useBOM ) { + _writeBOM = useBOM; + } + + /** Return the root element of DOM. Equivalent to FirstChildElement(). + To get the first node, use FirstChild(). + */ + XMLElement* RootElement() { + return FirstChildElement(); + } + const XMLElement* RootElement() const { + return FirstChildElement(); + } + + /** Print the Document. If the Printer is not provided, it will + print to stdout. If you provide Printer, this can print to a file: + @verbatim + XMLPrinter printer( fp ); + doc.Print( &printer ); + @endverbatim + + Or you can use a printer to print to memory: + @verbatim + XMLPrinter printer; + doc.Print( &printer ); + // printer.CStr() has a const char* to the XML + @endverbatim + */ + void Print( XMLPrinter* streamer=0 ) const; + virtual bool Accept( XMLVisitor* visitor ) const; + + /** + Create a new Element associated with + this Document. The memory for the Element + is managed by the Document. + */ + XMLElement* NewElement( const char* name ); + /** + Create a new Comment associated with + this Document. The memory for the Comment + is managed by the Document. + */ + XMLComment* NewComment( const char* comment ); + /** + Create a new Text associated with + this Document. The memory for the Text + is managed by the Document. + */ + XMLText* NewText( const char* text ); + /** + Create a new Declaration associated with + this Document. The memory for the object + is managed by the Document. + + If the 'text' param is null, the standard + declaration is used.: + @verbatim + + @endverbatim + */ + XMLDeclaration* NewDeclaration( const char* text=0 ); + /** + Create a new Unknown associated with + this Document. The memory for the object + is managed by the Document. + */ + XMLUnknown* NewUnknown( const char* text ); + + /** + Delete a node associated with this document. + It will be unlinked from the DOM. + */ + void DeleteNode( XMLNode* node ); + + void ClearError() { + SetError(XML_SUCCESS, 0, 0); + } + + /// Return true if there was an error parsing the document. + bool Error() const { + return _errorID != XML_SUCCESS; + } + /// Return the errorID. + XMLError ErrorID() const { + return _errorID; + } + const char* ErrorName() const; + static const char* ErrorIDToName(XMLError errorID); + + /** Returns a "long form" error description. A hopefully helpful + diagnostic with location, line number, and/or additional info. + */ + const char* ErrorStr() const; + + /// A (trivial) utility function that prints the ErrorStr() to stdout. + void PrintError() const; + + /// Return the line where the error occured, or zero if unknown. + int ErrorLineNum() const + { + return _errorLineNum; + } + + /// Clear the document, resetting it to the initial state. + void Clear(); + + /** + Copies this document to a target document. + The target will be completely cleared before the copy. + If you want to copy a sub-tree, see XMLNode::DeepClone(). + + NOTE: that the 'target' must be non-null. + */ + void DeepCopy(XMLDocument* target) const; + + // internal + char* Identify( char* p, XMLNode** node ); + + // internal + void MarkInUse(XMLNode*); + + virtual XMLNode* ShallowClone( XMLDocument* /*document*/ ) const { + return 0; + } + virtual bool ShallowEqual( const XMLNode* /*compare*/ ) const { + return false; + } + +private: + XMLDocument( const XMLDocument& ); // not supported + void operator=( const XMLDocument& ); // not supported + + bool _writeBOM; + bool _processEntities; + XMLError _errorID; + Whitespace _whitespaceMode; + mutable StrPair _errorStr; + int _errorLineNum; + char* _charBuffer; + int _parseCurLineNum; + // Memory tracking does add some overhead. + // However, the code assumes that you don't + // have a bunch of unlinked nodes around. + // Therefore it takes less memory to track + // in the document vs. a linked list in the XMLNode, + // and the performance is the same. + DynArray _unlinked; + + MemPoolT< sizeof(XMLElement) > _elementPool; + MemPoolT< sizeof(XMLAttribute) > _attributePool; + MemPoolT< sizeof(XMLText) > _textPool; + MemPoolT< sizeof(XMLComment) > _commentPool; + + static const char* _errorNames[XML_ERROR_COUNT]; + + void Parse(); + + void SetError( XMLError error, int lineNum, const char* format, ... ); + + template + NodeType* CreateUnlinkedNode( MemPoolT& pool ); +}; + +template +inline NodeType* XMLDocument::CreateUnlinkedNode( MemPoolT& pool ) +{ + TIXMLASSERT( sizeof( NodeType ) == PoolElementSize ); + TIXMLASSERT( sizeof( NodeType ) == pool.ItemSize() ); + NodeType* returnNode = new (pool.Alloc()) NodeType( this ); + TIXMLASSERT( returnNode ); + returnNode->_memPool = &pool; + + _unlinked.Push(returnNode); + return returnNode; +} + +/** + A XMLHandle is a class that wraps a node pointer with null checks; this is + an incredibly useful thing. Note that XMLHandle is not part of the TinyXML-2 + DOM structure. It is a separate utility class. + + Take an example: + @verbatim + + + + + + + @endverbatim + + Assuming you want the value of "attributeB" in the 2nd "Child" element, it's very + easy to write a *lot* of code that looks like: + + @verbatim + XMLElement* root = document.FirstChildElement( "Document" ); + if ( root ) + { + XMLElement* element = root->FirstChildElement( "Element" ); + if ( element ) + { + XMLElement* child = element->FirstChildElement( "Child" ); + if ( child ) + { + XMLElement* child2 = child->NextSiblingElement( "Child" ); + if ( child2 ) + { + // Finally do something useful. + @endverbatim + + And that doesn't even cover "else" cases. XMLHandle addresses the verbosity + of such code. A XMLHandle checks for null pointers so it is perfectly safe + and correct to use: + + @verbatim + XMLHandle docHandle( &document ); + XMLElement* child2 = docHandle.FirstChildElement( "Document" ).FirstChildElement( "Element" ).FirstChildElement().NextSiblingElement(); + if ( child2 ) + { + // do something useful + @endverbatim + + Which is MUCH more concise and useful. + + It is also safe to copy handles - internally they are nothing more than node pointers. + @verbatim + XMLHandle handleCopy = handle; + @endverbatim + + See also XMLConstHandle, which is the same as XMLHandle, but operates on const objects. +*/ +class TINYXML2_LIB XMLHandle +{ +public: + /// Create a handle from any node (at any depth of the tree.) This can be a null pointer. + XMLHandle( XMLNode* node ) : _node( node ) { + } + /// Create a handle from a node. + XMLHandle( XMLNode& node ) : _node( &node ) { + } + /// Copy constructor + XMLHandle( const XMLHandle& ref ) : _node( ref._node ) { + } + /// Assignment + XMLHandle& operator=( const XMLHandle& ref ) { + _node = ref._node; + return *this; + } + + /// Get the first child of this handle. + XMLHandle FirstChild() { + return XMLHandle( _node ? _node->FirstChild() : 0 ); + } + /// Get the first child element of this handle. + XMLHandle FirstChildElement( const char* name = 0 ) { + return XMLHandle( _node ? _node->FirstChildElement( name ) : 0 ); + } + /// Get the last child of this handle. + XMLHandle LastChild() { + return XMLHandle( _node ? _node->LastChild() : 0 ); + } + /// Get the last child element of this handle. + XMLHandle LastChildElement( const char* name = 0 ) { + return XMLHandle( _node ? _node->LastChildElement( name ) : 0 ); + } + /// Get the previous sibling of this handle. + XMLHandle PreviousSibling() { + return XMLHandle( _node ? _node->PreviousSibling() : 0 ); + } + /// Get the previous sibling element of this handle. + XMLHandle PreviousSiblingElement( const char* name = 0 ) { + return XMLHandle( _node ? _node->PreviousSiblingElement( name ) : 0 ); + } + /// Get the next sibling of this handle. + XMLHandle NextSibling() { + return XMLHandle( _node ? _node->NextSibling() : 0 ); + } + /// Get the next sibling element of this handle. + XMLHandle NextSiblingElement( const char* name = 0 ) { + return XMLHandle( _node ? _node->NextSiblingElement( name ) : 0 ); + } + + /// Safe cast to XMLNode. This can return null. + XMLNode* ToNode() { + return _node; + } + /// Safe cast to XMLElement. This can return null. + XMLElement* ToElement() { + return ( _node ? _node->ToElement() : 0 ); + } + /// Safe cast to XMLText. This can return null. + XMLText* ToText() { + return ( _node ? _node->ToText() : 0 ); + } + /// Safe cast to XMLUnknown. This can return null. + XMLUnknown* ToUnknown() { + return ( _node ? _node->ToUnknown() : 0 ); + } + /// Safe cast to XMLDeclaration. This can return null. + XMLDeclaration* ToDeclaration() { + return ( _node ? _node->ToDeclaration() : 0 ); + } + +private: + XMLNode* _node; +}; + + +/** + A variant of the XMLHandle class for working with const XMLNodes and Documents. It is the + same in all regards, except for the 'const' qualifiers. See XMLHandle for API. +*/ +class TINYXML2_LIB XMLConstHandle +{ +public: + XMLConstHandle( const XMLNode* node ) : _node( node ) { + } + XMLConstHandle( const XMLNode& node ) : _node( &node ) { + } + XMLConstHandle( const XMLConstHandle& ref ) : _node( ref._node ) { + } + + XMLConstHandle& operator=( const XMLConstHandle& ref ) { + _node = ref._node; + return *this; + } + + const XMLConstHandle FirstChild() const { + return XMLConstHandle( _node ? _node->FirstChild() : 0 ); + } + const XMLConstHandle FirstChildElement( const char* name = 0 ) const { + return XMLConstHandle( _node ? _node->FirstChildElement( name ) : 0 ); + } + const XMLConstHandle LastChild() const { + return XMLConstHandle( _node ? _node->LastChild() : 0 ); + } + const XMLConstHandle LastChildElement( const char* name = 0 ) const { + return XMLConstHandle( _node ? _node->LastChildElement( name ) : 0 ); + } + const XMLConstHandle PreviousSibling() const { + return XMLConstHandle( _node ? _node->PreviousSibling() : 0 ); + } + const XMLConstHandle PreviousSiblingElement( const char* name = 0 ) const { + return XMLConstHandle( _node ? _node->PreviousSiblingElement( name ) : 0 ); + } + const XMLConstHandle NextSibling() const { + return XMLConstHandle( _node ? _node->NextSibling() : 0 ); + } + const XMLConstHandle NextSiblingElement( const char* name = 0 ) const { + return XMLConstHandle( _node ? _node->NextSiblingElement( name ) : 0 ); + } + + + const XMLNode* ToNode() const { + return _node; + } + const XMLElement* ToElement() const { + return ( _node ? _node->ToElement() : 0 ); + } + const XMLText* ToText() const { + return ( _node ? _node->ToText() : 0 ); + } + const XMLUnknown* ToUnknown() const { + return ( _node ? _node->ToUnknown() : 0 ); + } + const XMLDeclaration* ToDeclaration() const { + return ( _node ? _node->ToDeclaration() : 0 ); + } + +private: + const XMLNode* _node; +}; + + +/** + Printing functionality. The XMLPrinter gives you more + options than the XMLDocument::Print() method. + + It can: + -# Print to memory. + -# Print to a file you provide. + -# Print XML without a XMLDocument. + + Print to Memory + + @verbatim + XMLPrinter printer; + doc.Print( &printer ); + SomeFunction( printer.CStr() ); + @endverbatim + + Print to a File + + You provide the file pointer. + @verbatim + XMLPrinter printer( fp ); + doc.Print( &printer ); + @endverbatim + + Print without a XMLDocument + + When loading, an XML parser is very useful. However, sometimes + when saving, it just gets in the way. The code is often set up + for streaming, and constructing the DOM is just overhead. + + The Printer supports the streaming case. The following code + prints out a trivially simple XML file without ever creating + an XML document. + + @verbatim + XMLPrinter printer( fp ); + printer.OpenElement( "foo" ); + printer.PushAttribute( "foo", "bar" ); + printer.CloseElement(); + @endverbatim +*/ +class TINYXML2_LIB XMLPrinter : public XMLVisitor +{ +public: + /** Construct the printer. If the FILE* is specified, + this will print to the FILE. Else it will print + to memory, and the result is available in CStr(). + If 'compact' is set to true, then output is created + with only required whitespace and newlines. + */ + XMLPrinter( FILE* file=0, bool compact = false, int depth = 0 ); + virtual ~XMLPrinter() {} + + /** If streaming, write the BOM and declaration. */ + void PushHeader( bool writeBOM, bool writeDeclaration ); + /** If streaming, start writing an element. + The element must be closed with CloseElement() + */ + void OpenElement( const char* name, bool compactMode=false ); + /// If streaming, add an attribute to an open element. + void PushAttribute( const char* name, const char* value ); + void PushAttribute( const char* name, int value ); + void PushAttribute( const char* name, unsigned value ); + void PushAttribute(const char* name, int64_t value); + void PushAttribute( const char* name, bool value ); + void PushAttribute( const char* name, double value ); + /// If streaming, close the Element. + virtual void CloseElement( bool compactMode=false ); + + /// Add a text node. + void PushText( const char* text, bool cdata=false ); + /// Add a text node from an integer. + void PushText( int value ); + /// Add a text node from an unsigned. + void PushText( unsigned value ); + /// Add a text node from an unsigned. + void PushText(int64_t value); + /// Add a text node from a bool. + void PushText( bool value ); + /// Add a text node from a float. + void PushText( float value ); + /// Add a text node from a double. + void PushText( double value ); + + /// Add a comment + void PushComment( const char* comment ); + + void PushDeclaration( const char* value ); + void PushUnknown( const char* value ); + + virtual bool VisitEnter( const XMLDocument& /*doc*/ ); + virtual bool VisitExit( const XMLDocument& /*doc*/ ) { + return true; + } + + virtual bool VisitEnter( const XMLElement& element, const XMLAttribute* attribute ); + virtual bool VisitExit( const XMLElement& element ); + + virtual bool Visit( const XMLText& text ); + virtual bool Visit( const XMLComment& comment ); + virtual bool Visit( const XMLDeclaration& declaration ); + virtual bool Visit( const XMLUnknown& unknown ); + + /** + If in print to memory mode, return a pointer to + the XML file in memory. + */ + const char* CStr() const { + return _buffer.Mem(); + } + /** + If in print to memory mode, return the size + of the XML file in memory. (Note the size returned + includes the terminating null.) + */ + int CStrSize() const { + return _buffer.Size(); + } + /** + If in print to memory mode, reset the buffer to the + beginning. + */ + void ClearBuffer() { + _buffer.Clear(); + _buffer.Push(0); + _firstElement = true; + } + +protected: + virtual bool CompactMode( const XMLElement& ) { return _compactMode; } + + /** Prints out the space before an element. You may override to change + the space and tabs used. A PrintSpace() override should call Print(). + */ + virtual void PrintSpace( int depth ); + void Print( const char* format, ... ); + void Write( const char* data, size_t size ); + inline void Write( const char* data ) { Write( data, strlen( data ) ); } + void Putc( char ch ); + + void SealElementIfJustOpened(); + bool _elementJustOpened; + DynArray< const char*, 10 > _stack; + +private: + void PrintString( const char*, bool restrictedEntitySet ); // prints out, after detecting entities. + + bool _firstElement; + FILE* _fp; + int _depth; + int _textDepth; + bool _processEntities; + bool _compactMode; + + enum { + ENTITY_RANGE = 64, + BUF_SIZE = 200 + }; + bool _entityFlag[ENTITY_RANGE]; + bool _restrictedEntityFlag[ENTITY_RANGE]; + + DynArray< char, 20 > _buffer; + + // Prohibit cloning, intentionally not implemented + XMLPrinter( const XMLPrinter& ); + XMLPrinter& operator=( const XMLPrinter& ); +}; + + +} // tinyxml2 + +#if defined(_MSC_VER) +# pragma warning(pop) +#endif + +#endif // TINYXML2_INCLUDED diff --git a/lib/Io/XmlReader.cpp b/lib/Io/XmlReader.cpp new file mode 100644 index 0000000..f8115f6 --- /dev/null +++ b/lib/Io/XmlReader.cpp @@ -0,0 +1,84 @@ +/* + * XmlReader.cpp, part of LatAnalyze + * + * Copyright (C) 2013 - 2014 Antonin Portelli + * + * LatAnalyze is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LatAnalyze 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. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LatAnalyze. If not, see . + */ + +#include +#include + +using namespace std; +using namespace Latan; + +XmlParsing::XmlParsing(string msg, string loc) +: runtime_error("XML reader error: " + msg + " (" + loc + ")") +{} + +/****************************************************************************** + * XmlReader implementation * + ******************************************************************************/ +// constructor ///////////////////////////////////////////////////////////////// +XmlReader::XmlReader(const string &fileName) +{ + open(fileName); +} + +// IO ////////////////////////////////////////////////////////////////////////// +void XmlReader::open(const string &fileName) +{ + name_ = fileName; + doc_.LoadFile(name_.c_str()); + if (doc_.Error()) + { + string errMsg; + + if (doc_.ErrorStr()) + { + errMsg = doc_.ErrorStr(); + } + LATAN_ERROR(Io, "cannot open file " + fileName + " [tinyxml2 code " + + strFrom(doc_.ErrorID()) + ": " + errMsg + "]"); + } + root_ = doc_.RootElement(); +} + +// XML structure access //////////////////////////////////////////////////////// +const XmlNode * XmlReader::getNextNode(const XmlNode *node, + const string &nodeName) +{ + const char *pt = (nodeName.empty()) ? nullptr : nodeName.c_str(); + + if (node) + { + return node->NextSiblingElement(pt); + } + else + { + return nullptr; + } +} + +const XmlNode * XmlReader::getNextSameNode(const XmlNode *node) +{ + if (node) + { + return getNextNode(node, node->Name()); + } + else + { + return nullptr; + } +} diff --git a/lib/Io/XmlReader.hpp b/lib/Io/XmlReader.hpp new file mode 100644 index 0000000..fb201e9 --- /dev/null +++ b/lib/Io/XmlReader.hpp @@ -0,0 +1,235 @@ +/* + * XmlReader.hpp, part of LatAnalyze + * + * Copyright (C) 2013 - 2015 Antonin Portelli + * + * LatAnalyze is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * LatAnalyze 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. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with LatAnalyze. If not, see . + */ + +#ifndef LatAnalyze_XmlReader_hpp_ +#define LatAnalyze_XmlReader_hpp_ + +#include + +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wsign-conversion" +#include +#pragma GCC diagnostic pop + +BEGIN_LATAN_NAMESPACE + +// parsing exception +class XmlParsing: public std::runtime_error +{ +public: + XmlParsing(std::string msg, std::string loc); +}; + +/****************************************************************************** + * XML parameter file reader * + ******************************************************************************/ +typedef tinyxml2::XMLElement XmlNode; + +class XmlReader +{ +public: + // constructor + XmlReader(void) = default; + explicit XmlReader(const std::string &fileName); + // destructor + virtual ~XmlReader(void) = default; + // IO + void open(const std::string &fileName); + // XML structure access + template + static const XmlNode * getFirstNode(const XmlNode *startNode, + const std::string &nodeName, + Strs... nodeNames); + template + const XmlNode * getFirstNode(const std::string &nodeName, + Strs... nodeNames) const; + static const XmlNode * getNextNode(const XmlNode *node, + const std::string &nodeName = ""); + static const XmlNode * getNextSameNode(const XmlNode *node); + template + static T getValue(const XmlNode *node); + template + static T getFirstValue(const XmlNode *startNode, + const std::string &nodeName, Strs... nodeNames); + template + T getFirstValue(const std::string &nodeName, Strs... nodeNames) const; + template + static std::vector getAllValues(const XmlNode *startNode, + const std::string &nodeName, + Strs... nodeNames); + template + std::vector getAllValues(const std::string &nodeName, + Strs... nodeNames) const; + // XML structure test + template + static bool hasNode(const XmlNode *startNode, const std::string &nodeName, + Strs... nodeNames); + template + bool hasNode(const std::string &nodeName, Strs... nodeNames) const; +private: + std::string name_; + tinyxml2::XMLDocument doc_; + XmlNode *root_{nullptr}; +}; + +/****************************************************************************** + * XmlReader template implementation * + ******************************************************************************/ +// XML structure access //////////////////////////////////////////////////////// +template +const XmlNode * XmlReader::getFirstNode(const XmlNode *startNode, + const std::string &nodeName, + Strs... nodeNames) +{ + static_assert(static_or::value...>::value, + "getFirstNode arguments are not compatible with std::string"); + + const unsigned int nName = sizeof...(nodeNames) + 1; + const std::string name[] = {nodeName, nodeNames...}; + const XmlNode *node = startNode; + + if (!node) + { + LATAN_ERROR(Io, "root node is null, no XML file opened"); + } + for (unsigned int i = 0; i < nName; ++i) + { + node = node->FirstChildElement(name[i].c_str()); + if (!node) + { + LATAN_ERROR(Io, "XML node " + name[i] + " not found"); + } + } + + return node; +} + +template +const XmlNode * XmlReader::getFirstNode(const std::string &nodeName, + Strs... nodeNames) const +{ + if (!root_) + { + LATAN_ERROR(Io, "root node is null, no XML file opened"); + } + + return getFirstNode(root_, nodeName, nodeNames...); +} + +template +T XmlReader::getValue(const XmlNode *node) +{ + if (node) + { + if (node->GetText()) + { + return Latan::strTo(node->GetText()); + } + else + { + return T(); + } + } + else + { + return T(); + } +} + +template +T XmlReader::getFirstValue(const XmlNode *startNode, + const std::string &nodeName, Strs... nodeNames) +{ + const XmlNode *node = getFirstNode(startNode, nodeName, nodeNames...); + + return getValue(node); +} + +template +T XmlReader::getFirstValue(const std::string &nodeName, Strs... nodeNames) const +{ + return getFirstValue(root_, nodeName, nodeNames...); +} + +template +std::vector XmlReader::getAllValues(const XmlNode *startNode, + const std::string &nodeName, + Strs... nodeNames) +{ + const XmlNode *node = getFirstNode(startNode, nodeName, nodeNames...); + std::vector value; + + while (node) + { + value.push_back(getValue(node)); + node = getNextSameNode(node); + } + + return value; +} + +template +std::vector XmlReader::getAllValues(const std::string &nodeName, + Strs... nodeNames) const +{ + return getAllValues(root_, nodeName, nodeNames...); +} + +// XML structure test ////////////////////////////////////////////////////////// +template +bool XmlReader::hasNode(const XmlNode *startNode, const std::string &nodeName, + Strs... nodeNames) +{ + static_assert(static_or::value...>::value, + "hasNode arguments are not compatible with std::string"); + + const unsigned int nName = sizeof...(nodeNames) + 1; + const std::string name[] = {nodeName, nodeNames...}; + const XmlNode *node = startNode; + + if (!node) + { + LATAN_ERROR(Io, "root node is null, no XML file opened"); + } + for (unsigned int i = 0; i < nName; ++i) + { + node = node->FirstChildElement(name[i].c_str()); + if (!node) + { + return false; + } + } + + return true; +} + +template +bool XmlReader::hasNode(const std::string &nodeName, Strs... nodeNames) const +{ + if (!root_) + { + LATAN_ERROR(Io, "root node is null, no XML file opened"); + } + + return hasNode(root_, nodeName, nodeNames...); +} + +END_LATAN_NAMESPACE + +#endif // LatAnalyze_XmlReader_hpp_ diff --git a/lib/Makefile.am b/lib/Makefile.am index d284ffc..79b5294 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -7,115 +7,129 @@ if CXX_INTEL endif endif +include eigen_files.mk + AM_LFLAGS = -olex.yy.c AM_YFLAGS = -d lib_LTLIBRARIES = libLatAnalyze.la noinst_LTLIBRARIES = libLexers.la -libLexers_la_SOURCES = AsciiLexer.lpp MathLexer.lpp +libLexers_la_SOURCES = Io/AsciiLexer.lpp Core/MathLexer.lpp if CXX_GNU libLexers_la_CXXFLAGS = $(COM_CXXFLAGS) -Wno-unused-parameter -Wno-unused-function -Wno-deprecated-register else libLexers_la_CXXFLAGS = $(COM_CXXFLAGS) endif -libLatAnalyze_la_SOURCES = \ - AsciiFile.cpp \ - AsciiParser.ypp \ - CompiledFunction.cpp \ - CompiledModel.cpp \ - Derivative.cpp \ - Exceptions.cpp \ - File.cpp \ - FitInterface.cpp \ - Function.cpp \ - Global.cpp \ - GslFFT.cpp \ - GslHybridRootFinder.cpp\ - GslMinimizer.cpp \ - GslQagsIntegrator.cpp \ - Hdf5File.cpp \ - Histogram.cpp \ - includes.hpp \ - Io.cpp \ - Mat.cpp \ - Math.cpp \ - MathInterpreter.cpp \ - MathParser.ypp \ - Minimizer.cpp \ - Model.cpp \ - Plot.cpp \ - RootFinder.cpp \ - Solver.cpp \ - StatArray.cpp \ - TabFunction.cpp \ - XYSampleData.cpp \ - XYStatData.cpp \ +libLatAnalyze_la_SOURCES = \ + includes.hpp \ + Global.cpp \ + Core/Exceptions.cpp \ + Core/Mat.cpp \ + Core/Math.cpp \ + Core/MathInterpreter.cpp \ + Core/MathParser.ypp \ + Core/OptParser.cpp \ + Core/Plot.cpp \ + Core/Utilities.cpp \ + Functional/CompiledFunction.cpp \ + Functional/CompiledModel.cpp \ + Functional/Function.cpp \ + Functional/Model.cpp \ + Functional/TabFunction.cpp \ + Io/AsciiFile.cpp \ + Io/AsciiParser.ypp \ + Io/BinReader.cpp \ + Io/File.cpp \ + Io/Hdf5File.cpp \ + Io/Io.cpp \ + Io/XmlReader.cpp \ + Io/Xml/tinyxml2.cpp \ + Numerical/Derivative.cpp \ + Numerical/GslFFT.cpp \ + Numerical/GslHybridRootFinder.cpp\ + Numerical/GslMinimizer.cpp \ + Numerical/GslQagsIntegrator.cpp \ + Numerical/Minimizer.cpp \ + Numerical/RootFinder.cpp \ + Numerical/Solver.cpp \ + Statistics/FitInterface.cpp \ + Statistics/Histogram.cpp \ + Statistics/StatArray.cpp \ + Statistics/XYSampleData.cpp \ + Statistics/XYStatData.cpp \ ../config.h libLatAnalyze_ladir = $(pkgincludedir) -libLatAnalyze_la_HEADERS = \ - AsciiFile.hpp \ - CompiledFunction.hpp \ - CompiledModel.hpp \ - Dataset.hpp \ - Derivative.hpp \ - Exceptions.hpp \ - FFT.hpp \ - Function.hpp \ - File.hpp \ - FitInterface.hpp \ - Global.hpp \ - GslFFT.hpp \ - GslHybridRootFinder.hpp\ - GslMinimizer.hpp \ - GslQagsIntegrator.hpp \ - Hdf5File.hpp \ - Histogram.hpp \ - Integrator.hpp \ - Io.hpp \ - IoObject.hpp \ - Mat.hpp \ - Math.hpp \ - MathInterpreter.hpp \ - MatSample.hpp \ - Minimizer.hpp \ - Model.hpp \ - ParserState.hpp \ - Plot.hpp \ - RootFinder.hpp \ - TabFunction.hpp \ - Solver.hpp \ - StatArray.hpp \ - XYSampleData.hpp \ - XYStatData.hpp +HPPFILES = \ + Global.hpp \ + Core/Exceptions.hpp \ + Core/Mat.hpp \ + Core/Math.hpp \ + Core/MathInterpreter.hpp \ + Core/OptParser.hpp \ + Core/ParserState.hpp \ + Core/Plot.hpp \ + Core/stdincludes.hpp \ + Core/Utilities.hpp \ + Functional/CompiledFunction.hpp \ + Functional/CompiledModel.hpp \ + Functional/Function.hpp \ + Functional/Model.hpp \ + Functional/TabFunction.hpp \ + Io/AsciiFile.hpp \ + Io/BinReader.hpp \ + Io/File.hpp \ + Io/Hdf5File.hpp \ + Io/Io.hpp \ + Io/IoObject.hpp \ + Io/XmlReader.hpp \ + Numerical/Derivative.hpp \ + Numerical/FFT.hpp \ + Numerical/GslFFT.hpp \ + Numerical/GslHybridRootFinder.hpp\ + Numerical/GslMinimizer.hpp \ + Numerical/GslQagsIntegrator.hpp \ + Numerical/Integrator.hpp \ + Numerical/Minimizer.hpp \ + Numerical/RootFinder.hpp \ + Numerical/Solver.hpp \ + Statistics/Dataset.hpp \ + Statistics/FitInterface.hpp \ + Statistics/Histogram.hpp \ + Statistics/MatSample.hpp \ + Statistics/StatArray.hpp \ + Statistics/XYSampleData.hpp \ + Statistics/XYStatData.hpp if HAVE_MINUIT - libLatAnalyze_la_SOURCES += MinuitMinimizer.cpp - libLatAnalyze_la_HEADERS += MinuitMinimizer.hpp + libLatAnalyze_la_SOURCES += Numerical/MinuitMinimizer.cpp + HPPFILES += Numerical/MinuitMinimizer.hpp endif if HAVE_NLOPT - libLatAnalyze_la_SOURCES += NloptMinimizer.cpp - libLatAnalyze_la_HEADERS += NloptMinimizer.hpp + libLatAnalyze_la_SOURCES += Numerical/NloptMinimizer.cpp + HPPFILES += Numerical/NloptMinimizer.hpp endif libLatAnalyze_la_CXXFLAGS = $(COM_CXXFLAGS) libLatAnalyze_la_LIBADD = libLexers.la if HAVE_AM_MINOR_LE_11 -AsciiParser.hpp: AsciiParser.ypp - $(AM_V_YACC) $(YACC) -o AsciiParser.cpp --defines=AsciiParser.hpp $< +Io/AsciiParser.hpp: Io/AsciiParser.ypp + $(AM_V_YACC) $(YACC) -o Io/AsciiParser.cpp --defines=Io/AsciiParser.hpp $< -MathParser.hpp: MathParser.ypp - $(AM_V_YACC) $(YACC) -o MathParser.cpp --defines=MathParser.hpp $< +Core/MathParser.hpp: Core/MathParser.ypp + $(AM_V_YACC) $(YACC) -o Core/MathParser.cpp --defines=Core/MathParser.hpp $< endif -BUILT_SOURCES = AsciiParser.hpp MathParser.hpp +BUILT_SOURCES = Io/AsciiParser.hpp Core/MathParser.hpp -CLEANFILES = \ - MathLexer.cpp \ - AsciiLexer.cpp \ - AsciiParser.cpp\ - AsciiParser.hpp\ - MathParser.cpp \ - MathParser.hpp +CLEANFILES = \ + Core/MathLexer.cpp \ + Core/MathParser.cpp\ + Core/MathParser.hpp\ + Io/AsciiLexer.cpp \ + Io/AsciiParser.cpp \ + Io/AsciiParser.hpp + +nobase_dist_pkginclude_HEADERS = $(HPPFILES) $(eigen_files) Io/Xml/tinyxml2.hpp ACLOCAL_AMFLAGS = -I .buildutils/m4 diff --git a/lib/Derivative.cpp b/lib/Numerical/Derivative.cpp similarity index 98% rename from lib/Derivative.cpp rename to lib/Numerical/Derivative.cpp index 6d25532..5d7ff6e 100644 --- a/lib/Derivative.cpp +++ b/lib/Numerical/Derivative.cpp @@ -17,9 +17,9 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include -#include +#include using namespace std; using namespace Latan; diff --git a/lib/Derivative.hpp b/lib/Numerical/Derivative.hpp similarity index 98% rename from lib/Derivative.hpp rename to lib/Numerical/Derivative.hpp index 1371af1..74898b6 100644 --- a/lib/Derivative.hpp +++ b/lib/Numerical/Derivative.hpp @@ -21,7 +21,7 @@ #define Latan_Derivative_hpp_ #include -#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/FFT.hpp b/lib/Numerical/FFT.hpp similarity index 100% rename from lib/FFT.hpp rename to lib/Numerical/FFT.hpp diff --git a/lib/GslFFT.cpp b/lib/Numerical/GslFFT.cpp similarity index 98% rename from lib/GslFFT.cpp rename to lib/Numerical/GslFFT.cpp index df9cf3d..7d71de9 100644 --- a/lib/GslFFT.cpp +++ b/lib/Numerical/GslFFT.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze. If not, see . */ -#include +#include #include using namespace std; diff --git a/lib/GslFFT.hpp b/lib/Numerical/GslFFT.hpp similarity index 95% rename from lib/GslFFT.hpp rename to lib/Numerical/GslFFT.hpp index 2688517..0225d38 100644 --- a/lib/GslFFT.hpp +++ b/lib/Numerical/GslFFT.hpp @@ -21,8 +21,8 @@ #define Latan_GslFFT_hpp_ #include -#include -#include +#include +#include #include BEGIN_LATAN_NAMESPACE diff --git a/lib/GslHybridRootFinder.cpp b/lib/Numerical/GslHybridRootFinder.cpp similarity index 98% rename from lib/GslHybridRootFinder.cpp rename to lib/Numerical/GslHybridRootFinder.cpp index 86a505a..e41e5c7 100644 --- a/lib/GslHybridRootFinder.cpp +++ b/lib/Numerical/GslHybridRootFinder.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include #include #include diff --git a/lib/GslHybridRootFinder.hpp b/lib/Numerical/GslHybridRootFinder.hpp similarity index 97% rename from lib/GslHybridRootFinder.hpp rename to lib/Numerical/GslHybridRootFinder.hpp index a2083f1..eb05193 100644 --- a/lib/GslHybridRootFinder.hpp +++ b/lib/Numerical/GslHybridRootFinder.hpp @@ -21,7 +21,7 @@ #define Latan_GslHybridRootFinder_hpp_ #include -#include +#include #include BEGIN_LATAN_NAMESPACE diff --git a/lib/GslMinimizer.cpp b/lib/Numerical/GslMinimizer.cpp similarity index 99% rename from lib/GslMinimizer.cpp rename to lib/Numerical/GslMinimizer.cpp index 3c3f228..2647d22 100644 --- a/lib/GslMinimizer.cpp +++ b/lib/Numerical/GslMinimizer.cpp @@ -17,9 +17,9 @@ * along with LatAnalyze. If not, see . */ -#include +#include #include -#include +#include #include #include diff --git a/lib/GslMinimizer.hpp b/lib/Numerical/GslMinimizer.hpp similarity index 95% rename from lib/GslMinimizer.hpp rename to lib/Numerical/GslMinimizer.hpp index c568348..98a425f 100644 --- a/lib/GslMinimizer.hpp +++ b/lib/Numerical/GslMinimizer.hpp @@ -21,9 +21,9 @@ #define Latan_GslMinimizer_hpp_ #include -#include -#include -#include +#include +#include +#include #include BEGIN_LATAN_NAMESPACE diff --git a/lib/GslQagsIntegrator.cpp b/lib/Numerical/GslQagsIntegrator.cpp similarity index 97% rename from lib/GslQagsIntegrator.cpp rename to lib/Numerical/GslQagsIntegrator.cpp index 13901f0..b73dc80 100644 --- a/lib/GslQagsIntegrator.cpp +++ b/lib/Numerical/GslQagsIntegrator.cpp @@ -17,9 +17,9 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include -#include +#include using namespace std; using namespace Latan; diff --git a/lib/GslQagsIntegrator.hpp b/lib/Numerical/GslQagsIntegrator.hpp similarity index 95% rename from lib/GslQagsIntegrator.hpp rename to lib/Numerical/GslQagsIntegrator.hpp index 87257a9..f7e0c97 100644 --- a/lib/GslQagsIntegrator.hpp +++ b/lib/Numerical/GslQagsIntegrator.hpp @@ -21,8 +21,8 @@ #define Latan_GslQagsIntegrator_hpp_ #include -#include -#include +#include +#include #include BEGIN_LATAN_NAMESPACE diff --git a/lib/Integrator.hpp b/lib/Numerical/Integrator.hpp similarity index 96% rename from lib/Integrator.hpp rename to lib/Numerical/Integrator.hpp index 83e00bd..6e02cae 100644 --- a/lib/Integrator.hpp +++ b/lib/Numerical/Integrator.hpp @@ -21,7 +21,7 @@ #define Latan_Integrator_hpp_ #include -#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/Minimizer.cpp b/lib/Numerical/Minimizer.cpp similarity index 98% rename from lib/Minimizer.cpp rename to lib/Numerical/Minimizer.cpp index e8259b6..42c59f5 100644 --- a/lib/Minimizer.cpp +++ b/lib/Numerical/Minimizer.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include using namespace std; diff --git a/lib/Minimizer.hpp b/lib/Numerical/Minimizer.hpp similarity index 95% rename from lib/Minimizer.hpp rename to lib/Numerical/Minimizer.hpp index e38e896..dc9ba26 100644 --- a/lib/Minimizer.hpp +++ b/lib/Numerical/Minimizer.hpp @@ -21,9 +21,9 @@ #define Latan_Minimizer_hpp_ #include -#include -#include -#include +#include +#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/MinuitMinimizer.cpp b/lib/Numerical/MinuitMinimizer.cpp similarity index 99% rename from lib/MinuitMinimizer.cpp rename to lib/Numerical/MinuitMinimizer.cpp index c2b1e0a..a9652c4 100644 --- a/lib/MinuitMinimizer.cpp +++ b/lib/Numerical/MinuitMinimizer.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include #include #include diff --git a/lib/MinuitMinimizer.hpp b/lib/Numerical/MinuitMinimizer.hpp similarity index 95% rename from lib/MinuitMinimizer.hpp rename to lib/Numerical/MinuitMinimizer.hpp index 5ded0ac..d2f3b3b 100644 --- a/lib/MinuitMinimizer.hpp +++ b/lib/Numerical/MinuitMinimizer.hpp @@ -21,8 +21,8 @@ #define Latan_MinuitMinimizer_hpp_ #include -#include -#include +#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/NloptMinimizer.cpp b/lib/Numerical/NloptMinimizer.cpp similarity index 99% rename from lib/NloptMinimizer.cpp rename to lib/Numerical/NloptMinimizer.cpp index 4049021..598e54a 100644 --- a/lib/NloptMinimizer.cpp +++ b/lib/Numerical/NloptMinimizer.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include using namespace std; diff --git a/lib/NloptMinimizer.hpp b/lib/Numerical/NloptMinimizer.hpp similarity index 95% rename from lib/NloptMinimizer.hpp rename to lib/Numerical/NloptMinimizer.hpp index 367a51a..52d5e1c 100644 --- a/lib/NloptMinimizer.hpp +++ b/lib/Numerical/NloptMinimizer.hpp @@ -21,9 +21,9 @@ #define Latan_NloptMinimizer_hpp_ #include -#include -#include -#include +#include +#include +#include #include BEGIN_LATAN_NAMESPACE diff --git a/lib/RootFinder.cpp b/lib/Numerical/RootFinder.cpp similarity index 95% rename from lib/RootFinder.cpp rename to lib/Numerical/RootFinder.cpp index ac63206..c86e0b4 100644 --- a/lib/RootFinder.cpp +++ b/lib/Numerical/RootFinder.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include using namespace std; diff --git a/lib/RootFinder.hpp b/lib/Numerical/RootFinder.hpp similarity index 94% rename from lib/RootFinder.hpp rename to lib/Numerical/RootFinder.hpp index 52a0768..2781252 100644 --- a/lib/RootFinder.hpp +++ b/lib/Numerical/RootFinder.hpp @@ -21,8 +21,8 @@ #define Latan_RootFinder_hpp_ #include -#include -#include +#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/Solver.cpp b/lib/Numerical/Solver.cpp similarity index 98% rename from lib/Solver.cpp rename to lib/Numerical/Solver.cpp index 72c6519..9830bdc 100644 --- a/lib/Solver.cpp +++ b/lib/Numerical/Solver.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include using namespace std; diff --git a/lib/Solver.hpp b/lib/Numerical/Solver.hpp similarity index 100% rename from lib/Solver.hpp rename to lib/Numerical/Solver.hpp diff --git a/lib/Dataset.hpp b/lib/Statistics/Dataset.hpp similarity index 98% rename from lib/Dataset.hpp rename to lib/Statistics/Dataset.hpp index e95e43c..cb5bb5c 100644 --- a/lib/Dataset.hpp +++ b/lib/Statistics/Dataset.hpp @@ -21,8 +21,8 @@ #define Latan_Dataset_hpp_ #include -#include -#include +#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/FitInterface.cpp b/lib/Statistics/FitInterface.cpp similarity index 99% rename from lib/FitInterface.cpp rename to lib/Statistics/FitInterface.cpp index 09c97e1..f3f6c64 100644 --- a/lib/FitInterface.cpp +++ b/lib/Statistics/FitInterface.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include using namespace std; diff --git a/lib/FitInterface.hpp b/lib/Statistics/FitInterface.hpp similarity index 99% rename from lib/FitInterface.hpp rename to lib/Statistics/FitInterface.hpp index 33e115f..744d237 100644 --- a/lib/FitInterface.hpp +++ b/lib/Statistics/FitInterface.hpp @@ -21,7 +21,7 @@ #define Latan_FitInterface_hpp_ #include -#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/Histogram.cpp b/lib/Statistics/Histogram.cpp similarity index 99% rename from lib/Histogram.cpp rename to lib/Statistics/Histogram.cpp index b48d41e..bed5bf7 100644 --- a/lib/Histogram.cpp +++ b/lib/Statistics/Histogram.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include #include #include diff --git a/lib/Histogram.hpp b/lib/Statistics/Histogram.hpp similarity index 98% rename from lib/Histogram.hpp rename to lib/Statistics/Histogram.hpp index 551cc39..ac9aee2 100644 --- a/lib/Histogram.hpp +++ b/lib/Statistics/Histogram.hpp @@ -21,7 +21,7 @@ #define Latan_Histogram_hpp_ #include -#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/MatSample.hpp b/lib/Statistics/MatSample.hpp similarity index 99% rename from lib/MatSample.hpp rename to lib/Statistics/MatSample.hpp index 0678cca..f7ab73f 100644 --- a/lib/MatSample.hpp +++ b/lib/Statistics/MatSample.hpp @@ -21,8 +21,8 @@ #define Latan_MatSample_hpp_ #include -#include -#include +#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/StatArray.cpp b/lib/Statistics/StatArray.cpp similarity index 95% rename from lib/StatArray.cpp rename to lib/Statistics/StatArray.cpp index 5071249..cf73f0f 100644 --- a/lib/StatArray.cpp +++ b/lib/Statistics/StatArray.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include using namespace std; diff --git a/lib/StatArray.hpp b/lib/Statistics/StatArray.hpp similarity index 99% rename from lib/StatArray.hpp rename to lib/Statistics/StatArray.hpp index 6944f02..87b9c58 100644 --- a/lib/StatArray.hpp +++ b/lib/Statistics/StatArray.hpp @@ -21,7 +21,7 @@ #define Latan_StatArray_hpp_ #include -#include +#include #define FOR_STAT_ARRAY(ar, i) \ for (Latan::Index i = -(ar).offset; i < (ar).size(); ++i) diff --git a/lib/XYSampleData.cpp b/lib/Statistics/XYSampleData.cpp similarity index 99% rename from lib/XYSampleData.cpp rename to lib/Statistics/XYSampleData.cpp index df53684..8f04a7d 100644 --- a/lib/XYSampleData.cpp +++ b/lib/Statistics/XYSampleData.cpp @@ -17,9 +17,9 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include -#include +#include using namespace std; using namespace Latan; diff --git a/lib/XYSampleData.hpp b/lib/Statistics/XYSampleData.hpp similarity index 96% rename from lib/XYSampleData.hpp rename to lib/Statistics/XYSampleData.hpp index b5e87d1..5bf8cf2 100644 --- a/lib/XYSampleData.hpp +++ b/lib/Statistics/XYSampleData.hpp @@ -21,11 +21,11 @@ #define Latan_XYSampleData_hpp_ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include BEGIN_LATAN_NAMESPACE diff --git a/lib/XYStatData.cpp b/lib/Statistics/XYStatData.cpp similarity index 99% rename from lib/XYStatData.cpp rename to lib/Statistics/XYStatData.cpp index 710f1a4..b3acca6 100644 --- a/lib/XYStatData.cpp +++ b/lib/Statistics/XYStatData.cpp @@ -17,9 +17,9 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include #include -#include +#include using namespace std; using namespace Latan; diff --git a/lib/XYStatData.hpp b/lib/Statistics/XYStatData.hpp similarity index 98% rename from lib/XYStatData.hpp rename to lib/Statistics/XYStatData.hpp index 2e3d2ad..1bdd277 100644 --- a/lib/XYStatData.hpp +++ b/lib/Statistics/XYStatData.hpp @@ -21,9 +21,9 @@ #define Latan_XYStatData_hpp_ #include -#include -#include -#include +#include +#include +#include BEGIN_LATAN_NAMESPACE diff --git a/physics/2pt-fit.cpp b/physics/2pt-fit.cpp index 18f7be8..977d3f5 100644 --- a/physics/2pt-fit.cpp +++ b/physics/2pt-fit.cpp @@ -1,12 +1,12 @@ -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include using namespace std; using namespace Latan; diff --git a/update_eigen.sh b/update_eigen.sh new file mode 100755 index 0000000..b140560 --- /dev/null +++ b/update_eigen.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +if (( $# != 1 )); then + echo "usage: `basename $0` " 1>&2 + exit 1 +fi +ARC=$1 + +INITDIR=`pwd` +rm -rf lib/Eigen +ARCDIR=`tar -tf ${ARC} | head -n1 | sed -e 's@/.*@@'` +tar -xf ${ARC} +cd ${ARCDIR} +(tar -cf - Eigen --exclude='*.txt' 2>/dev/null) | tar -xf - -C ../lib/ +cd ../lib +echo 'eigen_files =\' > eigen_files.mk +find Eigen -type f -print | sed 's/^/ /;$q;s/$/ \\/' >> eigen_files.mk +cd ${INITDIR} +rm -rf ${ARCDIR} diff --git a/utils/resample.cpp b/utils/resample.cpp index 15c5dda..be9e89e 100644 --- a/utils/resample.cpp +++ b/utils/resample.cpp @@ -17,9 +17,9 @@ * along with LatAnalyze 3. If not, see . */ -#include -#include -#include +#include +#include +#include #include #ifndef DEF_NSAMPLE diff --git a/utils/sample-combine.cpp b/utils/sample-combine.cpp index 5a0aa4b..32817b1 100644 --- a/utils/sample-combine.cpp +++ b/utils/sample-combine.cpp @@ -17,9 +17,9 @@ * along with LatAnalyze 3. If not, see . */ -#include -#include -#include +#include +#include +#include using namespace std; using namespace Latan; diff --git a/utils/sample-element.cpp b/utils/sample-element.cpp index 57a8714..3b1e3c5 100644 --- a/utils/sample-element.cpp +++ b/utils/sample-element.cpp @@ -17,9 +17,9 @@ * along with LatAnalyze 3. If not, see . */ -#include -#include -#include +#include +#include +#include using namespace std; using namespace Latan; diff --git a/utils/sample-fake.cpp b/utils/sample-fake.cpp index bf5933b..dd654a9 100644 --- a/utils/sample-fake.cpp +++ b/utils/sample-fake.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include using namespace std; using namespace Latan; diff --git a/utils/sample-ft.cpp b/utils/sample-ft.cpp index dc25cea..45a52cc 100644 --- a/utils/sample-ft.cpp +++ b/utils/sample-ft.cpp @@ -17,9 +17,9 @@ * along with LatAnalyze 3. If not, see . */ -#include -#include -#include +#include +#include +#include using namespace std; using namespace Latan; diff --git a/utils/sample-plot-corr.cpp b/utils/sample-plot-corr.cpp index 638abd2..47af749 100644 --- a/utils/sample-plot-corr.cpp +++ b/utils/sample-plot-corr.cpp @@ -17,9 +17,9 @@ * along with LatAnalyze 3. If not, see . */ -#include -#include -#include +#include +#include +#include using namespace std; using namespace Latan; diff --git a/utils/sample-plot.cpp b/utils/sample-plot.cpp index e8148e2..56fce42 100644 --- a/utils/sample-plot.cpp +++ b/utils/sample-plot.cpp @@ -17,9 +17,9 @@ * along with LatAnalyze 3. If not, see . */ -#include -#include -#include +#include +#include +#include using namespace std; using namespace Latan; diff --git a/utils/sample-read.cpp b/utils/sample-read.cpp index 949dee9..c927b75 100644 --- a/utils/sample-read.cpp +++ b/utils/sample-read.cpp @@ -17,7 +17,7 @@ * along with LatAnalyze 3. If not, see . */ -#include +#include using namespace std; using namespace Latan;