зеркало из https://github.com/mozilla/pjs.git
Clean up ListIterator by removing unused flags and the almost-not-used reversed mode. Also add tx prefix to List and ListIterator classes and clean up whitespace.
Bug 85189. r=peterv, sr=scc
This commit is contained in:
sicking%bigfoot.com
Родитель
2310d96afe
Коммит
3cd7fc84ae
|
|
@ -20,9 +20,13 @@
|
|||
* Contributor(s):
|
||||
* Keith Visco, kvisco@ziplink.net
|
||||
* -- original author.
|
||||
*
|
||||
* Bob Miller, kbob@oblix.com
|
||||
* -- plugged core leak.
|
||||
*
|
||||
* Jonas Sicking, sicking@bigfoot.com
|
||||
* -- Cleanup/bugfix/features in Iterator
|
||||
* Added tx prefix to classnames
|
||||
*/
|
||||
|
||||
#include "List.h"
|
||||
|
|
@ -30,50 +34,51 @@
|
|||
#include <iostream.h>
|
||||
#endif
|
||||
|
||||
//--------------------------/
|
||||
//- Implementation of List -/
|
||||
//--------------------------/
|
||||
//----------------------------/
|
||||
//- Implementation of txList -/
|
||||
//----------------------------/
|
||||
|
||||
/**
|
||||
* Default constructor for a List;
|
||||
* Default constructor for a txList;
|
||||
* @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
|
||||
* @version $Revision: 1.10 $ $Date: 2001-06-26 14:08:06 $
|
||||
* @version $Revision: 1.11 $ $Date: 2001-07-02 23:40:20 $
|
||||
**/
|
||||
|
||||
List::List() {
|
||||
txList::txList() {
|
||||
firstItem = 0;
|
||||
lastItem = 0;
|
||||
itemCount = 0;
|
||||
} //-- List;
|
||||
} //-- txList;
|
||||
|
||||
/**
|
||||
* List destructor, cleans up List Items, but will not delete the Object
|
||||
* txList destructor, cleans up ListItems, but will not delete the Object
|
||||
* references
|
||||
*/
|
||||
List::~List() {
|
||||
txList::~txList() {
|
||||
ListItem* item = firstItem;
|
||||
while (item) {
|
||||
ListItem* tItem = item;
|
||||
item = item->nextItem;
|
||||
delete tItem;
|
||||
}
|
||||
} //-- ~List
|
||||
} //-- ~txList
|
||||
|
||||
void List::insert(int index, void* objPtr) {
|
||||
void txList::insert(int index, void* objPtr) {
|
||||
|
||||
if ( index >= itemCount ) {
|
||||
if (index >= itemCount) {
|
||||
insertBefore(objPtr, 0);
|
||||
}
|
||||
else {
|
||||
//-- add to middle of list
|
||||
ListItem* nextItem = firstItem;
|
||||
for ( int i = 0; i < index; i++ ) nextItem = nextItem->nextItem;
|
||||
for (int i = 0; i < index; i++)
|
||||
nextItem = nextItem->nextItem;
|
||||
insertBefore(objPtr, nextItem);
|
||||
}
|
||||
} //-- insert
|
||||
|
||||
void List::add(void* objPtr) {
|
||||
insert(itemCount, objPtr);
|
||||
void txList::add(void* objPtr) {
|
||||
insertBefore(objPtr, 0);
|
||||
} //-- add
|
||||
|
||||
/**
|
||||
|
|
@ -85,9 +90,10 @@ void List::add(void* objPtr) {
|
|||
* members) as it will need traverse the links each time
|
||||
* @return the object located at the given index
|
||||
**/
|
||||
void* List::get(int index) {
|
||||
void* txList::get(int index) {
|
||||
|
||||
if ((index < 0) || (index >= itemCount)) return 0;
|
||||
if (index < 0 || index >= itemCount)
|
||||
return 0;
|
||||
|
||||
int c = 0;
|
||||
ListItem* item = firstItem;
|
||||
|
|
@ -101,16 +107,16 @@ void* List::get(int index) {
|
|||
return 0;
|
||||
} //-- get(int)
|
||||
|
||||
List::ListItem* List::getFirstItem() {
|
||||
txList::ListItem* txList::getFirstItem() {
|
||||
return firstItem;
|
||||
} //-- getFirstItem
|
||||
|
||||
List::ListItem* List::getLastItem() {
|
||||
txList::ListItem* txList::getLastItem() {
|
||||
return lastItem;
|
||||
} //-- getLastItem
|
||||
|
||||
/**
|
||||
* Returns the number of items in this List
|
||||
* Returns the number of items in this txList
|
||||
**/
|
||||
PRInt32 List::getLength() {
|
||||
return itemCount;
|
||||
|
|
@ -120,24 +126,26 @@ PRInt32 List::getLength() {
|
|||
/**
|
||||
* Inserts the given Object pointer as the item just after refItem.
|
||||
* If refItem is a null pointer the Object will be inserted at the
|
||||
* beginning of the List (ie, insert after nothing).
|
||||
* beginning of the txList (ie, insert after nothing).
|
||||
* This method assumes refItem is a member of this list, and since this
|
||||
* is a private method, I feel that's a valid assumption
|
||||
**/
|
||||
void List::insertAfter(void* objPtr, ListItem* refItem) {
|
||||
void txList::insertAfter(void* objPtr, ListItem* refItem) {
|
||||
//-- if refItem == null insert at front
|
||||
if (!refItem) insertBefore(objPtr, firstItem);
|
||||
else insertBefore(objPtr, refItem->nextItem);
|
||||
if (!refItem)
|
||||
insertBefore(objPtr, firstItem);
|
||||
else
|
||||
insertBefore(objPtr, refItem->nextItem);
|
||||
} //-- insertAfter
|
||||
|
||||
/**
|
||||
* Inserts the given Object pointer as the item just before refItem.
|
||||
* If refItem is a null pointer the Object will be inserted at the
|
||||
* end of the List (ie, insert before nothing).
|
||||
* end of the txList (ie, insert before nothing).
|
||||
* This method assumes refItem is a member of this list, and since this
|
||||
* is a private method, I feel that's a valid assumption
|
||||
**/
|
||||
void List::insertBefore(void* objPtr, ListItem* refItem) {
|
||||
void txList::insertBefore(void* objPtr, ListItem* refItem) {
|
||||
|
||||
ListItem* item = new ListItem;
|
||||
if (!item)
|
||||
|
|
@ -150,12 +158,13 @@ void List::insertBefore(void* objPtr, ListItem* refItem) {
|
|||
//-- if refItem == null insert at end
|
||||
if (!refItem) {
|
||||
//-- add to back of list
|
||||
if ( lastItem ) {
|
||||
if (lastItem) {
|
||||
lastItem->nextItem = item;
|
||||
item->prevItem = lastItem;
|
||||
}
|
||||
lastItem = item;
|
||||
if ( !firstItem ) firstItem = item;
|
||||
if (!firstItem)
|
||||
firstItem = item;
|
||||
}
|
||||
else {
|
||||
//-- insert before given item
|
||||
|
|
@ -163,8 +172,10 @@ void List::insertBefore(void* objPtr, ListItem* refItem) {
|
|||
item->prevItem = refItem->prevItem;
|
||||
refItem->prevItem = item;
|
||||
|
||||
if (refItem == firstItem) firstItem = item;
|
||||
if (itemCount == 0) lastItem = item; // <-should we ever see this?
|
||||
if (item->prevItem)
|
||||
item->prevItem->nextItem = item;
|
||||
else
|
||||
firstItem = item;
|
||||
}
|
||||
|
||||
// increase the item count
|
||||
|
|
@ -172,13 +183,13 @@ void List::insertBefore(void* objPtr, ListItem* refItem) {
|
|||
} //-- insertBefore
|
||||
|
||||
/**
|
||||
* Returns a ListIterator for this List
|
||||
* Returns a txListIterator for this txList
|
||||
**/
|
||||
ListIterator* List::iterator() {
|
||||
return new ListIterator(this);
|
||||
txListIterator* txList::iterator() {
|
||||
return new txListIterator(this);
|
||||
}
|
||||
|
||||
void* List::remove(void* objPtr) {
|
||||
void* txList::remove(void* objPtr) {
|
||||
ListItem* item = firstItem;
|
||||
while (item) {
|
||||
if (item->objPtr == objPtr) {
|
||||
|
|
@ -192,79 +203,92 @@ void* List::remove(void* objPtr) {
|
|||
return 0;
|
||||
} //-- remove
|
||||
|
||||
List::ListItem* List::remove(ListItem* item) {
|
||||
txList::ListItem* txList::remove(ListItem* item) {
|
||||
|
||||
if ( !item ) return item;
|
||||
if (!item)
|
||||
return item;
|
||||
|
||||
//-- adjust the previous item's next pointer
|
||||
if (item->prevItem) {
|
||||
item->prevItem->nextItem = item->nextItem;
|
||||
}
|
||||
//-- adjust the next item's previous pointer
|
||||
if ( item->nextItem ) {
|
||||
if (item->nextItem) {
|
||||
item->nextItem->prevItem = item->prevItem;
|
||||
}
|
||||
|
||||
//-- adjust first and last items
|
||||
if (item == firstItem) firstItem = item->nextItem;
|
||||
if (item == lastItem) lastItem = item->prevItem;
|
||||
if (item == firstItem)
|
||||
firstItem = item->nextItem;
|
||||
if (item == lastItem)
|
||||
lastItem = item->prevItem;
|
||||
|
||||
//-- decrease Item count
|
||||
--itemCount;
|
||||
return item;
|
||||
} //-- remove
|
||||
|
||||
//----------------------------------/
|
||||
//- Implementation of ListIterator -/
|
||||
//----------------------------------/
|
||||
//------------------------------------/
|
||||
//- Implementation of txListIterator -/
|
||||
//------------------------------------/
|
||||
|
||||
|
||||
/**
|
||||
* Creates a new ListIterator for the given List
|
||||
* @param list, the List to create an Iterator for
|
||||
* Creates a new txListIterator for the given txList
|
||||
* @param list, the txList to create an Iterator for
|
||||
**/
|
||||
ListIterator::ListIterator(List* list) {
|
||||
txListIterator::txListIterator(txList* list) {
|
||||
this->list = list;
|
||||
currentItem = 0;
|
||||
allowRemove = MB_FALSE;
|
||||
moveForward = MB_TRUE;
|
||||
done = MB_FALSE;
|
||||
count = 0;
|
||||
} //-- ListIterator
|
||||
atEndOfList = MB_FALSE;
|
||||
} //-- txListIterator
|
||||
|
||||
ListIterator::~ListIterator() {
|
||||
txListIterator::~txListIterator() {
|
||||
//-- overrides default destructor to do nothing
|
||||
} //-- ~ListIterator
|
||||
} //-- ~txListIterator
|
||||
|
||||
/**
|
||||
* Adds the Object pointer to the List pointed to by this ListIterator.
|
||||
* The Object pointer is inserted as the next item in the List
|
||||
* based on the current position within the List
|
||||
* Adds the Object pointer to the txList pointed to by this txListIterator.
|
||||
* The Object pointer is inserted as the next item in the txList
|
||||
* based on the current position within the txList
|
||||
* @param objPtr the Object pointer to add to the list
|
||||
**/
|
||||
void ListIterator::add(void* objPtr) {
|
||||
void txListIterator::addAfter(void* objPtr) {
|
||||
|
||||
list->insertAfter(objPtr,currentItem);
|
||||
allowRemove = MB_FALSE;
|
||||
if (currentItem || !atEndOfList)
|
||||
list->insertAfter(objPtr, currentItem);
|
||||
else
|
||||
list->insertBefore(objPtr, 0);
|
||||
|
||||
} //-- add
|
||||
} //-- addAfter
|
||||
|
||||
/**
|
||||
* Adds the Object pointer to the txList pointed to by this txListIterator.
|
||||
* The Object pointer is inserted as the previous item in the txList
|
||||
* based on the current position within the txList
|
||||
* @param objPtr the Object pointer to add to the list
|
||||
**/
|
||||
void txListIterator::addBefore(void* objPtr) {
|
||||
|
||||
if (currentItem || atEndOfList)
|
||||
list->insertBefore(objPtr, currentItem);
|
||||
else
|
||||
list->insertAfter(objPtr, 0);
|
||||
|
||||
} //-- addBefore
|
||||
|
||||
/**
|
||||
* Returns true if a sucessful call to the next() method can be made
|
||||
* @return MB_TRUE if a sucessful call to the next() method can be made,
|
||||
* otherwise MB_FALSE
|
||||
**/
|
||||
MBool ListIterator::hasNext() {
|
||||
MBool txListIterator::hasNext() {
|
||||
MBool hasNext = MB_FALSE;
|
||||
if ( done ) return hasNext;
|
||||
else if ( currentItem ) {
|
||||
if (moveForward) hasNext = (MBool) currentItem->nextItem;
|
||||
else hasNext = (MBool)currentItem->prevItem;
|
||||
}
|
||||
else {
|
||||
if (moveForward) hasNext = (MBool) list->firstItem;
|
||||
else hasNext = (MBool) list->lastItem;
|
||||
}
|
||||
if (currentItem)
|
||||
hasNext = (MBool) currentItem->nextItem;
|
||||
else if (!atEndOfList)
|
||||
hasNext = (MBool) list->firstItem;
|
||||
|
||||
return hasNext;
|
||||
} //-- hasNext
|
||||
|
||||
|
|
@ -273,37 +297,31 @@ MBool ListIterator::hasNext() {
|
|||
* @return MB_TRUE if a sucessful call to the previous() method can be made,
|
||||
* otherwise MB_FALSE
|
||||
**/
|
||||
MBool ListIterator::hasPrevious() {
|
||||
MBool hasPrevious = MB_FALSE;
|
||||
if (currentItem) {
|
||||
if (moveForward) hasPrevious = (MBool)(currentItem->prevItem);
|
||||
else hasPrevious = (MBool) (currentItem->nextItem);
|
||||
}
|
||||
return hasPrevious;
|
||||
MBool txListIterator::hasPrevious() {
|
||||
MBool hasPrevious = MB_FALSE;
|
||||
if (currentItem)
|
||||
hasPrevious = (MBool) currentItem->prevItem;
|
||||
else if (atEndOfList)
|
||||
hasPrevious = (MBool) list->lastItem;
|
||||
|
||||
return hasPrevious;
|
||||
} //-- hasPrevious
|
||||
|
||||
/**
|
||||
* Returns the next Object pointer in the list
|
||||
**/
|
||||
void* ListIterator::next() {
|
||||
void* txListIterator::next() {
|
||||
|
||||
void* obj = 0;
|
||||
if ( done ) return obj;
|
||||
if (currentItem)
|
||||
currentItem = currentItem->nextItem;
|
||||
else if (!atEndOfList)
|
||||
currentItem = list->firstItem;
|
||||
|
||||
if (currentItem) {
|
||||
if ( moveForward ) currentItem = currentItem->nextItem;
|
||||
else currentItem = currentItem->prevItem;
|
||||
}
|
||||
else {
|
||||
if ( moveForward ) currentItem = list->firstItem;
|
||||
else currentItem = list->lastItem;
|
||||
}
|
||||
|
||||
if ( currentItem ) {
|
||||
if (currentItem)
|
||||
obj = currentItem->objPtr;
|
||||
allowRemove = MB_TRUE;
|
||||
}
|
||||
else done = MB_TRUE;
|
||||
else
|
||||
atEndOfList = MB_TRUE;
|
||||
|
||||
return obj;
|
||||
} //-- next
|
||||
|
|
@ -311,31 +329,70 @@ void* ListIterator::next() {
|
|||
/**
|
||||
* Returns the previous Object in the list
|
||||
**/
|
||||
void* ListIterator::previous() {
|
||||
void* txListIterator::previous() {
|
||||
|
||||
void* obj = 0;
|
||||
|
||||
if (currentItem) {
|
||||
if ( moveForward ) currentItem = currentItem->prevItem;
|
||||
else currentItem = currentItem->nextItem;
|
||||
if ( currentItem ) obj = currentItem->objPtr;
|
||||
}
|
||||
if (currentItem)
|
||||
currentItem = currentItem->prevItem;
|
||||
else if (atEndOfList)
|
||||
currentItem = list->lastItem;
|
||||
|
||||
if (currentItem)
|
||||
obj = currentItem->objPtr;
|
||||
|
||||
atEndOfList = MB_FALSE;
|
||||
|
||||
return obj;
|
||||
} //-- previous
|
||||
|
||||
/**
|
||||
* Returns the current Object
|
||||
**/
|
||||
void* txListIterator::current() {
|
||||
|
||||
if (currentItem)
|
||||
return currentItem->objPtr;
|
||||
|
||||
return 0;
|
||||
} //-- current
|
||||
|
||||
/**
|
||||
* Moves the specified number of steps
|
||||
**/
|
||||
void* txListIterator::advance(int i) {
|
||||
|
||||
void* obj = 0;
|
||||
|
||||
if (i > 0) {
|
||||
for (; currentItem && i > 0; i--)
|
||||
currentItem = currentItem->nextItem;
|
||||
|
||||
atEndOfList = currentItem == 0;
|
||||
}
|
||||
else {
|
||||
for (; currentItem && i < 0; i++)
|
||||
currentItem = currentItem->prevItem;
|
||||
|
||||
atEndOfList = MB_FALSE;
|
||||
}
|
||||
|
||||
if (currentItem)
|
||||
obj = currentItem->objPtr;
|
||||
|
||||
return obj;
|
||||
} //-- advance
|
||||
|
||||
/**
|
||||
* Removes the Object last returned by the next() or previous() methods;
|
||||
* @return the removed Object pointer
|
||||
**/
|
||||
void* ListIterator::remove() {
|
||||
|
||||
if (!allowRemove) return 0;
|
||||
allowRemove = MB_FALSE;
|
||||
void* txListIterator::remove() {
|
||||
|
||||
void* obj = 0;
|
||||
if (currentItem) {
|
||||
obj = currentItem->objPtr;
|
||||
List::ListItem* item = currentItem;
|
||||
txList::ListItem* item = currentItem;
|
||||
previous(); //-- make previous item the current item
|
||||
list->remove(item);
|
||||
delete item;
|
||||
|
|
@ -344,17 +401,17 @@ void* ListIterator::remove() {
|
|||
} //-- remove
|
||||
|
||||
/**
|
||||
* Resets the current location within the List to the beginning of the List
|
||||
* Resets the current location within the txList to the beginning of the txList
|
||||
**/
|
||||
void ListIterator::reset() {
|
||||
done = MB_FALSE;
|
||||
void txListIterator::reset() {
|
||||
atEndOfList = MB_FALSE;
|
||||
currentItem = 0;
|
||||
} //-- reset
|
||||
|
||||
/**
|
||||
* sets this iterator to operate in the reverse direction
|
||||
* Move the iterator to right after the last element
|
||||
**/
|
||||
void ListIterator::reverse() {
|
||||
moveForward = (MBool)(!moveForward);
|
||||
} //-- reverse
|
||||
|
||||
void txListIterator::resetToEnd() {
|
||||
atEndOfList = MB_TRUE;
|
||||
currentItem = 0;
|
||||
} //-- moveToEnd
|
||||
|
|
|
|||
|
|
@ -21,7 +21,11 @@
|
|||
* Keith Visco, kvisco@ziplink.net
|
||||
* -- original author.
|
||||
*
|
||||
* $Id: List.h,v 1.8 2001-06-26 14:08:12 peterv%netscape.com Exp $
|
||||
* Jonas Sicking, sicking@bigfoot.com
|
||||
* -- Cleanup/bugfix/features in Iterator
|
||||
* Added tx prefix to classnames
|
||||
*
|
||||
* $Id: List.h,v 1.9 2001-07-02 23:40:20 sicking%bigfoot.com Exp $
|
||||
*/
|
||||
|
||||
#ifndef TRANSFRMX_LIST_H
|
||||
|
|
@ -32,21 +36,21 @@
|
|||
/**
|
||||
* Represents an ordered list of Object pointers. Modeled after a Java 2 List.
|
||||
**/
|
||||
class List {
|
||||
class txList {
|
||||
|
||||
friend class ListIterator;
|
||||
friend class txListIterator;
|
||||
|
||||
public:
|
||||
|
||||
/**
|
||||
* Creates an empty List
|
||||
* Creates an empty txList
|
||||
**/
|
||||
List();
|
||||
txList();
|
||||
|
||||
/**
|
||||
* List destructor, object references will not be deleted.
|
||||
* txList destructor, object references will not be deleted.
|
||||
**/
|
||||
virtual ~List();
|
||||
virtual ~txList();
|
||||
|
||||
/**
|
||||
* Returns the object located at the given index. This may
|
||||
|
|
@ -56,14 +60,14 @@ public:
|
|||
void* get(int index);
|
||||
|
||||
/**
|
||||
* Returns the number of items in this List
|
||||
* Returns the number of items in this txList
|
||||
**/
|
||||
PRInt32 getLength();
|
||||
|
||||
/**
|
||||
* Returns a ListIterator for this List
|
||||
* Returns a txListIterator for this txList
|
||||
**/
|
||||
ListIterator* iterator();
|
||||
txListIterator* iterator();
|
||||
|
||||
/**
|
||||
* Adds the given Object to the specified position in the list
|
||||
|
|
@ -111,33 +115,42 @@ private:
|
|||
|
||||
|
||||
/**
|
||||
* An Iterator for the List Class
|
||||
* An Iterator for the txList Class
|
||||
* @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
|
||||
**/
|
||||
class ListIterator {
|
||||
class txListIterator {
|
||||
|
||||
public:
|
||||
|
||||
|
||||
/**
|
||||
* Creates a new ListIterator for the given List
|
||||
* @param list, the List to create an Iterator for
|
||||
* Creates a new txListIterator for the given txList
|
||||
* @param list, the txList to create an Iterator for
|
||||
**/
|
||||
ListIterator(List* list);
|
||||
txListIterator(txList* list);
|
||||
|
||||
/**
|
||||
* Destructor, destroys a given instance of a ListIterator
|
||||
* Destructor, destroys a given instance of a txListIterator
|
||||
**/
|
||||
virtual ~ListIterator();
|
||||
virtual ~txListIterator();
|
||||
|
||||
/**
|
||||
* Adds the Object pointer to the List pointed to by this ListIterator.
|
||||
* The Object pointer is inserted as the next item in the List
|
||||
* based on the current position within the List
|
||||
* Adds the Object pointer to the txList pointed to by this txListIterator.
|
||||
* The Object pointer is inserted as the next item in the txList
|
||||
* based on the current position within the txList
|
||||
* @param objPtr the Object pointer to add to the list
|
||||
**/
|
||||
|
||||
virtual void add(void* objPtr);
|
||||
virtual void addAfter(void* objPtr);
|
||||
|
||||
/**
|
||||
* Adds the Object pointer to the txList pointed to by this txListIterator.
|
||||
* The Object pointer is inserted as the previous item in the txList
|
||||
* based on the current position within the txList
|
||||
* @param objPtr the Object pointer to add to the list
|
||||
**/
|
||||
|
||||
virtual void addBefore(void* objPtr);
|
||||
|
||||
/**
|
||||
* Returns true if a sucessful call to the next() method can be made
|
||||
|
|
@ -162,6 +175,16 @@ public:
|
|||
* Returns the previous Object pointer from the list
|
||||
**/
|
||||
virtual void* previous();
|
||||
|
||||
/**
|
||||
* Returns the current Object
|
||||
**/
|
||||
virtual void* current();
|
||||
|
||||
/**
|
||||
* Moves the specified number of steps
|
||||
**/
|
||||
virtual void* advance(int i);
|
||||
|
||||
/**
|
||||
* Removes the Object last returned by the next() or previous() methods;
|
||||
|
|
@ -170,30 +193,28 @@ public:
|
|||
virtual void* remove();
|
||||
|
||||
/**
|
||||
* Resets the current location within the List to the beginning of the List
|
||||
* Resets the current location within the txList to the beginning of the txList
|
||||
**/
|
||||
virtual void reset();
|
||||
|
||||
/**
|
||||
* sets this iterator to operate in the reverse direction
|
||||
* Resets the current location within the txList to the end of the txList
|
||||
**/
|
||||
void reverse();
|
||||
virtual void resetToEnd();
|
||||
|
||||
private:
|
||||
|
||||
int count;
|
||||
//-- points to the current list item
|
||||
List::ListItem* currentItem;
|
||||
txList::ListItem* currentItem;
|
||||
|
||||
//-- points to the list to iterator over
|
||||
List* list;
|
||||
txList* list;
|
||||
|
||||
//-- determins if we can remove the current item from the list
|
||||
MBool allowRemove;
|
||||
|
||||
MBool done;
|
||||
|
||||
MBool moveForward;
|
||||
//-- we've moved off the end of the list
|
||||
MBool atEndOfList;
|
||||
};
|
||||
|
||||
typedef txList List;
|
||||
typedef txListIterator ListIterator;
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -24,13 +24,13 @@
|
|||
* -- 19990806
|
||||
* - In method ::peek() changed ListItem::ListItem to List::ListItem
|
||||
*
|
||||
* $Id: Stack.cpp,v 1.2 1999-11-15 07:12:41 nisheeth%netscape.com Exp $
|
||||
* $Id: Stack.cpp,v 1.3 2001-07-02 23:40:21 sicking%bigfoot.com Exp $
|
||||
*/
|
||||
|
||||
/**
|
||||
* Stack
|
||||
* @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
|
||||
* @version $Revision: 1.2 $ $Date: 1999-11-15 07:12:41 $
|
||||
* @version $Revision: 1.3 $ $Date: 2001-07-02 23:40:21 $
|
||||
**/
|
||||
|
||||
#include "Stack.h"
|
||||
|
|
@ -59,9 +59,7 @@ Stack::~Stack() {
|
|||
* You will need to delete this Iterator when you are done
|
||||
**/
|
||||
StackIterator* Stack::iterator() {
|
||||
StackIterator* iter = (StackIterator*)List::iterator();
|
||||
iter->reverse();
|
||||
return iter;
|
||||
return (StackIterator*)List::iterator();
|
||||
} //-- iterator
|
||||
|
||||
/**
|
||||
|
|
@ -71,7 +69,7 @@ StackIterator* Stack::iterator() {
|
|||
**/
|
||||
void* Stack::peek() {
|
||||
void* obj = 0;
|
||||
List::ListItem* item = getLastItem();
|
||||
List::ListItem* item = getFirstItem();
|
||||
if ( item ) obj = item->objPtr;
|
||||
return obj;
|
||||
} //-- peek
|
||||
|
|
@ -82,7 +80,7 @@ void* Stack::peek() {
|
|||
* top of this Stack
|
||||
**/
|
||||
void Stack::push(void* obj) {
|
||||
add(obj);
|
||||
insert(0,obj);
|
||||
} //-- push
|
||||
|
||||
/**
|
||||
|
|
@ -91,7 +89,7 @@ void Stack::push(void* obj) {
|
|||
**/
|
||||
void* Stack::pop() {
|
||||
void* obj = 0;
|
||||
ListItem* item = getLastItem();
|
||||
ListItem* item = getFirstItem();
|
||||
if ( item ) obj = item->objPtr;
|
||||
item = remove(item);
|
||||
item->objPtr = 0;
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
* - foo//bar would not match properly if there was more than
|
||||
* one node in the NodeSet (nodes) on the final iteration
|
||||
*
|
||||
* $Id: PathExpr.cpp,v 1.9 2001-07-02 20:11:01 sicking%bigfoot.com Exp $
|
||||
* $Id: PathExpr.cpp,v 1.10 2001-07-02 23:40:23 sicking%bigfoot.com Exp $
|
||||
*/
|
||||
|
||||
#include "Expr.h"
|
||||
|
|
@ -257,11 +257,11 @@ MBool PathExpr::matches(Node* node, Node* context, ContextState* cs)
|
|||
nodes.add(node);
|
||||
|
||||
ListIterator* iter = expressions.iterator();
|
||||
iter->reverse();
|
||||
iter->resetToEnd();
|
||||
|
||||
while (iter->hasNext()) {
|
||||
while (iter->hasPrevious()) {
|
||||
|
||||
PathExprItem* pxi = (PathExprItem*)iter->next();
|
||||
PathExprItem* pxi = (PathExprItem*)iter->previous();
|
||||
|
||||
for (int i = 0; i < nodes.size(); i++) {
|
||||
Node* tnode = nodes.get(i);
|
||||
|
|
@ -282,7 +282,7 @@ MBool PathExpr::matches(Node* node, Node* context, ContextState* cs)
|
|||
Node* parent = cs->getParentNode(tnode);
|
||||
if (parent) {
|
||||
//-- make sure we have a document node if necessary
|
||||
if (!iter->hasNext())
|
||||
if (!iter->hasPrevious())
|
||||
if (parent->getNodeType() != Node::DOCUMENT_NODE)
|
||||
break;
|
||||
if (pxi->expr->matches(tnode, parent, cs))
|
||||
|
|
@ -291,7 +291,7 @@ MBool PathExpr::matches(Node* node, Node* context, ContextState* cs)
|
|||
break;
|
||||
}
|
||||
default:
|
||||
if (!iter->hasNext()) {
|
||||
if (!iter->hasPrevious()) {
|
||||
/*
|
||||
// PREVIOUS // result = pxi->expr->matches(tnode, context, cs);
|
||||
// result was being overwritten if there was more than one
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче