Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 20:49:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed |BeginWriting| and |EndWriting| to no longer take an offset, fallout from the new multi-fragment string implementation; fixed a bug in |operator-=| exposed by the change to |EndWriting|; fixed |nsWritingIterator<CharT>::write| as per bug #46462; fixed comments galore, significantly better specifying |SetLength| and |SetCapacity|; since |SetCapacity| is just a hint, give it a default implementation rather than making it pure virtual; fixed a couple of the |do_...| routines to unify the code path minimizing overides; r|a=waterson

Browse Source
This commit is contained in:
scc%mozilla.org 2000-08-09 08:26:08 +00:00
parent 454fd1db7e
commit 7a4bbc2688
3 changed files with 117 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
string/public/nsAWritableString.h
View File

@ -183,10 +183,10 @@ class nsWritingIterator
while ( n )
{
normalize_backward();
difference_type one_hop = NS_MIN(n, size_backward());
NS_ASSERTION(one_hop>0, "Infinite loop: can't advance (backward) a writable iterator beyond the end of a string");
mPosition -= one_hop;
normalize_backward();
n -= one_hop;
}
@ -199,7 +199,7 @@ class nsWritingIterator
NS_ASSERTION(size_forward() > 0, "You can't |write| into an |nsWritingIterator| with no space!");
n = NS_MIN(n, PRUint32(size_forward()));
nsCharTraits<value_type>::copy(mPosition, s, n);
nsCharTraits<value_type>::move(mPosition, s, n);
operator+=( difference_type(n) );
return n;
}
@ -233,24 +233,43 @@ class basic_nsAWritableString
nsWritingIterator<CharT>
BeginWriting( PRUint32 aOffset = 0 )
BeginWriting()
{
nsWritableFragment<CharT> fragment;
CharT* startPos = GetWritableFragment(fragment, kFragmentAt, aOffset);
CharT* startPos = GetWritableFragment(fragment, kFirstFragment);
return nsWritingIterator<CharT>(fragment, startPos, *this);
}
nsWritingIterator<CharT>
EndWriting( PRUint32 aOffset = 0 )
EndWriting()
{
nsWritableFragment<CharT> fragment;
CharT* startPos = GetWritableFragment(fragment, kFragmentAt, NS_MAX(0U, this->Length()-aOffset));
return nsWritingIterator<CharT>(fragment, startPos, *this);
GetWritableFragment(fragment, kLastFragment);
return nsWritingIterator<CharT>(fragment, fragment.mEnd, *this);
}
virtual void SetCapacity( PRUint32 ) = 0;
/**
* |SetCapacity| is not required to do anything; however, it can be used
* as a hint to the implementation to reduce allocations.
* |SetCapacity(0)| is a suggestion to discard all associated storage.
*/
virtual void SetCapacity( PRUint32 ) { }
/**
* |SetLength| is used in two ways:
* 1) to |Cut| a suffix of the string;
* 2) to prepare to |Append| or move characters around.
*
* External callers are not allowed to use |SetLength| is this latter capacity.
* Should this really be a public operation?
* Additionally, your implementation of |SetLength| need not satisfy (2) if and only if you
* override the |do_...| routines to not need this facility.
*
* This distinction makes me think the two different uses should be split into
* two distinct functions.
*/
virtual void SetLength( PRUint32 ) = 0;
@ -316,6 +335,10 @@ class basic_nsAWritableString
/**
* The following index based routines need to be recast with iterators.
*/
//
// |Insert()|
// Note: I would really like to move the |atPosition| parameter to the front of the argument list
@ -548,7 +571,7 @@ basic_nsAWritableString<CharT>::do_AppendFromReadable( const basic_nsAReadableSt
{
PRUint32 oldLength = this->Length();
SetLength(oldLength + aReadable.Length());
copy_string(aReadable.BeginReading(), aReadable.EndReading(), BeginWriting(oldLength));
copy_string(aReadable.BeginReading(), aReadable.EndReading(), BeginWriting()+=oldLength);
}
template <class CharT>
@ -569,10 +592,7 @@ template <class CharT>
void
basic_nsAWritableString<CharT>::do_AppendFromElement( CharT aChar )
{
PRUint32 oldLength = this->Length();
SetLength(oldLength+1);
nsWritableFragment<CharT> fragment;
*GetWritableFragment(fragment, kFragmentAt, oldLength) = aChar;
do_AppendFromReadable(basic_nsLiteralChar<CharT>(aChar));
}
@ -618,10 +638,10 @@ basic_nsAWritableString<CharT>::do_InsertFromReadable( const basic_nsAReadableSt
PRUint32 oldLength = this->Length();
SetLength(oldLength + aReadable.Length());
if ( atPosition < oldLength )
copy_string_backward(this->BeginReading(atPosition), this->BeginReading(oldLength), EndWriting());
copy_string_backward(this->BeginReading()+=atPosition, this->BeginReading()+=oldLength, EndWriting());
else
atPosition = oldLength;
copy_string(aReadable.BeginReading(), aReadable.EndReading(), BeginWriting(atPosition));
copy_string(aReadable.BeginReading(), aReadable.EndReading(), BeginWriting()+=atPosition);
}
template <class CharT>
@ -659,7 +679,7 @@ basic_nsAWritableString<CharT>::Cut( PRUint32 cutStart, PRUint32 cutLength )
cutLength = NS_MIN(cutLength, myLength-cutStart);
PRUint32 cutEnd = cutStart + cutLength;
if ( cutEnd < myLength )
copy_string(this->BeginReading(cutEnd), this->EndReading(), BeginWriting(cutStart));
copy_string(this->BeginReading()+=cutEnd, this->EndReading(), BeginWriting()+=cutStart);
SetLength(myLength-cutLength);
}
@ -715,12 +735,12 @@ basic_nsAWritableString<CharT>::do_ReplaceFromReadable( PRUint32 cutStart, PRUin
PRUint32 newLength = oldLength - cutLength + replacementLength;
if ( cutLength > replacementLength )
copy_string(this->BeginReading(cutEnd), this->EndReading(), BeginWriting(replacementEnd));
copy_string(this->BeginReading()+=cutEnd, this->EndReading(), BeginWriting()+=replacementEnd);
SetLength(newLength);
if ( cutLength < replacementLength )
copy_string_backward(this->BeginReading(cutEnd), this->BeginReading(oldLength), BeginWriting(replacementEnd));
copy_string_backward(this->BeginReading()+=cutEnd, this->BeginReading()+=oldLength, BeginWriting()+=replacementEnd);
copy_string(aReplacement.BeginReading(), aReplacement.EndReading(), BeginWriting(cutStart));
copy_string(aReplacement.BeginReading(), aReplacement.EndReading(), BeginWriting()+=cutStart);
}

