#include "LString.h"
#include "lstrings.h"
#include "LRegex.h"
+#include "LAssert.h"
using std::count;
using std::transform;
using std::tolower;
using std::toupper;
#endif
-
+
+
int compare_no_case(string const & s, string const & s2)
{
// ANSI C
if (str.empty()) return false;
// Remove leading and trailing white space chars.
- string tmpstr = frontStrip(strip(str, ' '), ' ');
+ string const tmpstr = frontStrip(strip(str, ' '), ' ');
if (tmpstr.empty()) return false;
string::const_iterator cit = tmpstr.begin();
if ( (*cit) == '-') ++cit;
- for (; cit != tmpstr.end(); ++cit) {
+ string::const_iterator end = tmpstr.end();
+ for (; cit != end; ++cit) {
if (!isdigit((*cit))) return false;
}
return true;
}
-int strToInt(string const & str)
+int strToInt(string const & str)
{
- string tmpstr;
-
if (isStrInt(str)) {
// Remove leading and trailing white space chars.
- tmpstr = frontStrip(strip(str, ' '), ' ');
+ string const tmpstr = frontStrip(strip(str, ' '), ' ');
// Do the conversion proper.
- return atoi(tmpstr.c_str());
+ return lyx::atoi(tmpstr);
} else {
return 0;
}
}
-
-///
bool isStrDbl(string const & str)
{
if (str.empty()) return false;
// Remove leading and trailing white space chars.
- string tmpstr = frontStrip(strip(str, ' '), ' ');
+ string const tmpstr = frontStrip(strip(str, ' '), ' ');
if (tmpstr.empty()) return false;
// if (1 < tmpstr.count('.')) return false;
string::const_iterator cit = tmpstr.begin();
bool found_dot(false);
if ( (*cit) == '-') ++cit;
- for (; cit != tmpstr.end(); ++cit) {
+ string::const_iterator end = tmpstr.end();
+ for (; cit != end; ++cit) {
if (!isdigit((*cit))
&& '.' != (*cit)) {
return false;
return true;
}
-///
+
double strToDbl(string const & str)
{
- string tmpstr;
-
if (isStrDbl(str)) {
// Remove leading and trailing white space chars.
- tmpstr = frontStrip(strip(str, ' '), ' ');
+ string const tmpstr = frontStrip(strip(str, ' '), ' ');
// Do the conversion proper.
- return atof(tmpstr.c_str());
+ return ::atof(tmpstr.c_str());
} else {
return 0.0;
}
}
-///
+
char lowercase(char c)
{
return tolower(c);
}
-///
+
char uppercase(char c)
{
return toupper(c);
}
-string lowercase(string const & a)
+
+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 != tmp.end(); ++first, ++result) {
+ first != end; ++first, ++result) {
*result = lowercase(*first);
}
//#else
}
-string uppercase(string const & a)
+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 != tmp.end(); ++first, ++result) {
+ first != end; ++first, ++result) {
*result = uppercase(*first);
}
//#else
bool prefixIs(string const & a, char const * pre)
{
- unsigned int l = strlen(pre);
- if (l > a.length() || a.empty())
+ Assert(pre);
+
+ unsigned int const l = strlen(pre);
+ string::size_type const alen = a.length();
+
+ if (l > alen || a.empty())
return false;
else {
#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
}
+bool prefixIs(string const & a, string const & pre)
+{
+ string::size_type const prelen = pre.length();
+ string::size_type const alen = a.length();
+
+ 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
+ return a.compare(0, prelen, pre) == 0;
+#endif
+ }
+}
+
+
bool suffixIs(string const & a, char c)
{
if (a.empty()) return false;
bool suffixIs(string const & a, char const * suf)
{
- unsigned int suflen = strlen(suf);
+ Assert(suf);
+
+ unsigned int const suflen = strlen(suf);
if (suflen > a.length())
return false;
else {
}
+bool suffixIs(string const & a, string const & suf)
+{
+ string::size_type const suflen = suf.length();
+ string::size_type const alen = a.length();
+
+ if (suflen > alen) {
+ return false;
+ } else {
+#if !defined(USE_INCLUDED_STRING) && !defined(STD_STRING_IS_GOOD)
+ string tmp(a, alen - suflen);
+ return ::strncmp(tmp.c_str(), suf.c_str(), suflen) == 0;
+#else
+ return a.compare(alen - suflen, suflen, suf) == 0;
+#endif
+ }
+}
+
+
bool contains(char const * a, string const & b)
{
- if (!a || !*a || b.empty()) return false;
- return strstr(a, b.c_str()) != 0;
+ Assert(a);
+ string const at(a);
+ return contains(at, b);
}
bool contains(string const & a, char const * b)
{
- if (a.empty())
- return false;
- return a.find(b) != string::npos;
+ Assert(b);
+ string const bt(b);
+ return contains(a, bt);
}
bool contains(char const * a, char const * b)
{
- if (!a || !b || !*a || !*b) return false;
- return strstr(a, b) != 0;
+ 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);
+
return s.find_first_not_of(cset) == string::npos;
}
bool containsOnly(char const * s, char const * cset)
{
+ Assert(s && cset);
+
return string(s).find_first_not_of(cset) == string::npos;
}
bool containsOnly(char const * s, string const & cset)
{
+ Assert(s);
+
return string(s).find_first_not_of(cset) == string::npos;
}
-unsigned int countChar(string const & a, char const c)
+unsigned int countChar(string const & a, char c)
{
#ifdef HAVE_STD_COUNT
return count(a.begin(), a.end(), c);
// ale970405+lasgoutt-970425
// rewritten to use new string (Lgb)
-string token(string const & a, char delim, int n)
+string const token(string const & a, char delim, int n)
{
if (a.empty()) return string();
int tokenPos(string const & a, char delim, string const & tok)
{
int i = 0;
- string str = a;
+ string str(a);
string tmptok;
while (!str.empty()) {
}
-string subst(string const & a, char oldchar, char newchar)
+string const subst(string const & a, char oldchar, char newchar)
{
- string tmp = a;
+ string tmp(a);
string::iterator lit = tmp.begin();
- for(; lit != tmp.end(); ++lit)
+ string::iterator end = tmp.end();
+ for(; lit != end; ++lit)
if ((*lit) == oldchar)
(*lit) = newchar;
return tmp;
}
-string subst(string const & a,
+string const subst(string const & a,
char const * oldstr, string const & newstr)
{
+ Assert(oldstr);
+
string lstr(a);
string::size_type i = 0;
int olen = strlen(oldstr);
}
-string strip(string const & a, char const c)
+string const subst(string const & a,
+ string const & oldstr, string const & newstr)
+{
+ string lstr(a);
+ string::size_type i = 0;
+ string::size_type const olen = oldstr.length();
+ while((i = lstr.find(oldstr, i)) != string::npos) {
+ lstr.replace(i, olen, newstr);
+ i += newstr.length(); // We need to be sure that we dont
+ // use the same i over and over again.
+ }
+ return lstr;
+}
+
+
+string const strip(string const & a, char c)
{
if (a.empty()) return a;
- string tmp = a;
+ string tmp(a);
string::size_type i = tmp.find_last_not_of(c);
if (i == a.length() - 1) return tmp; // no c's at end of a
if (i != string::npos)
}
-string frontStrip(string const & a, char const * p)
+string const frontStrip(string const & a, char const * p)
{
- if (a.empty() || !p || !*p) return a;
- string tmp = a;
+ Assert(p);
+
+ if (a.empty() || !*p) return a;
+ string tmp(a);
string::size_type i = tmp.find_first_not_of(p);
if (i > 0)
tmp.erase(0, i);
}
-string frontStrip(string const & a, char const c)
+string const frontStrip(string const & a, char c)
{
if (a.empty()) return a;
- string tmp = a;
+ string tmp(a);
string::size_type i = tmp.find_first_not_of(c);
if (i > 0)
tmp.erase(0, i);
}
-string split(string const & a, string & piece, char delim)
+string const split(string const & a, string & piece, char delim)
{
string tmp;
string::size_type i = a.find(delim);
}
-string split(string const & a, char delim)
+string const split(string const & a, char delim)
{
string tmp;
string::size_type i = a.find(delim);
// ale970521
-string rsplit(string const & a, string & piece, char delim)
+string const rsplit(string const & a, string & piece, char delim)
{
string tmp;
string::size_type i = a.rfind(delim);
projects / lyx.git / blobdiff