*
* LyX, The Document Processor
*
- * Copyright (C) 1995 Matthias Ettrich
- * Copyright (C) 1995-1999 The LyX Team.
+ * Copyright 1995 Matthias Ettrich
+ * Copyright 1995-2000 The LyX Team.
*
* ====================================================== */
#include "LAssert.h"
+#include "debug.h"
+
using std::min;
+using std::istream;
+using std::ostream;
// This class is supposed to be functionaly equivalent to a
// standard conformant string. This mean among others that we
lyxstring::Srep::Srep(lyxstring::size_type nsz, const value_type * p)
{
-// can be called with p == 0 by lyxstring::assign(const value_type *, size_type)
+ // can be called with p == 0 by
+ // lyxstring::assign(const value_type *, size_type)
sz = nsz;
ref = 1;
void lyxstring::Srep::assign(lyxstring::size_type nsz, const value_type * p)
{
-// can be called with p == 0 by lyxstring::assign(const value_type *, size_type)
+ // can be called with p == 0
+ // by lyxstring::assign(const value_type *, size_type)
if (res < nsz) {
delete[] s;
void lyxstring::Srep::insert(lyxstring::size_type pos, const value_type * p,
- lyxstring::size_type n)
+ lyxstring::size_type n)
{
if (res < n + sz) {
do {
void lyxstring::Srep::replace(lyxstring::size_type i, lyxstring::size_type n,
- value_type const * p, size_type n2)
+ value_type const * p, size_type n2)
{
// can be called with p= 0 and n2= 0
n = min(sz - i, n);
///////////////////////////////////////
// The lyxstring Invariant tester
///////////////////////////////////////
-#ifdef DEVEL_VERSION
+#ifdef ENABLE_ASSERTIONS
/** Testing of the lyxstring invariant
* By creating an object that tests the lyxstring invariant during its
#define TestlyxstringInvariant(s) lyxstringInvariant lyxstring_invariant(s);
#else
#define TestlyxstringInvariant(s)
-#endif //DEVEL_VERSION
+#endif /* ENABLE_ASSERTIONS */
///////////////////////////////////////
{
Assert(s && n < npos); // STD!
static Srep empty_rep(0, "");
- if (*s && n) { // s is not empty string and n > 0
- rep = new Srep(min(strlen(s), n), s);
+ if (n) { // n > 0
+ rep = new Srep(n, s);
} else {
++empty_rep.ref;
rep = &empty_rep;
lyxstring::iterator lyxstring::begin()
{
+ rep = rep->get_own_copy();
return rep->s;
}
lyxstring::iterator lyxstring::end()
{
+ rep = rep->get_own_copy();
return rep->s + rep->sz;
}
// Assignment
////////////////
-lyxstring & lyxstring::operator= (lyxstring const & x)
+lyxstring & lyxstring::operator=(lyxstring const & x)
{
TestlyxstringInvariant(this);
}
-lyxstring & lyxstring::operator= (value_type const * s)
+lyxstring & lyxstring::operator=(value_type const * s)
{
Assert(s); // OURS!
TestlyxstringInvariant(this);
lyxstring & lyxstring::assign(value_type const * s, size_type n)
{
- Assert(s); // OURS!
+ Assert(s && n < npos); // STD!
TestlyxstringInvariant(this);
- n = min(strlen(s), n);
if (rep->ref == 1) // recycle rep
rep->assign(n, s);
else {
- rep->ref--;
+ --rep->ref;
rep = new Srep(n, s);
}
return *this;
if (!*p || !n) return *this;
rep = rep->get_own_copy();
- rep->append(min(n, strlen(p)), p);
+ rep->append(n, p);
return *this;
}
lyxstring & lyxstring::append(value_type const * p)
{
Assert(p); // OURS!
- TestlyxstringInvariant(this);
-
- if (!*p) return *this;
- rep = rep->get_own_copy();
- rep->append(strlen(p), p);
- return *this;
+ return append(p, strlen(p));
}
return *this;
}
-// insert value_typeacters before (*this)[pos]
+// insert characters before (*this)[pos]
lyxstring & lyxstring::insert(size_type pos, lyxstring const & x)
{
lyxstring & lyxstring::insert(size_type pos, lyxstring const & x,
- size_type pos2, size_type n)
+ size_type pos2, size_type n)
{
Assert(pos <= rep->sz && pos2 <= x.rep->sz); // STD!
TestlyxstringInvariant(this);
if (*p && n) {
// insert nothing and you change nothing
rep = rep->get_own_copy();
- rep->insert(pos, p, min(n, strlen(p)));
+ rep->insert(pos, p, n);
}
return *this;
}
lyxstring & lyxstring::insert(size_type pos, value_type const * p)
{
Assert(p); // OURS!
- TestlyxstringInvariant(this);
-
- if (*p) {
- // insert nothing and you change nothing
- rep = rep->get_own_copy();
- rep->insert(pos, p, strlen(p));
- }
- return *this;
+ return insert(pos, p, strlen(p));
}
TestlyxstringInvariant(this);
- for (size_type t = i; rep->sz - t >= a.length(); ++t) {
+ size_type n = a.length();
+ if (!n) return npos;
+ for (size_type t = i; rep->sz - t >= n; ++t) {
// search until (*this)[i] == a[0]
if (rep->s[t] == a[0]) {
// check if the rest of the value_types match
bool equal = true;
- for (size_type j = 0; j < a.length(); ++j) {
+ for (size_type j = 1; j < n; ++j) {
if (rep->s[t + j] != a[j]) {
equal = false;
break;
lyxstring::size_type lyxstring::find(value_type const * ptr, size_type i,
- size_type n) const
+ size_type n) const
{
Assert(ptr); // OURS!
if (!rep->sz || !*ptr || i >= rep->sz) return npos;
// for ptr in? For now I will assume that "n" tells the length
// of ptr. (Lgb)
n = min(n, strlen(ptr));
+ if (!n) return npos;
for (size_type t = i; rep->sz - t >= n; ++t) {
// search until (*this)[i] == a[0]
if (rep->s[t] == ptr[0]) {
// check if the rest of the value_types match
bool equal = true;
- for (size_type j = 0; j < n; ++j) {
+ for (size_type j = 1; j < n; ++j) {
if (rep->s[t + j] != ptr[j]) {
equal = false;
break;
{
TestlyxstringInvariant(this);
- size_type ii = min(rep->sz - 1, i);
+ size_type n = a.length();
+ if (!n || rep->sz < n)
+ return npos;
+
+ size_type t = min(rep->sz - n, i);
do {
- if (a[a.length() - 1] == rep->s[ii]) {
- int t = rep->sz - 2;
- size_type l = ii - 1;
- for (; t >= 0; --t, --l) {
- if (a[t] != rep->s[l]) break;
+ if (rep->s[t] == a[0]) {
+ // check if the rest of the value_types match
+ bool equal = true;
+ for (size_type j = 1; j < n; ++j) {
+ if (rep->s[t + j] != a[j]) {
+ equal = false;
+ break;
+ }
}
- if (a[t] == rep->s[l]) return l;
+ if (equal) return t;
}
- } while(ii-- > 0);
+ } while(t-- > 0);
return npos;
}
lyxstring::size_type lyxstring::rfind(value_type const * ptr, size_type i,
- size_type n) const
+ size_type n) const
{
Assert(ptr); // OURS!
TestlyxstringInvariant(this);
- if (!*ptr) return npos;
- size_type ii = min(rep->sz - 1, i);
+ n = min(n, strlen(ptr));
+ if (!n || rep->sz < n)
+ return npos;
+
+ size_type t = min(rep->sz - n, i);
do {
- if (ptr[n - 1] == rep->s[ii]) {
- int t = n - 2;
- size_type l = ii - 1;
- for (; t >= 0; --t, --l) {
- if (ptr[t] != rep->s[l]) break;
+ if (rep->s[t] == ptr[0]) {
+ // check if the rest of the value_types match
+ bool equal = true;
+ for (size_type j = 1; j < n; ++j) {
+ if (rep->s[t + j] != ptr[j]) {
+ equal = false;
+ break;
+ }
}
- if (ptr[t] == rep->s[l]) return l;
+ if (equal) return t;
}
- } while (ii-- > 0);
+ } while (t-- > 0);
return npos;
}
size_type i) const
{
Assert(ptr); // OURS!
- TestlyxstringInvariant(this);
- if (!*ptr) return npos;
- size_type ii = min(rep->sz - 1, i);
- do {
- if (ptr[strlen(ptr) - 1] == rep->s[ii]) {
- int t = strlen(ptr) - 2;
- size_type l = ii - 1;
- for (; t >= 0; --t, --l) {
- if (ptr[t] != rep->s[l]) break;
- }
- if (ptr[t] == rep->s[l]) return l;
- }
- } while (ii-- > 0);
- return npos;
+ if (!ptr || !*ptr) return npos;
+ return rfind(ptr, i, strlen(ptr));
}
{
TestlyxstringInvariant(this);
- size_type ii = min(rep->sz - 1, i);
- for (size_type t = ii; t != 0; --t) {
- if (rep->s[t] == c) return t;
- }
- return npos;
+ size_type const sz = rep->sz;
+ if (sz < 1) return npos;
+ size_type ii = min(sz - 1, i);
+ do {
+ if (rep->s[ii] == c) return ii;
+ } while (ii-- > 0);
+ return npos;
}
lyxstring::size_type lyxstring::find_first_of(lyxstring const & a,
size_type i) const
{
- Assert(i < rep->sz); // OURS!
+ Assert(i <= rep->sz); // OURS!
TestlyxstringInvariant(this);
for (size_type t = i; t < rep->sz; ++t) {
size_type i,
size_type n) const
{
- Assert(ptr && i < rep->sz); // OURS!
+ Assert(ptr && i <= rep->sz); // OURS!
TestlyxstringInvariant(this);
if (!n) return npos;
for (size_type t = i; t < rep->sz; ++t) {
- if(memchr(ptr, rep->s[t], n) != 0) return t;
+ if (memchr(ptr, rep->s[t], n) != 0) return t;
}
return npos;
}
lyxstring::size_type lyxstring::find_first_of(value_type const * ptr,
size_type i) const
{
- Assert(ptr && i < rep->sz); // OURS!
+ Assert(ptr && i <= rep->sz); // OURS!
TestlyxstringInvariant(this);
for (size_type t = i; t < rep->sz; ++t) {
lyxstring::size_type lyxstring::find_first_of(value_type c, size_type i) const
{
- Assert(i < rep->sz); // OURS!
+ Assert(i <= rep->sz); // OURS!
TestlyxstringInvariant(this);
for (size_type t = i; t < rep->sz; ++t) {
size_type ii = min(rep->sz - 1, i);
for (int t = ii; t >= 0; --t) {
- if(memchr(ptr, rep->s[t], n) != 0) return t;
+ if (memchr(ptr, rep->s[t], n) != 0) return t;
}
return npos;
}
TestlyxstringInvariant(this);
if (!rep->sz) return npos;
- Assert(i < rep->sz);
+ Assert(i <= rep->sz);
for (size_type t = i; t < rep->sz; ++t) {
if (a.find(rep->s[t]) == npos) return t;
}
size_type i,
size_type n) const
{
- Assert(ptr && i < rep->sz); // OURS!
+ Assert(ptr && i <= rep->sz); // OURS!
TestlyxstringInvariant(this);
if (!n) return (i < rep->sz) ? i : npos;
for (size_type t = i; t < rep->sz; ++t) {
- if(memchr(ptr, rep->s[t], n) == 0) return t;
+ if (memchr(ptr, rep->s[t], n) == 0) return t;
}
return npos;
}
lyxstring::size_type lyxstring::find_first_not_of(value_type const * ptr,
size_type i) const
{
- Assert(ptr && i < rep->sz); // OURS!
+ Assert(ptr && i <= rep->sz); // OURS!
TestlyxstringInvariant(this);
for (size_type t = i; t < rep->sz; ++t) {
size_type i) const
{
if (!rep->sz) return npos;
- Assert(i < rep->sz); // OURS!
+ Assert(i <= rep->sz); // OURS!
TestlyxstringInvariant(this);
for (size_type t = i; t < rep->sz; ++t) {
size_type ii = min(rep->sz - 1, i);
for (int t = ii; t >= 0; --t) {
- if(memchr(ptr, rep->s[t], n) == 0) return t;
+ if (memchr(ptr, rep->s[t], n) == 0) return t;
}
return npos;
}
lyxstring & lyxstring::replace(size_type i, size_type n,
value_type const * p, size_type n2)
{
- Assert(p && i < rep->sz); // OURS!
+ Assert(p && i <= rep->sz); // OURS!
TestlyxstringInvariant(this);
rep = rep->get_own_copy();
lyxstring & lyxstring::replace(size_type i, size_type n, value_type const * p)
{
- Assert(p && i < rep->sz); // OURS!
+ Assert(p && i <= rep->sz); // OURS!
TestlyxstringInvariant(this);
return replace(i, min(n, rep->sz), p, (!p) ? 0 : strlen(p));
lyxstring & lyxstring::replace(size_type i, size_type n,
size_type n2, value_type c)
{
- Assert(i < rep->sz); // OURS!
+ Assert(i <= rep->sz); // OURS!
TestlyxstringInvariant(this);
rep = rep->get_own_copy();
}
return is;
}
+
+#ifdef TEST_MAIN
+int main() {
+ lyxstring a = "abcac";
+ cout << a.rfind("ab") << endl;
+ cout << a.rfind("c") << endl;
+ cout << a.rfind("d") << endl;
+}
+#endif
projects / lyx.git / blobdiff