thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Cleanup for the AssocArray template: int->book, put common code into a new lookup() method, and some other tweaks

Browse source 
svn-id: r21428
This commit is contained in:
Max Horn 2006-03-24 14:30:33 +00:00
parent 1805f42eea
commit ae0cf6e88d
1 changed files with 34 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

114
common/assocarray.h
View file

@ -100,33 +100,33 @@ struct aa_ref_t {
template <class Key, class Val> template <class Key, class Val>
class AssocArray { class AssocArray {
private: private:
aa_ref_t <Key, Val> **_arr; // hashtable of size arrsize. aa_ref_t<Key, Val> **_arr; // hashtable of size arrsize.
Val _default_value; Val _default_value;
int _arrsize, _nele; int _arrsize, _nele;
inline void expand_array(void); int lookup(const Key &index) const;
inline Val &subscript_helper(Key &index); // like [], but never expands array void expand_array(void);
inline int nele_val(void) const { return _nele; } int nele_val(void) const { return _nele; }
public: public:
inline Val &operator [](const Key &index); Val &operator [](const Key &index);
// inline AssocArray(Val default_value = Val()); // AssocArray(Val default_value = Val());
inline AssocArray(Val default_value); AssocArray(Val default_value);
inline ~AssocArray(); ~AssocArray();
inline int contains(const Key &index) const; bool contains(const Key &index) const;
inline Key *new_all_keys(void) const; Key *new_all_keys(void) const;
inline Val *new_all_values(void) const; Val *new_all_values(void) const;
inline Val queryVal(const Key &index) const; Val queryVal(const Key &index) const;
inline void clear(int shrinkArray = 0); void clear(bool shrinkArray = 0);
}; };
//------------------------------------------------------- //-------------------------------------------------------
// AssocArray functions // AssocArray functions
template <class Key, class Val> template <class Key, class Val>
inline int AssocArray <Key, Val>::contains(const Key &index) const { int AssocArray<Key, Val>::lookup(const Key &index) const {
int ctr; int ctr;
ctr = hashit(index, _arrsize); ctr = hashit(index, _arrsize);
@ -138,14 +138,18 @@ inline int AssocArray <Key, Val>::contains(const Key &index) const {
ctr = 0; ctr = 0;
} }
if (_arr[ctr] == NULL) return ctr;
return 0;
else
return 1;
} }
template <class Key, class Val> template <class Key, class Val>
inline Key *AssocArray <Key, Val>::new_all_keys(void) const { bool AssocArray<Key, Val>::contains(const Key &index) const {
int ctr = lookup(index);
return (_arr[ctr] != NULL);
}
template <class Key, class Val>
Key *AssocArray<Key, Val>::new_all_keys(void) const {
Key *all_keys; Key *all_keys;
int ctr, dex; int ctr, dex;
@ -171,7 +175,7 @@ inline Key *AssocArray <Key, Val>::new_all_keys(void) const {
} }
template <class Key, class Val> template <class Key, class Val>
inline Val *AssocArray <Key, Val>::new_all_values(void) const { Val *AssocArray<Key, Val>::new_all_values(void) const {
Val *all_values; Val *all_values;
int ctr, dex; int ctr, dex;
@ -198,7 +202,7 @@ inline Val *AssocArray <Key, Val>::new_all_values(void) const {
} }
template <class Key, class Val> template <class Key, class Val>
inline AssocArray <Key, Val>::AssocArray(Val default_value) : _default_value(default_value) { AssocArray<Key, Val>::AssocArray(Val default_value) : _default_value(default_value) {
int ctr; int ctr;
_arr = new aa_ref_t <Key, Val> *[INIT_SIZE]; _arr = new aa_ref_t <Key, Val> *[INIT_SIZE];
@ -213,7 +217,7 @@ inline AssocArray <Key, Val>::AssocArray(Val default_value) : _default_value(def
} }
template <class Key, class Val> template <class Key, class Val>
inline AssocArray <Key, Val>::~AssocArray() { AssocArray<Key, Val>::~AssocArray() {
int ctr; int ctr;
for (ctr = 0; ctr < _arrsize; ctr++) for (ctr = 0; ctr < _arrsize; ctr++)
@ -224,7 +228,7 @@ inline AssocArray <Key, Val>::~AssocArray() {
} }
template <class Key, class Val> template <class Key, class Val>
inline void AssocArray <Key, Val>::clear(int shrinkArray) { void AssocArray<Key, Val>::clear(bool shrinkArray) {
for (int ctr = 0; ctr < _arrsize; ctr++) { for (int ctr = 0; ctr < _arrsize; ctr++) {
if (_arr[ctr] != NULL) { if (_arr[ctr] != NULL) {
delete _arr[ctr]; delete _arr[ctr];
@ -232,7 +236,6 @@ inline void AssocArray <Key, Val>::clear(int shrinkArray) {
} }
} }
shrinkArray = 0;
if (shrinkArray && _arrsize > INIT_SIZE) { if (shrinkArray && _arrsize > INIT_SIZE) {
delete _arr; delete _arr;
@ -246,11 +249,8 @@ inline void AssocArray <Key, Val>::clear(int shrinkArray) {
_nele = 0; _nele = 0;
} }
static int is_odd(int x) {return x&1;}
static int is_even(int x) {return !is_odd(x);}
template <class Key, class Val> template <class Key, class Val>
inline void AssocArray <Key, Val>::expand_array(void) { void AssocArray<Key, Val>::expand_array(void) {
aa_ref_t <Key, Val> **old_arr; aa_ref_t <Key, Val> **old_arr;
int old_arrsize, old_nele, ctr, dex; int old_arrsize, old_nele, ctr, dex;
@ -262,8 +262,8 @@ inline void AssocArray <Key, Val>::expand_array(void) {
// allocate a new array // allocate a new array
_arrsize = 153 * old_arrsize / 100; _arrsize = 153 * old_arrsize / 100;
if (is_even(_arrsize)) // Ensure that _arrsize is odd.
_arrsize++; _arrsize |= 1;
_arr = new aa_ref_t <Key, Val> *[_arrsize]; _arr = new aa_ref_t <Key, Val> *[_arrsize];
@ -297,46 +297,9 @@ inline void AssocArray <Key, Val>::expand_array(void) {
return; return;
} }
// like [], but never expands array.
// Precond: index is a key that is already in the hash table.
template <class Key, class Val> template <class Key, class Val>
inline Val &AssocArray <Key, Val>::subscript_helper(Key &index) { Val &AssocArray<Key, Val>::operator [](const Key &index) {
int ctr; int ctr = lookup(index);
ctr = hashit(index, _arrsize);
while (_arr[ctr] != NULL && !data_eq(_arr[ctr]->index, index)) {
ctr++;
if (ctr == _arrsize)
ctr = 0;
}
// if (_arr[ctr] == NULL)
// {
// _arr[ctr] = new aa_ref_t<Val,Key>;
// _arr[ctr]->index = index;
// _arr[ctr]->dat = _default_value;
// _nele++;
// }
assert(_arr[ctr] != NULL);
return _arr[ctr]->dat;
}
template <class Key, class Val>
inline Val &AssocArray <Key, Val>::operator [](const Key &index) {
int ctr;
ctr = hashit(index, _arrsize);
while (_arr[ctr] != NULL && !data_eq(_arr[ctr]->index, index)) {
ctr++;
if (ctr == _arrsize)
ctr = 0;
}
if (_arr[ctr] == NULL) { if (_arr[ctr] == NULL) {
_arr[ctr] = new aa_ref_t <Key, Val>; _arr[ctr] = new aa_ref_t <Key, Val>;
@ -357,17 +320,8 @@ inline Val &AssocArray <Key, Val>::operator [](const Key &index) {
} }
template <class Key, class Val> template <class Key, class Val>
inline Val AssocArray <Key, Val>::queryVal(const Key &index) const { Val AssocArray<Key, Val>::queryVal(const Key &index) const {
int ctr; int ctr = lookup(index);
ctr = hashit(index, _arrsize);
while (_arr[ctr] != NULL && !data_eq(_arr[ctr]->index, index)) {
ctr++;
if (ctr == _arrsize)
ctr = 0;
}
if (_arr[ctr] == NULL) if (_arr[ctr] == NULL)
return _default_value; return _default_value;