X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Flstrings.h;h=9130f687c8b1c564faaa38c5d6c7c5eef929fdb0;hb=741bd1221aa56a6e278d6f8280a0dd7e2e901cac;hp=85e3cbc49aa94581d596a1a795bc47658c5453d5;hpb=46214d708cabe73ea2cb2f3c13f8ff5b12cc2fbe;p=features.git diff --git a/src/support/lstrings.h b/src/support/lstrings.h index 85e3cbc49a..9130f687c8 100644 --- a/src/support/lstrings.h +++ b/src/support/lstrings.h @@ -18,6 +18,7 @@ #include "support/docstring.h" +#include #include @@ -34,28 +35,6 @@ int compare_ascii_no_case(std::string const & s, std::string const & s2); /// Compare \p s and \p s2, ignoring the case of ASCII characters only. int compare_ascii_no_case(docstring const & s, docstring const & s2); -/// -inline -int compare(char const * a, char const * b) -{ -#ifndef CXX_GLOBAL_CSTD - return std::strcmp(a, b); -#else - return strcmp(a, b); -#endif -} - -/// -inline -int compare(char const * a, char const * b, unsigned int len) -{ -#ifndef CXX_GLOBAL_CSTD - return std::strncmp(a, b, len); -#else - return strncmp(a, b, len); -#endif -} - /// bool isStrInt(std::string const & str); @@ -65,9 +44,9 @@ bool isStrUnsignedInt(std::string const & str); /// bool isStrDbl(std::string const & str); -bool isHex(lyx::docstring const & str); +bool isHex(docstring const & str); -int hexToInt(lyx::docstring const & str); +int hexToInt(docstring const & str); /// is \p str pure ascii? bool isAscii(docstring const & str); @@ -113,19 +92,20 @@ docstring const lowercase(docstring const & s); /// Does not depend on the locale. docstring const uppercase(docstring const & s); -/// Does the string start with this prefix? -bool prefixIs(docstring const &, char_type); +/// Does str start with c? +bool prefixIs(docstring const & str, char_type c); -/// Does the std::string start with this prefix? -bool prefixIs(std::string const &, std::string const &); -bool prefixIs(docstring const &, docstring const &); +/// Does str start with pre? +bool prefixIs(std::string const & str, std::string const & pre); +bool prefixIs(docstring const & str, docstring const & pre); /// Does the string end with this char? bool suffixIs(std::string const &, char); bool suffixIs(docstring const &, char_type); -/// Does the std::string end with this suffix? +/// Does the string end with this suffix? bool suffixIs(std::string const &, std::string const &); +bool suffixIs(docstring const &, docstring const &); /// inline bool contains(std::string const & a, std::string const & b) @@ -173,6 +153,7 @@ docstring const token(docstring const & a, char_type delim, int n); \endcode */ int tokenPos(std::string const & a, char delim, std::string const & tok); +int tokenPos(docstring const & a, char_type delim, docstring const & tok); /// Substitute all \a oldchar with \a newchar @@ -203,9 +184,10 @@ docstring const trim(docstring const & a, char const * p = " "); */ std::string const trim(std::string const & a, char const * p = " "); -/** Trims characters off the end of a string. +/** Trims characters off the end of a string, removing any character + in p. \code - rtrim("abccc", "c") == "ab". + rtrim("abcde", "dec") == "ab". \endcode */ std::string const rtrim(std::string const & a, char const * p = " "); @@ -213,21 +195,24 @@ docstring const rtrim(docstring const & a, char const * p = " "); /** Trims characters off the beginning of a string. \code - ("ababcdef", "ab") = "cdef" + ("abbabcdef", "ab") = "cdef" \endcode */ std::string const ltrim(std::string const & a, char const * p = " "); docstring const ltrim(docstring const & a, char const * p = " "); -/** Splits the string by the first delim. - Splits the string by the first appearance of delim. - The leading string up to delim is returned in piece (not including - delim), while the original string is cut from after the delimiter. - Example: +/** Splits the string given in the first argument at the first occurence + of the third argumnent, delim. + What precedes delim is returned in the second argument, piece; this + will be the whole of the string if no delimiter is found. + The return value is what follows delim, if anything. So the return + value is the null string if no delimiter is found. + Examples: \code - s1= ""; s2= "a;bc".split(s1, ';') -> s1 == "a"; s2 == "bc"; + s1= "a;bc"; s2= "" + ret = split(s1, s2, ';') -> ret = "bc", s2 == "a" \endcode -*/ + */ std::string const split(std::string const & a, std::string & piece, char delim); docstring const split(docstring const & a, docstring & piece, char_type delim); @@ -242,10 +227,12 @@ std::string const rsplit(std::string const & a, std::string & piece, char delim) docstring const escape(docstring const & lab); /// gives a vector of stringparts which have the delimiter delim +/// If \p keepempty is true, empty strings will be pushed to the vector as well std::vector const getVectorFromString(std::string const & str, - std::string const & delim = std::string(",")); + std::string const & delim = std::string(","), + bool keepempty = false); std::vector const getVectorFromString(docstring const & str, - docstring const & delim = from_ascii(",")); + docstring const & delim = from_ascii(","), bool keepempty = false); // the same vice versa std::string const getStringFromVector(std::vector const & vec, @@ -262,39 +249,6 @@ docstring const externalLineEnding(docstring const & str); docstring const internalLineEnding(docstring const & str); -#ifdef I_AM_NOT_AFRAID_OF_HEADER_LIBRARIES - -#include - -template -docstring bformat(docstring const & fmt, Arg1 arg1) -{ - return (boost::basic_format(fmt) % arg1).str(); -} - - -template -docstring bformat(docstring const & fmt, Arg1 arg1, Arg2 arg2) -{ - return (boost::basic_format(fmt) % arg1 % arg2).str(); -} - - -template -docstring bformat(docstring const & fmt, Arg1 arg1, Arg2 arg2, Arg3 arg3) -{ - return (boost::basic_format(fmt) % arg1 % arg2 % arg3).str(); -} - - -template -docstring bformat(docstring const & fmt, Arg1 arg1, Arg2 arg2, Arg3 arg3, Arg4 arg4) -{ - return (boost::basic_format(fmt) % arg1 % arg2 % arg3 % arg4).str(); -} - -#else - template docstring bformat(docstring const & fmt, Arg1); @@ -307,7 +261,18 @@ docstring bformat(docstring const & fmt, Arg1, Arg2, Arg3); template docstring bformat(docstring const & fmt, Arg1, Arg2, Arg3, Arg4); -#endif + +template<> docstring bformat(docstring const & fmt, int arg1); +template<> docstring bformat(docstring const & fmt, long arg1); +template<> docstring bformat(docstring const & fmt, unsigned int arg1); +template<> docstring bformat(docstring const & fmt, docstring arg1); +template<> docstring bformat(docstring const & fmt, char * arg1); +template<> docstring bformat(docstring const & fmt, docstring arg1, docstring arg2); +template<> docstring bformat(docstring const & fmt, char const * arg1, docstring arg2); +template<> docstring bformat(docstring const & fmt, int arg1, int arg2); +template<> docstring bformat(docstring const & fmt, docstring arg1, docstring arg2, docstring arg3); +template<> docstring bformat(docstring const & fmt, docstring arg1, docstring arg2, docstring arg3, docstring arg4); + } // namespace support } // namespace lyx