Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-30 00:01:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed bug in deque::pushfront

Browse Source
This commit is contained in:
rickg%netscape.com 1999-03-31 08:42:06 +00:00
parent f90a6f5450
commit 3554b4a46a
4 changed files with 84 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
base/src/nsDeque.cpp
View File

@ -100,6 +100,35 @@ nsDeque& nsDeque::Erase() {
}
/**
* This method adds an item to the end of the deque.
* This operation has the potential to cause the
* underlying buffer to resize.
*
* @update gess4/18/98
* @param anItem: new item to be added to deque
* @return nada
*/
nsDeque& nsDeque::GrowCapacity(void) {
void** temp=new void*[mCapacity+eGrowthDelta];
//Here's the interesting part: You can't just move the elements
//directy (in situ) from the old buffer to the new one.
//Since capacity has changed, the old origin doesn't make
//sense anymore. It's better to resequence the elements now.
int tempi=0;
int i=0;
int j=0;
for(i=mOrigin;i<mCapacity;i++) temp[tempi++]=mData[i]; //copy the leading elements...
for(j=0;j<mOrigin;j++) temp[tempi++]=mData[j]; //copy the trailing elements...
mCapacity+=eGrowthDelta;
mOrigin=0; //now realign the origin...
delete[]mData;
mData=temp;
return *this;
}
/**
* This method adds an item to the end of the deque.
* This operation has the potential to cause the
@ -111,22 +140,7 @@ nsDeque& nsDeque::Erase() {
*/
nsDeque& nsDeque::Push(void* anItem) {
if(mSize==mCapacity) {
void** temp=new void*[mCapacity+eGrowthDelta];
//Here's the interesting part: You can't just move the elements
//directy (in situ) from the old buffer to the new one.
//Since capacity has changed, the old origin doesn't make
//sense anymore. It's better to resequence the elements now.
int tempi=0;
int i=0;
int j=0;
for(i=mOrigin;i<mCapacity;i++) temp[tempi++]=mData[i]; //copy the leading elements...
for(j=0;j<mOrigin;j++) temp[tempi++]=mData[j]; //copy the trailing elements...
mCapacity+=eGrowthDelta;
mOrigin=0; //now realign the origin...
delete[]mData;
mData=temp;
GrowCapacity();
}
int offset=mOrigin+mSize;
if(offset<mCapacity)
@ -136,7 +150,6 @@ nsDeque& nsDeque::Push(void* anItem) {
return *this;
}
/**
* This method adds an item to the front of the deque.
* This operation has the potential to cause the
@ -147,14 +160,16 @@ nsDeque& nsDeque::Push(void* anItem) {
* @return nada
*/
nsDeque& nsDeque::PushFront(void* anItem) {
if(mOrigin>0) {
mOrigin-=1;
mData[mOrigin]=anItem;
mSize++;
if(mSize==mCapacity) {
GrowCapacity();
}
else {
Push(anItem);
mOrigin=mSize-1;
if(0==mOrigin){ //case1: [xxx..]
mOrigin=mCapacity-mSize++;
mData[mOrigin]=anItem;
}
else if(mCapacity==(mOrigin+mSize-1)){ //case2: [..xxx] and case3: [.xxx.]
mData[--mOrigin]=anItem;
mSize++;
}
return *this;
}

3
base/src/nsDeque.h
View File

@ -252,6 +252,8 @@ private:
*/
nsDeque& operator=(const nsDeque& anOther);
nsDeque& GrowCapacity(void);
};
/******************************************************
@ -400,6 +402,7 @@ public:
const void* FirstThat(nsDequeFunctor& aFunctor) const;
protected:
PRInt32 mIndex;
const nsDeque& mDeque;
};

63
xpcom/ds/nsDeque.cpp
View File

@ -100,6 +100,35 @@ nsDeque& nsDeque::Erase() {
}
/**
* This method adds an item to the end of the deque.
* This operation has the potential to cause the
* underlying buffer to resize.
*
* @update gess4/18/98
* @param anItem: new item to be added to deque
* @return nada
*/
nsDeque& nsDeque::GrowCapacity(void) {
void** temp=new void*[mCapacity+eGrowthDelta];
//Here's the interesting part: You can't just move the elements
//directy (in situ) from the old buffer to the new one.
//Since capacity has changed, the old origin doesn't make
//sense anymore. It's better to resequence the elements now.
int tempi=0;
int i=0;
int j=0;
for(i=mOrigin;i<mCapacity;i++) temp[tempi++]=mData[i]; //copy the leading elements...
for(j=0;j<mOrigin;j++) temp[tempi++]=mData[j]; //copy the trailing elements...
mCapacity+=eGrowthDelta;
mOrigin=0; //now realign the origin...
delete[]mData;
mData=temp;
return *this;
}
/**
* This method adds an item to the end of the deque.
* This operation has the potential to cause the
@ -111,22 +140,7 @@ nsDeque& nsDeque::Erase() {
*/
nsDeque& nsDeque::Push(void* anItem) {
if(mSize==mCapacity) {
void** temp=new void*[mCapacity+eGrowthDelta];
//Here's the interesting part: You can't just move the elements
//directy (in situ) from the old buffer to the new one.
//Since capacity has changed, the old origin doesn't make
//sense anymore. It's better to resequence the elements now.
int tempi=0;
int i=0;
int j=0;
for(i=mOrigin;i<mCapacity;i++) temp[tempi++]=mData[i]; //copy the leading elements...
for(j=0;j<mOrigin;j++) temp[tempi++]=mData[j]; //copy the trailing elements...
mCapacity+=eGrowthDelta;
mOrigin=0; //now realign the origin...
delete[]mData;
mData=temp;
GrowCapacity();
}
int offset=mOrigin+mSize;
if(offset<mCapacity)
@ -136,7 +150,6 @@ nsDeque& nsDeque::Push(void* anItem) {
return *this;
}
/**
* This method adds an item to the front of the deque.
* This operation has the potential to cause the
@ -147,14 +160,16 @@ nsDeque& nsDeque::Push(void* anItem) {
* @return nada
*/
nsDeque& nsDeque::PushFront(void* anItem) {
if(mOrigin>0) {
mOrigin-=1;
mData[mOrigin]=anItem;
mSize++;
if(mSize==mCapacity) {
GrowCapacity();
}
else {
Push(anItem);
mOrigin=mSize-1;
if(0==mOrigin){ //case1: [xxx..]
mOrigin=mCapacity-mSize++;
mData[mOrigin]=anItem;
}
else if(mCapacity==(mOrigin+mSize-1)){ //case2: [..xxx] and case3: [.xxx.]
mData[--mOrigin]=anItem;
mSize++;
}
return *this;
}

3
xpcom/ds/nsDeque.h
View File

@ -252,6 +252,8 @@ private:
*/
nsDeque& operator=(const nsDeque& anOther);
nsDeque& GrowCapacity(void);
};
/******************************************************
@ -400,6 +402,7 @@ public:
const void* FirstThat(nsDequeFunctor& aFunctor) const;
protected:
PRInt32 mIndex;
const nsDeque& mDeque;
};