using std::count;
using std::transform;
-#ifndef __GLIBCPP__
-// The new glibstdc++-v3 has not worked out all the quirks regarding cctype
-// yet. So currently it failes if the to using lines below are stated.
+
+#ifndef CXX_GLOBAL_CSTD
using std::tolower;
using std::toupper;
#endif
int compare_no_case(string const & s, string const & s2)
{
- // ANSI C
string::const_iterator p = s.begin();
string::const_iterator p2 = s2.begin();
++p;
++p2;
}
-
+
if (s.size() == s2.size())
return 0;
if (s.size() < s2.size())
int compare_no_case(string const & s, string const & s2, unsigned int len)
{
-//#warning verify this func please
string::const_iterator p = s.begin();
string::const_iterator p2 = s2.begin();
unsigned int i = 0;
++p;
++p2;
}
- if (s.size() == s2.size())
+
+ if (s.size() >= len && s2.size() >= len)
return 0;
if (s.size() < s2.size())
return -1;
if (tmpstr.empty()) return false;
string::const_iterator cit = tmpstr.begin();
- if ( (*cit) == '-') ++cit;
+ if ((*cit) == '-') ++cit;
+ string::const_iterator end = tmpstr.end();
+ for (; cit != end; ++cit) {
+ if (!isdigit((*cit))) return false;
+ }
+ return true;
+}
+
+
+bool isStrUnsignedInt(string const & str)
+{
+ if (str.empty()) return false;
+
+ // Remove leading and trailing white space chars.
+ string const tmpstr = frontStrip(strip(str, ' '), ' ');
+ if (tmpstr.empty()) return false;
+
+ string::const_iterator cit = tmpstr.begin();
string::const_iterator end = tmpstr.end();
for (; cit != end; ++cit) {
if (!isdigit((*cit))) return false;
}
+unsigned int strToUnsignedInt(string const & str)
+{
+ if (isStrUnsignedInt(str)) {
+ // Remove leading and trailing white space chars.
+ string const tmpstr = frontStrip(strip(str, ' '), ' ');
+ // Do the conversion proper.
+ return lyx::atoi(tmpstr);
+ } else {
+ return 0;
+ }
+}
+
+
bool isStrDbl(string const & str)
{
if (str.empty()) return false;
string::const_iterator cit = tmpstr.begin();
bool found_dot(false);
- if ( (*cit) == '-') ++cit;
+ if ((*cit) == '-') ++cit;
string::const_iterator end = tmpstr.end();
for (; cit != end; ++cit) {
if (!isdigit((*cit))
char lowercase(char c)
{
- return tolower(c);
+ return char( tolower(c) );
}
char uppercase(char c)
{
- return toupper(c);
+ return char( toupper(c) );
}
+namespace {
+
+// since we cannot use std::tolower and std::toupper directly in the
+// calls to std::transform yet, we use these helper clases. (Lgb)
+
+struct local_lowercase {
+ char operator()(char c) const {
+ return tolower(c);
+ }
+};
+
+struct local_uppercase {
+ char operator()(char c) const {
+ return toupper(c);
+ }
+};
+
+} // end of anon namespace
+
string const lowercase(string const & a)
{
string tmp(a);
-//#ifdef __GLIBCPP__
- string::iterator result = tmp.begin();
- string::iterator end = tmp.end();
- for (string::iterator first = tmp.begin();
- first != end; ++first, ++result) {
- *result = lowercase(*first);
- }
-//#else
-// transform(tmp.begin(), tmp.end(), tmp.begin(), tolower);
-//#endif
+ transform(tmp.begin(), tmp.end(), tmp.begin(), local_lowercase());
return tmp;
}
-
string const uppercase(string const & a)
{
string tmp(a);
-//#ifdef __GLIBCPP__
- string::iterator result = tmp.begin();
- string::iterator end = tmp.end();
- for (string::iterator first = tmp.begin();
- first != end; ++first, ++result) {
- *result = uppercase(*first);
- }
-//#else
-// transform(tmp.begin(), tmp.end(), tmp.begin(), toupper);
-//#endif
+ transform(tmp.begin(), tmp.end(), tmp.begin(), local_uppercase());
return tmp;
}
bool prefixIs(string const & a, char const * pre)
{
- Assert(pre);
+ lyx::Assert(pre);
- unsigned int const l = strlen(pre);
+ size_t const l = strlen(pre);
string::size_type const alen = a.length();
if (l > alen || a.empty())
string::size_type const prelen = pre.length();
string::size_type const alen = a.length();
- if (prelen < alen || a.empty())
+ if (prelen > alen || a.empty())
return false;
else {
#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
bool suffixIs(string const & a, char const * suf)
{
- Assert(suf);
+ lyx::Assert(suf);
- unsigned int const suflen = strlen(suf);
- if (suflen > a.length())
+ size_t const suflen = strlen(suf);
+ string::size_type const alen = a.length();
+
+ if (suflen > alen)
return false;
else {
#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
// Delete this code when the compilers get a bit better.
- string tmp(a, a.length() - suflen);
+ string tmp(a, alen - suflen);
return ::strncmp(tmp.c_str(), suf, suflen) == 0;
#else
// This is the code that we really want to use
// but until gcc ships with a basic_string that
// implements std::string correctly we have to
// use the code above.
- return a.compare(a.length() - suflen, suflen, suf) == 0;
+ return a.compare(alen - suflen, suflen, suf) == 0;
#endif
}
}
bool contains(char const * a, string const & b)
{
- Assert(a);
+ lyx::Assert(a);
string const at(a);
return contains(at, b);
}
bool contains(string const & a, char const * b)
{
- Assert(b);
+ lyx::Assert(b);
string const bt(b);
return contains(a, bt);
}
}
+bool contains(string const & a, char b)
+{
+ if (a.empty())
+ return false;
+ return a.find(b) != string::npos;
+}
+
+
bool contains(char const * a, char const * b)
{
- Assert(a && b);
+ lyx::Assert(a && b);
string const at(a);
string const bt(b);
return contains(at, bt);
bool containsOnly(string const & s, char const * cset)
{
- Assert(cset);
+ lyx::Assert(cset);
return s.find_first_not_of(cset) == string::npos;
}
bool containsOnly(char const * s, char const * cset)
{
- Assert(s && cset);
+ lyx::Assert(s && cset);
return string(s).find_first_not_of(cset) == string::npos;
}
bool containsOnly(char const * s, string const & cset)
{
- Assert(s);
+ lyx::Assert(s);
return string(s).find_first_not_of(cset) == string::npos;
}
-unsigned int countChar(string const & a, char c)
+string::size_type countChar(string const & a, char c)
{
#ifdef HAVE_STD_COUNT
return count(a.begin(), a.end(), c);
string tmp(a);
string::iterator lit = tmp.begin();
string::iterator end = tmp.end();
- for(; lit != end; ++lit)
+ for (; lit != end; ++lit)
if ((*lit) == oldchar)
(*lit) = newchar;
return tmp;
string const subst(string const & a,
- char const * oldstr, string const & newstr)
+ char const * oldstr, string const & newstr)
{
- Assert(oldstr);
+ lyx::Assert(oldstr);
string lstr(a);
string::size_type i = 0;
- int olen = strlen(oldstr);
+ string::size_type olen = strlen(oldstr);
while((i = lstr.find(oldstr, i)) != string::npos) {
lstr.replace(i, olen, newstr);
i += newstr.length(); // We need to be sure that we dont
if (i == a.length() - 1) return tmp; // no c's at end of a
if (i != string::npos)
tmp.erase(i + 1, string::npos);
+#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
+ /// Needed for broken string::find_last_not_of
+ else if (tmp[0] != c) {
+ if (a.length() == 1) return tmp;
+ tmp.erase(1, string::npos);
+ }
+#endif
else
tmp.erase(); // only c in the whole string
return tmp;
string const frontStrip(string const & a, char const * p)
{
- Assert(p);
+ lyx::Assert(p);
if (a.empty() || !*p) return a;
string tmp(a);
projects / lyx.git / blobdiff