*
* 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.
*
* ====================================================== */
// Asserts with a STD! are required by the standard.
// Asserts with a OURS! are added by me.
+// Some asserts could still be missing and some of the existing
+// ones might be wrong or not needed.
+
// Reference count has been checked, empty_rep removed and
// introduced again in a similar guise. Where is empty_rep _really_
// needed?
-// Insertion and replace is implemented, as far as I can see everything
-// works, but could perhaps be done smarter.
+// We are missing a couple of imporant things from the standard:
+// reverse iterators and methods taking InputIterators as paramters.
+// Also the methods returning iterators is returning the wrong value.
// All the different find functions need a good look over.
// I have so far not tested them extensively and would be
// happy if others took the time to have a peek.
+// Space allocation of string.
+// I have tried to do this very simple without using any special tricks.
+// Earlier we used a fixed value to enlarge the string with this would
+// cause a lot of reallocations with large strings (especially if
+// push_back was used) and wasting space for very small strings.
+// I have now changed the allocation to use a doubling of reserved
+// space until it is large enough. So far tests show a small speed
+// increase and a noticable memory saving.
+
// Lgb.
+
///////////////////////////////////////
// The internal string representation
///////////////////////////////////////
struct lyxstring::Srep {
- ///
- static size_t const xtra = static_cast<size_t>(8);
/// size
size_t sz;
/// Reference count
///
~Srep() { delete[] s; }
///
- Srep * get_own_copy()
- {
- if (ref == 1) return this;
- --ref;
- return new Srep(sz, s);
- }
+ Srep * get_own_copy() {
+ if (ref == 1) return this;
+ --ref;
+ return new Srep(sz, s);
+ }
///
void assign(lyxstring::size_type nsz, const lyxstring::value_type * p);
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;
- res = sz + xtra;
+ res = sz ? sz : 1;
s = new value_type[res + 1]; // add space for terminator
if (p && sz) {
// if sz = 0 nothing gets copied and we have an error
{
sz = nsz;
ref = 1;
- res = sz + xtra;
+ res = sz ? sz : 1;
s = new value_type[res + 1]; // add space for terminator
memset(s, ch, sz);
if (!ch) {
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;
sz = nsz;
- res = sz + xtra;
+ res = sz ? sz : 1;
s = new value_type[res + 1]; // add space for terminator
} else {
sz = nsz;
sz = nsz;
if (res < nsz) {
delete[] s;
- res = sz + xtra;
+ res = sz ? sz : 1;
s = new value_type[res + 1]; // add space for terminator
}
memset(s, ch, sz);
{
register unsigned int const len = sz + asz;
if (res < len) {
- res = len + xtra;
+ do {
+ res *= 2;
+ } while (res < len);
value_type * tmp = new value_type[res + 1];
memcpy(tmp, s, sz);
memcpy(tmp + sz, p, asz);
s[sz] = c; // it is always room to put a value_type at the end
++sz;
if (res < sz) {
- res = sz + xtra;
+ do {
+ res *= 2;
+ } while (res < sz);
value_type * tmp = new value_type[res + 1];
memcpy(tmp, s, sz);
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) {
- res = sz + n + xtra;
+ do {
+ res *= 2;
+ } while (res < n + sz);
value_type * tmp = new value_type[res + 1];
memcpy(tmp, s, pos);
memcpy(tmp + pos, p, n);
- memcpy(tmp + pos + n, & s[pos], sz - pos);
+ memcpy(tmp + pos + n, &s[pos], sz - pos);
sz += n;
delete[] s;
s = tmp;
} else {
- memmove(s + pos + n, & s[pos], sz - pos);
+ memmove(s + pos + n, &s[pos], sz - pos);
memcpy(s + pos, p, n);
sz += n;
}
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);
memcpy(s + i, p, n2);
sz += n2;
} else {
- res = sz + n2 + xtra;
+ do {
+ res *= 2;
+ } while (res < n2 + sz);
value_type * tmp = new value_type[res + 1];
memcpy(tmp, s, i);
memcpy(tmp + i, p, n2);
///////////////////////////////////////
// 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
helper();
}
+
lyxstringInvariant::~lyxstringInvariant()
{
helper();
// printf("lyxstringInvariant destructor completed\n");
}
+
void lyxstringInvariant::helper() const
{
// Some of these tests might look pointless but they are
Assert(object);
Assert(object->rep);
Assert(object->rep->s); // s is never 0
- Assert(object->rep->res); // always some space allocated
+ Assert(object->rep->res); // res cannot be 0
Assert(object->rep->sz <= object->rep->res);
Assert(object->rep->ref >= 1); // its in use so it must be referenced
Assert(object->rep->ref < 1UL << (8UL * sizeof(object->rep->ref) - 1));
#define TestlyxstringInvariant(s) lyxstringInvariant lyxstring_invariant(s);
#else
#define TestlyxstringInvariant(s)
-#endif //DEVEL_VERSION
+#endif /* ENABLE_ASSERTIONS */
///////////////////////////////////////
lyxstring::size_type const lyxstring::npos =
static_cast<lyxstring::size_type>(-1);
+
lyxstring::lyxstring()
{
static Srep empty_rep(0, "");
}
-lyxstring::lyxstring(iterator first, iterator last)
+lyxstring::lyxstring(const_iterator first, const_iterator last)
{
rep = new Srep(last - first, first);
}
}
-lyxstring & lyxstring::assign(iterator first, iterator last)
+lyxstring & lyxstring::assign(const_iterator first, const_iterator last)
{
TestlyxstringInvariant(this);
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);
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;
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);
lyxstring::size_type lyxstring::find_first_of(lyxstring const & a,
- size_type i) const
+ size_type i) const
{
Assert(i < rep->sz); // OURS!
TestlyxstringInvariant(this);
}
-lyxstring::size_type lyxstring::find_first_of(value_type const * ptr, size_type i,
- size_type n) const
+lyxstring::size_type lyxstring::find_first_of(value_type const * ptr,
+ size_type i,
+ size_type n) const
{
Assert(ptr && i < rep->sz); // OURS!
TestlyxstringInvariant(this);
lyxstring::size_type lyxstring::find_first_of(value_type const * ptr,
- size_type i) const
+ size_type i) const
{
Assert(ptr && i < rep->sz); // OURS!
TestlyxstringInvariant(this);
lyxstring::size_type lyxstring::find_last_of(lyxstring const & a,
- size_type i) const
+ size_type i) const
{
TestlyxstringInvariant(this);
return npos;
}
-lyxstring::size_type lyxstring::find_last_of(value_type const * ptr, size_type i,
- size_type n) const
+
+lyxstring::size_type lyxstring::find_last_of(value_type const * ptr,
+ size_type i,
+ size_type n) const
{
Assert(ptr); // OURS!
TestlyxstringInvariant(this);
lyxstring::size_type lyxstring::find_last_of(value_type const * ptr,
- size_type i) const
+ size_type i) const
{
Assert(ptr); // OURS!
TestlyxstringInvariant(this);
}
-int lyxstring::compare(size_type pos, size_type n, lyxstring const & str) const
+int lyxstring::compare(size_type pos, size_type n,
+ lyxstring const & str) const
{
Assert(pos <= rep->sz); // OURS!
TestlyxstringInvariant(this);
istream & operator>>(istream & is, lyxstring & s)
{
+#if 1
// very bad solution
char * nome = new char[1024];
is >> nome;
lyxstring tmp(nome);
delete [] nome;
if (!tmp.empty()) s = tmp;
+#else
+ // better solution
+ int w = is.widdth(0);
+ s.clear();
+ char c = 0;
+ while (is.get(c)) {
+ if (isspace(c)) { is.putback(c); break; }
+ s += c;
+ if (--w == 1) break;
+ }
+ if (s.empty()) is.setstate(ios::failbit);
+#endif
return is;
}
+
ostream & operator<<(ostream & o, lyxstring const & s)
{
return o.write(s.data(), s.length());
}
+
istream & getline(istream & is, lyxstring & s,
lyxstring::value_type delim)
{
projects / lyx.git / blobdiff