58
xpcom/ds/nsAWritableString.h
View File

@ -183,10 +183,10 @@ class nsWritingIterator
while ( n )
{
normalize_backward();
difference_type one_hop = NS_MIN(n, size_backward());
NS_ASSERTION(one_hop>0, "Infinite loop: can't advance (backward) a writable iterator beyond the end of a string");
mPosition -= one_hop;
normalize_backward();
n -= one_hop;
}
@ -199,7 +199,7 @@ class nsWritingIterator
NS_ASSERTION(size_forward() > 0, "You can't |write| into an |nsWritingIterator| with no space!");
n = NS_MIN(n, PRUint32(size_forward()));
nsCharTraits<value_type>::copy(mPosition, s, n);
nsCharTraits<value_type>::move(mPosition, s, n);
operator+=( difference_type(n) );
return n;
}
@ -233,24 +233,43 @@ class basic_nsAWritableString
nsWritingIterator<CharT>
BeginWriting( PRUint32 aOffset = 0 )
BeginWriting()
{
nsWritableFragment<CharT> fragment;
CharT* startPos = GetWritableFragment(fragment, kFragmentAt, aOffset);
CharT* startPos = GetWritableFragment(fragment, kFirstFragment);
return nsWritingIterator<CharT>(fragment, startPos, *this);
}
nsWritingIterator<CharT>
EndWriting( PRUint32 aOffset = 0 )
EndWriting()
{
nsWritableFragment<CharT> fragment;
CharT* startPos = GetWritableFragment(fragment, kFragmentAt, NS_MAX(0U, this->Length()-aOffset));
return nsWritingIterator<CharT>(fragment, startPos, *this);
GetWritableFragment(fragment, kLastFragment);
return nsWritingIterator<CharT>(fragment, fragment.mEnd, *this);
}
virtual void SetCapacity( PRUint32 ) = 0;
/**
* |SetCapacity| is not required to do anything; however, it can be used
* as a hint to the implementation to reduce allocations.
* |SetCapacity(0)| is a suggestion to discard all associated storage.
*/
virtual void SetCapacity( PRUint32 ) { }
/**
* |SetLength| is used in two ways:
* 1) to |Cut| a suffix of the string;
* 2) to prepare to |Append| or move characters around.
*
* External callers are not allowed to use |SetLength| is this latter capacity.
* Should this really be a public operation?
* Additionally, your implementation of |SetLength| need not satisfy (2) if and only if you
* override the |do_...| routines to not need this facility.
*
* This distinction makes me think the two different uses should be split into
* two distinct functions.
*/
virtual void SetLength( PRUint32 ) = 0;
@ -316,6 +335,10 @@ class basic_nsAWritableString
/**
* The following index based routines need to be recast with iterators.
*/
//
// |Insert()|
// Note: I would really like to move the |atPosition| parameter to the front of the argument list
@ -548,7 +571,7 @@ basic_nsAWritableString<CharT>::do_AppendFromReadable( const basic_nsAReadableSt
{
PRUint32 oldLength = this->Length();
SetLength(oldLength + aReadable.Length());
copy_string(aReadable.BeginReading(), aReadable.EndReading(), BeginWriting(oldLength));
copy_string(aReadable.BeginReading(), aReadable.EndReading(), BeginWriting()+=oldLength);
}
template <class CharT>
@ -569,10 +592,7 @@ template <class CharT>
void
basic_nsAWritableString<CharT>::do_AppendFromElement( CharT aChar )
{
PRUint32 oldLength = this->Length();
SetLength(oldLength+1);
nsWritableFragment<CharT> fragment;
*GetWritableFragment(fragment, kFragmentAt, oldLength) = aChar;
do_AppendFromReadable(basic_nsLiteralChar<CharT>(aChar));
}
@ -618,10 +638,10 @@ basic_nsAWritableString<CharT>::do_InsertFromReadable( const basic_nsAReadableSt
PRUint32 oldLength = this->Length();
SetLength(oldLength + aReadable.Length());
if ( atPosition < oldLength )
copy_string_backward(this->BeginReading(atPosition), this->BeginReading(oldLength), EndWriting());
copy_string_backward(this->BeginReading()+=atPosition, this->BeginReading()+=oldLength, EndWriting());
else
atPosition = oldLength;
copy_string(aReadable.BeginReading(), aReadable.EndReading(), BeginWriting(atPosition));
copy_string(aReadable.BeginReading(), aReadable.EndReading(), BeginWriting()+=atPosition);
}
template <class CharT>
@ -659,7 +679,7 @@ basic_nsAWritableString<CharT>::Cut( PRUint32 cutStart, PRUint32 cutLength )
cutLength = NS_MIN(cutLength, myLength-cutStart);
PRUint32 cutEnd = cutStart + cutLength;
if ( cutEnd < myLength )
copy_string(this->BeginReading(cutEnd), this->EndReading(), BeginWriting(cutStart));
copy_string(this->BeginReading()+=cutEnd, this->EndReading(), BeginWriting()+=cutStart);
SetLength(myLength-cutLength);
}
@ -715,12 +735,12 @@ basic_nsAWritableString<CharT>::do_ReplaceFromReadable( PRUint32 cutStart, PRUin
PRUint32 newLength = oldLength - cutLength + replacementLength;
if ( cutLength > replacementLength )
copy_string(this->BeginReading(cutEnd), this->EndReading(), BeginWriting(replacementEnd));
copy_string(this->BeginReading()+=cutEnd, this->EndReading(), BeginWriting()+=replacementEnd);
SetLength(newLength);
if ( cutLength < replacementLength )
copy_string_backward(this->BeginReading(cutEnd), this->BeginReading(oldLength), BeginWriting(replacementEnd));
copy_string_backward(this->BeginReading()+=cutEnd, this->BeginReading()+=oldLength, BeginWriting()+=replacementEnd);
copy_string(aReplacement.BeginReading(), aReplacement.EndReading(), BeginWriting(cutStart));
copy_string(aReplacement.BeginReading(), aReplacement.EndReading(), BeginWriting()+=cutStart);
}

