* \author Lars Gullik Bjønnes
* \author Jean-Marc Lasgouttes
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
-#include "LString.h"
-#include "lstrings.h"
-#include "LAssert.h"
-#include "Lsstream.h"
+#include "support/lstrings.h"
+#include "support/lyxlib.h"
+#include "support/tostr.h"
+
#include "debug.h"
-#include "BoostFormat.h"
-#include <boost/regex.hpp>
#include <boost/tokenizer.hpp>
+#include <boost/assert.hpp>
-#include <algorithm>
+#ifndef I_AM_NOT_AFRAID_OF_HEADER_LIBRARIES
+#if USE_BOOST_FORMAT
+#include <boost/format.hpp>
+#endif
+#endif
#include <cctype>
#include <cstdlib>
-using std::count;
+#include <algorithm>
+#include <sstream>
+
using std::transform;
+using std::string;
using std::vector;
#ifndef CXX_GLOBAL_CSTD
using std::atof;
using std::isdigit;
-using std::strlen;
using std::tolower;
using std::toupper;
#endif
+namespace lyx {
+namespace support {
+
int compare_no_case(string const & s, string const & s2)
{
string::const_iterator p = s.begin();
// Remove leading and trailing white space chars.
string const tmpstr = trim(str);
// Do the conversion proper.
- return lyx::atoi(tmpstr);
+ return atoi(tmpstr);
} else {
return 0;
}
// Remove leading and trailing white space chars.
string const tmpstr = trim(str);
// Do the conversion proper.
- return lyx::atoi(tmpstr);
+ return atoi(tmpstr);
} else {
return 0;
}
if (prelen > alen || a.empty())
return false;
else {
-#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
- return ::strncmp(a.c_str(), pre.c_str(), prelen) == 0;
-#else
+#if defined(STD_STRING_IS_GOOD)
return a.compare(0, prelen, pre) == 0;
+#else
+ return ::strncmp(a.c_str(), pre.c_str(), prelen) == 0;
#endif
}
}
}
-bool contains(string const & a, string const & b)
-{
- if (a.empty())
- return false;
- return a.find(b) != string::npos;
-}
-
-
-bool contains(string const & a, char b)
-{
- if (a.empty())
- return false;
- return a.find(b) != string::npos;
-}
-
-
bool containsOnly(string const & s, string const & cset)
{
return s.find_first_not_of(cset) == string::npos;
}
-bool regexMatch(string const & a, string const & pattern)
-{
- // We massage the pattern a bit so that the usual
- // shell pattern we all are used to will work.
- // One nice thing about using a real regex is that
- // things like "*.*[^~]" will work also.
- // build the regex string.
- string regex(pattern);
- regex = subst(regex, ".", "\\.");
- regex = subst(regex, "*", ".*");
- boost::regex reg(STRCONV(regex));
- return boost::regex_match(STRCONV(a), reg);
-}
-
-
string const subst(string const & a, char oldchar, char newchar)
{
string tmp(a);
string const trim(string const & a, char const * p)
{
- lyx::Assert(p);
+ BOOST_ASSERT(p);
if (a.empty() || !*p)
return a;
string const rtrim(string const & a, char const * p)
{
- lyx::Assert(p);
+ BOOST_ASSERT(p);
if (a.empty() || !*p)
return a;
string const ltrim(string const & a, char const * p)
{
- lyx::Assert(p);
+ BOOST_ASSERT(p);
if (a.empty() || !*p)
return a;
#else
boost::char_separator<char> sep(delim.c_str());
boost::tokenizer<boost::char_separator<char> > tokens(str, sep);
-#ifndef USE_INCLUDED_STRING
return vector<string>(tokens.begin(), tokens.end());
-#else
- vector<string> vec;
- using boost::tokenizer;
- using boost::char_separator;
-
- tokenizer<char_separator<char> >::iterator it = tokens.begin();
- tokenizer<char_separator<char> >::iterator end = tokens.end();
- for (; it != end; ++it) {
- vec.push_back(STRCONV((*it)));
- }
- return vec;
-#endif
#endif
}
}
+#ifndef I_AM_NOT_AFRAID_OF_HEADER_LIBRARIES
#if USE_BOOST_FORMAT
-string bformat(string const & fmt, string const & arg1)
+template<>
+string bformat(string const & fmt, int arg1)
+{
+ return (boost::format(fmt) % arg1).str();
+}
+
+
+template<>
+string bformat(string const & fmt, long arg1)
+{
+ return (boost::format(fmt) % arg1).str();
+}
+
+
+template<>
+string bformat(string const & fmt, unsigned int arg1)
+{
+ return (boost::format(fmt) % arg1).str();
+}
+
+
+template<>
+string bformat<string>(string const & fmt, string arg1)
{
- return STRCONV((boost::format(fmt) % STRCONV(arg1)).str());
+ return (boost::format(fmt) % arg1).str();
}
-string bformat(string const & fmt, string const & arg1, string const & arg2)
+template<>
+string bformat(string const & fmt, char * arg1)
{
- return STRCONV((boost::format(fmt) % STRCONV(arg1) % STRCONV(arg2)).str());
+ return (boost::format(fmt) % arg1).str();
}
-string bformat(string const & fmt, string const & arg1, string const & arg2,
- string const & arg3)
+template<>
+string bformat(string const & fmt, int arg1, int arg2)
{
- return STRCONV((boost::format(fmt) % STRCONV(arg1) % STRCONV(arg2)
- % STRCONV(arg3)).str());
+ return (boost::format(fmt) % arg1 % arg2).str();
}
-string bformat(string const & fmt, string const & arg1, string const & arg2,
- string const & arg3, string const & arg4)
+template<>
+string bformat(string const & fmt, string arg1, string arg2)
{
- return STRCONV((boost::format(fmt) % STRCONV(arg1) % STRCONV(arg2)
- % STRCONV(arg3) % STRCONV(arg4)).str());
+ return (boost::format(fmt) % arg1 % arg2).str();
+}
+
+
+template<>
+string bformat(string const & fmt, char const * arg1, string arg2)
+{
+ return (boost::format(fmt) % arg1 % arg2).str();
+}
+
+
+template<>
+string bformat(string const & fmt, string arg1, string arg2, string arg3)
+{
+ return (boost::format(fmt) % arg1 % arg2 % arg3).str();
+}
+
+
+template<>
+string bformat(string const & fmt,
+ string arg1, string arg2, string arg3, string arg4)
+{
+ return (boost::format(fmt) % arg1 % arg2 % arg3 % arg4).str();
}
#else
-string bformat(string const & fmt, string const & arg1)
+template<>
+string bformat(string const & fmt, int arg1)
+{
+ BOOST_ASSERT(contains(fmt, "%1$d"));
+ string const str = subst(fmt, "%1$d", convert<string>(arg1));
+ return subst(str, "%%", "%");
+}
+
+
+template<>
+string bformat(string const & fmt, long arg1)
+{
+ BOOST_ASSERT(contains(fmt, "%1$d"));
+ string const str = subst(fmt, "%1$d", convert<string>(arg1));
+ return subst(str, "%%", "%");
+}
+
+
+template<>
+string bformat(string const & fmt, unsigned int arg1)
{
- lyx::Assert(contains(fmt, "%1$s"));
+ BOOST_ASSERT(contains(fmt, "%1$d"));
+ string const str = subst(fmt, "%1$d", convert<string>(arg1));
+ return subst(str, "%%", "%");
+}
+
+
+template<>
+string bformat(string const & fmt, string arg1)
+{
+ BOOST_ASSERT(contains(fmt, "%1$s"));
string const str = subst(fmt, "%1$s", arg1);
return subst(str, "%%", "%");
}
-string bformat(string const & fmt, string const & arg1, string const & arg2)
+template<>
+string bformat(string const & fmt, char * arg1)
{
- lyx::Assert(contains(fmt, "%1$s"));
- lyx::Assert(contains(fmt, "%2$s"));
+ BOOST_ASSERT(contains(fmt, "%1$s"));
+ string const str = subst(fmt, "%1$s", arg1);
+ return subst(str, "%%", "%");
+}
+template<>
+string bformat(string const & fmt, string arg1, string arg2)
+{
+ BOOST_ASSERT(contains(fmt, "%1$s"));
+ BOOST_ASSERT(contains(fmt, "%2$s"));
string str = subst(fmt, "%1$s", arg1);
str = subst(str, "%2$s", arg2);
return subst(str, "%%", "%");
}
-string bformat(string const & fmt, string const & arg1, string const & arg2,
- string const & arg3)
+template<>
+string bformat(string const & fmt, char const * arg1, string arg2)
+{
+ BOOST_ASSERT(contains(fmt, "%1$s"));
+ BOOST_ASSERT(contains(fmt, "%2$s"));
+ string str = subst(fmt, "%1$s", arg1);
+ str = subst(fmt, "%2$s", arg2);
+ return subst(str, "%%", "%");
+}
+
+
+template<>
+string bformat(string const & fmt, int arg1, int arg2)
{
- lyx::Assert(contains(fmt, "%1$s"));
- lyx::Assert(contains(fmt, "%2$s"));
- lyx::Assert(contains(fmt, "%3$s"));
+ BOOST_ASSERT(contains(fmt, "%1$d"));
+ BOOST_ASSERT(contains(fmt, "%2$d"));
+ string str = subst(fmt, "%1$d", convert<string>(arg1));
+ str = subst(str, "%2$d", convert<string>(arg2));
+ return subst(str, "%%", "%");
+}
+
+
+template<>
+string bformat(string const & fmt, string arg1, string arg2, string arg3)
+{
+ BOOST_ASSERT(contains(fmt, "%1$s"));
+ BOOST_ASSERT(contains(fmt, "%2$s"));
+ BOOST_ASSERT(contains(fmt, "%3$s"));
string str = subst(fmt, "%1$s", arg1);
str = subst(str, "%2$s", arg2);
str = subst(str, "%3$s", arg3);
}
-string bformat(string const & fmt, string const & arg1, string const & arg2,
- string const & arg3, string const & arg4)
+template<>
+string bformat(string const & fmt,
+ string arg1, string arg2, string arg3, string arg4)
{
- lyx::Assert(contains(fmt, "%1$s"));
- lyx::Assert(contains(fmt, "%2$s"));
- lyx::Assert(contains(fmt, "%3$s"));
- lyx::Assert(contains(fmt, "%4$s"));
+ BOOST_ASSERT(contains(fmt, "%1$s"));
+ BOOST_ASSERT(contains(fmt, "%2$s"));
+ BOOST_ASSERT(contains(fmt, "%3$s"));
+ BOOST_ASSERT(contains(fmt, "%4$s"));
string str = subst(fmt, "%1$s", arg1);
str = subst(str, "%2$s", arg2);
str = subst(str, "%3$s", arg3);
}
#endif
+#endif
+
+} // namespace support
+} // namespace lyx
projects / lyx.git / blobdiff