58
xpcom/string/public/nsAWritableString.h
View File

@ -183,10 +183,10 @@ class nsWritingIterator
while ( n )
{
normalize_backward();
difference_type one_hop = NS_MIN(n, size_backward());
NS_ASSERTION(one_hop>0, "Infinite loop: can't advance (backward) a writable iterator beyond the end of a string");
mPosition -= one_hop;
normalize_backward();
n -= one_hop;
}
@ -199,7 +199,7 @@ class nsWritingIterator
NS_ASSERTION(size_forward() > 0, "You can't |write| into an |nsWritingIterator| with no space!");
n = NS_MIN(n, PRUint32(size_forward()));
nsCharTraits<value_type>::copy(mPosition, s, n);
nsCharTraits<value_type>::move(mPosition, s, n);
operator+=( difference_type(n) );
return n;
}
@ -233,24 +233,43 @@ class basic_nsAWritableString
nsWritingIterator<CharT>
BeginWriting( PRUint32 aOffset = 0 )
BeginWriting()
{
nsWritableFragment<CharT> fragment;
CharT* startPos = GetWritableFragment(fragment, kFragmentAt, aOffset);
CharT* startPos = GetWritableFragment(fragment, kFirstFragment);
return nsWritingIterator<CharT>(fragment, startPos, *this);
}
nsWritingIterator<CharT>
EndWriting( PRUint32 aOffset = 0 )
EndWriting()
{
nsWritableFragment<CharT> fragment;
CharT* startPos = GetWritableFragment(fragment, kFragmentAt, NS_MAX(0U, this->Length()-aOffset));
return nsWritingIterator<CharT>(fragment, startPos, *this);
GetWritableFragment(fragment, kLastFragment);
return nsWritingIterator<CharT>(fragment, fragment.mEnd, *this);
}
virtual void SetCapacity( PRUint32 ) = 0;
/**
* |SetCapacity| is not required to do anything; however, it can be used
* as a hint to the implementation to reduce allocations.
* |SetCapacity(0)| is a suggestion to discard all associated storage.
*/
virtual void SetCapacity( PRUint32 ) { }
/**
* |SetLength| is used in two ways:
* 1) to |Cut| a suffix of the string;
* 2) to prepare to |Append| or move characters around.
*
* External callers are not allowed to use |SetLength| is this latter capacity.
* Should this really be a public operation?
* Additionally, your implementation of |SetLength| need not satisfy (2) if and only if you
* override the |do_...| routines to not need this facility.
*
* This distinction makes me think the two different uses should be split into
* two distinct functions.
*/
virtual void SetLength( PRUint32 ) = 0;
@ -316,6 +335,10 @@ class basic_nsAWritableString
/**
* The following index based routines need to be recast with iterators.
*/
//
// |Insert()|
// Note: I would really like to move the |atPosition| parameter to the front of the argument list
@ -548,7 +571,7 @@ basic_nsAWritableString<CharT>::do_AppendFromReadable( const basic_nsAReadableSt
{
PRUint32 oldLength = this->Length();
SetLength(oldLength + aReadable.Length());
copy_string(aReadable.BeginReading(), aReadable.EndReading(), BeginWriting(oldLength));
copy_string(aReadable.BeginReading(), aReadable.EndReading(), BeginWriting()+=oldLength);
}
template <class CharT>
@ -569,10 +592,7 @@ template <class CharT>
void
basic_nsAWritableString<CharT>::do_AppendFromElement( CharT aChar )
{
PRUint32 oldLength = this->Length();
SetLength(oldLength+1);
nsWritableFragment<CharT> fragment;
*GetWritableFragment(fragment, kFragmentAt, oldLength) = aChar;
do_AppendFromReadable(basic_nsLiteralChar<CharT>(aChar));
}
@ -618,10 +638,10 @@ basic_nsAWritableString<CharT>::do_InsertFromReadable( const basic_nsAReadableSt
PRUint32 oldLength = this->Length();
SetLength(oldLength + aReadable.Length());
if ( atPosition < oldLength )
copy_string_backward(this->BeginReading(atPosition), this->BeginReading(oldLength), EndWriting());
copy_string_backward(this->BeginReading()+=atPosition, this->BeginReading()+=oldLength, EndWriting());
else
atPosition = oldLength;
copy_string(aReadable.BeginReading(), aReadable.EndReading(), BeginWriting(atPosition));
copy_string(aReadable.BeginReading(), aReadable.EndReading(), BeginWriting()+=atPosition);
}
template <class CharT>
@ -659,7 +679,7 @@ basic_nsAWritableString<CharT>::Cut( PRUint32 cutStart, PRUint32 cutLength )
cutLength = NS_MIN(cutLength, myLength-cutStart);
PRUint32 cutEnd = cutStart + cutLength;
if ( cutEnd < myLength )
copy_string(this->BeginReading(cutEnd), this->EndReading(), BeginWriting(cutStart));
copy_string(this->BeginReading()+=cutEnd, this->EndReading(), BeginWriting()+=cutStart);
SetLength(myLength-cutLength);
}
@ -715,12 +735,12 @@ basic_nsAWritableString<CharT>::do_ReplaceFromReadable( PRUint32 cutStart, PRUin
PRUint32 newLength = oldLength - cutLength + replacementLength;
if ( cutLength > replacementLength )
copy_string(this->BeginReading(cutEnd), this->EndReading(), BeginWriting(replacementEnd));
copy_string(this->BeginReading()+=cutEnd, this->EndReading(), BeginWriting()+=replacementEnd);
SetLength(newLength);
if ( cutLength < replacementLength )
copy_string_backward(this->BeginReading(cutEnd), this->BeginReading(oldLength), BeginWriting(replacementEnd));
copy_string_backward(this->BeginReading()+=cutEnd, this->BeginReading()+=oldLength, BeginWriting()+=replacementEnd);
copy_string(aReplacement.BeginReading(), aReplacement.EndReading(), BeginWriting(cutStart));
copy_string(aReplacement.BeginReading(), aReplacement.EndReading(), BeginWriting()+=cutStart);
}