X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bcaa23de098c1276b3f35716c9ea8b73cf3599bd..64ea838d8f4d1853b7d850db93ee565e901d099a:/src/common/hash.cpp diff --git a/src/common/hash.cpp b/src/common/hash.cpp index ef635a1be1..8c7049b6b4 100644 --- a/src/common/hash.cpp +++ b/src/common/hash.cpp @@ -1,11 +1,11 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: hash.cpp +// Name: src/common/hash.cpp // Purpose: wxHashTable implementation // Author: Julian Smart // Modified by: VZ at 25.02.00: type safe hashes with WX_DECLARE_HASH() // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) Julian Smart and Markus Holzem +// Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -17,485 +17,367 @@ // headers // ---------------------------------------------------------------------------- -#ifdef __GNUG__ -#pragma implementation "hash.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #ifndef WX_PRECOMP -#include "wx/list.h" + #include "wx/hash.h" + #include "wx/object.h" #endif -#include "wx/hash.h" - -#include -#include +wxHashTableBase_Node::wxHashTableBase_Node( long key, void* value, + wxHashTableBase* table ) + : m_value( value ), m_hashPtr( table ) +{ + m_key.integer = key; +} -// ---------------------------------------------------------------------------- -// wxWin macros -// ---------------------------------------------------------------------------- +wxHashTableBase_Node::wxHashTableBase_Node( const wxString& key, void* value, + wxHashTableBase* table ) + : m_value( value ), m_hashPtr( table ) +{ + m_key.string = new wxString(key); +} -IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject) +wxHashTableBase_Node::~wxHashTableBase_Node() +{ + if( m_hashPtr ) m_hashPtr->DoRemoveNode( this ); +} -// ============================================================================ -// implementation -// ============================================================================ - -// ---------------------------------------------------------------------------- -// wxHashTablleBase for working with "void *" data -// ---------------------------------------------------------------------------- +// wxHashTableBase::wxHashTableBase() + : m_size( 0 ), m_count( 0 ), m_table( NULL ), m_keyType( wxKEY_NONE ), + m_deleteContents( false ) { - m_deleteContents = FALSE; - m_hashTable = (wxListBase **)NULL; - m_hashSize = 0; - m_count = 0; - m_keyType = wxKEY_NONE; } -void wxHashTableBase::Create(wxKeyType keyType, size_t size) +void wxHashTableBase::Create( wxKeyType keyType, size_t size ) { - Destroy(); - - m_hashSize = size; m_keyType = keyType; - m_hashTable = new wxListBase *[size]; - for ( size_t n = 0; n < m_hashSize; n++ ) - { - m_hashTable[n] = (wxListBase *) NULL; - } + m_size = size; + m_table = new wxHashTableBase_Node*[ m_size ]; + + for( size_t i = 0; i < m_size; ++i ) + m_table[i] = NULL; } -void wxHashTableBase::Destroy() +void wxHashTableBase::Clear() { - if ( m_hashTable ) + for( size_t i = 0; i < m_size; ++i ) { - for ( size_t n = 0; n < m_hashSize; n++ ) - { - delete m_hashTable[n]; - } - - delete [] m_hashTable; + Node* end = m_table[i]; - m_hashTable = (wxListBase **)NULL; + if( end == NULL ) + continue; - m_count = 0; - } -} + Node *curr, *next = end->GetNext(); -void wxHashTableBase::DeleteContents(bool flag) -{ - m_deleteContents = flag; - for ( size_t n = 0; n < m_hashSize; n++ ) - { - if ( m_hashTable[n] ) + do { - m_hashTable[n]->DeleteContents(flag); + curr = next; + next = curr->GetNext(); + + DoDestroyNode( curr ); + + delete curr; } + while( curr != end ); + + m_table[i] = NULL; } + + m_count = 0; } -wxNodeBase *wxHashTableBase::GetNode(long key, long value) const +void wxHashTableBase::DoRemoveNode( wxHashTableBase_Node* node ) { - size_t slot = (size_t)abs(key % m_hashSize); + size_t bucket = ( m_keyType == wxKEY_INTEGER ? + node->m_key.integer : + MakeKey( *node->m_key.string ) ) % m_size; - wxNodeBase *node; - if ( m_hashTable[slot] ) + if( node->GetNext() == node ) { - node = m_hashTable[slot]->Find(wxListKey(value)); + // single-node chain (common case) + m_table[bucket] = NULL; } else { - node = (wxNodeBase *)NULL; - } + Node *start = m_table[bucket], *curr; + Node* prev = start; - return node; -} + for( curr = prev->GetNext(); curr != node; + prev = curr, curr = curr->GetNext() ) ; -// ---------------------------------------------------------------------------- -// old not type safe wxHashTable -// ---------------------------------------------------------------------------- + DoUnlinkNode( bucket, node, prev ); + } -wxHashTable::wxHashTable (int the_key_type, int size) -{ - n = 0; - hash_table = (wxList**) NULL; - Create(the_key_type, size); - m_count = 0; - m_deleteContents = FALSE; -/* - n = size; - current_position = -1; - current_node = (wxNode *) NULL; - - key_type = the_key_type; - hash_table = new wxList *[size]; - int i; - for (i = 0; i < size; i++) - hash_table[i] = (wxList *) NULL; -*/ + DoDestroyNode( node ); } -wxHashTable::~wxHashTable () +void wxHashTableBase::DoDestroyNode( wxHashTableBase_Node* node ) { - Destroy(); + // if it is called from DoRemoveNode, node has already been + // removed, from other places it does not matter + node->m_hashPtr = NULL; + + if( m_keyType == wxKEY_STRING ) + delete node->m_key.string; + if( m_deleteContents ) + DoDeleteContents( node ); } -void wxHashTable::Destroy() +void wxHashTableBase::Destroy() { - if (!hash_table) return; - int i; - for (i = 0; i < n; i++) - if (hash_table[i]) - delete hash_table[i]; - delete[] hash_table; - hash_table = NULL; -} + Clear(); -bool wxHashTable::Create(int the_key_type, int size) -{ - Destroy(); - - n = size; - current_position = -1; - current_node = (wxNode *) NULL; - - key_type = the_key_type; - hash_table = new wxList *[size]; - int i; - for (i = 0; i < size; i++) - hash_table[i] = (wxList *) NULL; - return TRUE; + wxDELETEA(m_table); + m_size = 0; } - -void wxHashTable::DoCopy(const wxHashTable& table) +void wxHashTableBase::DoInsertNode( size_t bucket, wxHashTableBase_Node* node ) { - n = table.n; - current_position = table.current_position; - current_node = NULL; // doesn't matter - Next() will reconstruct it - key_type = table.key_type; - - hash_table = new wxList *[n]; - for (int i = 0; i < n; i++) { - if (table.hash_table[i] == NULL) - hash_table[i] = NULL; - else { - hash_table[i] = new wxList(key_type); - *(hash_table[i]) = *(table.hash_table[i]); + if( m_table[bucket] == NULL ) + { + m_table[bucket] = node->m_next = node; } - } -} - -void wxHashTable::Put (long key, long value, wxObject * object) -{ - // Should NEVER be - long k = (long) key; - - int position = (int) (k % n); - if (position < 0) position = -position; + else + { + Node *prev = m_table[bucket]; + Node *next = prev->m_next; - if (!hash_table[position]) - { - hash_table[position] = new wxList (wxKEY_INTEGER); - if (m_deleteContents) hash_table[position]->DeleteContents(TRUE); - } + prev->m_next = node; + node->m_next = next; + m_table[bucket] = node; + } - hash_table[position]->Append (value, object); - m_count++; + ++m_count; } -void wxHashTable::Put (long key, const wxChar *value, wxObject * object) +void wxHashTableBase::DoPut( long key, long hash, void* data ) { - // Should NEVER be - long k = (long) key; - - int position = (int) (k % n); - if (position < 0) position = -position; + wxASSERT( m_keyType == wxKEY_INTEGER ); - if (!hash_table[position]) - { - hash_table[position] = new wxList (wxKEY_INTEGER); - if (m_deleteContents) hash_table[position]->DeleteContents(TRUE); - } + size_t bucket = size_t(hash) % m_size; + Node* node = new wxHashTableBase_Node( key, data, this ); - hash_table[position]->Append (value, object); - m_count++; + DoInsertNode( bucket, node ); } -void wxHashTable::Put (long key, wxObject * object) +void wxHashTableBase::DoPut( const wxString& key, long hash, void* data ) { - // Should NEVER be - long k = (long) key; + wxASSERT( m_keyType == wxKEY_STRING ); - int position = (int) (k % n); - if (position < 0) position = -position; + size_t bucket = size_t(hash) % m_size; + Node* node = new wxHashTableBase_Node( key, data, this ); - if (!hash_table[position]) - { - hash_table[position] = new wxList (wxKEY_INTEGER); - if (m_deleteContents) hash_table[position]->DeleteContents(TRUE); - } - - hash_table[position]->Append (k, object); - m_count++; + DoInsertNode( bucket, node ); } -void wxHashTable::Put (const wxChar *key, wxObject * object) +void* wxHashTableBase::DoGet( long key, long hash ) const { - int position = (int) (MakeKey (key) % n); - if (position < 0) position = -position; - - if (!hash_table[position]) - { - hash_table[position] = new wxList (wxKEY_STRING); - if (m_deleteContents) hash_table[position]->DeleteContents(TRUE); - } + wxASSERT( m_keyType == wxKEY_INTEGER ); - hash_table[position]->Append (key, object); - m_count++; -} + size_t bucket = size_t(hash) % m_size; -wxObject *wxHashTable::Get (long key, long value) const -{ - // Should NEVER be - long k = (long) key; + if( m_table[bucket] == NULL ) + return NULL; - int position = (int) (k % n); - if (position < 0) position = -position; + Node *first = m_table[bucket]->GetNext(), + *curr = first; - if (!hash_table[position]) - return (wxObject *) NULL; - else + do { - wxNode *node = hash_table[position]->Find (value); - if (node) - return node->Data (); - else - return (wxObject *) NULL; + if( curr->m_key.integer == key ) + return curr->m_value; + + curr = curr->GetNext(); } + while( curr != first ); + + return NULL; } -wxObject *wxHashTable::Get (long key, const wxChar *value) const +void* wxHashTableBase::DoGet( const wxString& key, long hash ) const { - // Should NEVER be - long k = (long) key; + wxASSERT( m_keyType == wxKEY_STRING ); + + size_t bucket = size_t(hash) % m_size; - int position = (int) (k % n); - if (position < 0) position = -position; + if( m_table[bucket] == NULL ) + return NULL; - if (!hash_table[position]) - return (wxObject *) NULL; - else + Node *first = m_table[bucket]->GetNext(), + *curr = first; + + do { - wxNode *node = hash_table[position]->Find (value); - if (node) - return node->Data (); - else - return (wxObject *) NULL; + if( *curr->m_key.string == key ) + return curr->m_value; + + curr = curr->GetNext(); } + while( curr != first ); + + return NULL; } -wxObject *wxHashTable::Get (long key) const +void wxHashTableBase::DoUnlinkNode( size_t bucket, wxHashTableBase_Node* node, + wxHashTableBase_Node* prev ) { - // Should NEVER be - long k = (long) key; + if( node == m_table[bucket] ) + m_table[bucket] = prev; - int position = (int) (k % n); - if (position < 0) position = -position; + if( prev == node && prev == node->GetNext() ) + m_table[bucket] = NULL; + else + prev->m_next = node->m_next; - if (!hash_table[position]) - return (wxObject *) NULL; - else - { - wxNode *node = hash_table[position]->Find (k); - return node ? node->Data () : (wxObject*)NULL; - } + DoDestroyNode( node ); + --m_count; } -wxObject *wxHashTable::Get (const wxChar *key) const +void* wxHashTableBase::DoDelete( long key, long hash ) { - int position = (int) (MakeKey (key) % n); - if (position < 0) position = -position; + wxASSERT( m_keyType == wxKEY_INTEGER ); - if (!hash_table[position]) - return (wxObject *) NULL; - else - { - wxNode *node = hash_table[position]->Find (key); - return node ? node->Data () : (wxObject*)NULL; - } -} + size_t bucket = size_t(hash) % m_size; -wxObject *wxHashTable::Delete (long key) -{ - // Should NEVER be - long k = (long) key; + if( m_table[bucket] == NULL ) + return NULL; - int position = (int) (k % n); - if (position < 0) position = -position; + Node *first = m_table[bucket]->GetNext(), + *curr = first, + *prev = m_table[bucket]; - if (!hash_table[position]) - return (wxObject *) NULL; - else + do { - wxNode *node = hash_table[position]->Find (k); - if (node) + if( curr->m_key.integer == key ) { - wxObject *data = node->Data (); - delete node; - m_count--; - return data; + void* retval = curr->m_value; + curr->m_value = NULL; + + DoUnlinkNode( bucket, curr, prev ); + delete curr; + + return retval; } - else - return (wxObject *) NULL; + + prev = curr; + curr = curr->GetNext(); } + while( curr != first ); + + return NULL; } -wxObject *wxHashTable::Delete (const wxChar *key) +void* wxHashTableBase::DoDelete( const wxString& key, long hash ) { - int position = (int) (MakeKey (key) % n); - if (position < 0) position = -position; + wxASSERT( m_keyType == wxKEY_STRING ); - if (!hash_table[position]) - return (wxObject *) NULL; - else + size_t bucket = size_t(hash) % m_size; + + if( m_table[bucket] == NULL ) + return NULL; + + Node *first = m_table[bucket]->GetNext(), + *curr = first, + *prev = m_table[bucket]; + + do { - wxNode *node = hash_table[position]->Find (key); - if (node) + if( *curr->m_key.string == key ) { - wxObject *data = node->Data (); - delete node; - m_count--; - return data; + void* retval = curr->m_value; + curr->m_value = NULL; + + DoUnlinkNode( bucket, curr, prev ); + delete curr; + + return retval; } - else - return (wxObject *) NULL; + + prev = curr; + curr = curr->GetNext(); } + while( curr != first ); + + return NULL; } -wxObject *wxHashTable::Delete (long key, int value) +long wxHashTableBase::MakeKey( const wxString& str ) { - // Should NEVER be - long k = (long) key; + long int_key = 0; - int position = (int) (k % n); - if (position < 0) position = -position; + const wxStringCharType *p = str.wx_str(); + while( *p ) + int_key += *p++; - if (!hash_table[position]) - return (wxObject *) NULL; - else - { - wxNode *node = hash_table[position]->Find (value); - if (node) - { - wxObject *data = node->Data (); - delete node; - m_count--; - return data; - } - else - return (wxObject *) NULL; - } + return int_key; } -wxObject *wxHashTable::Delete (long key, const wxChar *value) -{ - int position = (int) (key % n); - if (position < 0) position = -position; +// ---------------------------------------------------------------------------- +// wxHashTable +// ---------------------------------------------------------------------------- - if (!hash_table[position]) - return (wxObject *) NULL; - else - { - wxNode *node = hash_table[position]->Find (value); - if (node) - { - wxObject *data = node->Data (); - delete node; - m_count--; - return data; - } - else - return (wxObject *) NULL; - } +wxHashTable::wxHashTable( const wxHashTable& table ) + : wxHashTableBase() +{ + DoCopy( table ); } -long wxHashTable::MakeKey (const wxChar *string) const +const wxHashTable& wxHashTable::operator=( const wxHashTable& table ) { - long int_key = 0; + Destroy(); + DoCopy( table ); + + return *this; +} - while (*string) - int_key += (wxUChar) *string++; +void wxHashTable::DoCopy( const wxHashTable& WXUNUSED(table) ) +{ + Create( m_keyType, m_size ); - return int_key; + wxFAIL; } -void wxHashTable::BeginFind () +void wxHashTable::DoDeleteContents( wxHashTableBase_Node* node ) { - current_position = -1; - current_node = (wxNode *) NULL; + delete ((wxHashTable_Node*)node)->GetData(); } -wxNode *wxHashTable::Next () +void wxHashTable::GetNextNode( size_t bucketStart ) { - wxNode *found = (wxNode *) NULL; - bool end = FALSE; - while (!end && !found) + for( size_t i = bucketStart; i < m_size; ++i ) { - if (!current_node) + if( m_table[i] != NULL ) { - current_position++; - if (current_position >= n) - { - current_position = -1; - current_node = (wxNode *) NULL; - end = TRUE; - } - else - { - if (hash_table[current_position]) - { - current_node = hash_table[current_position]->First (); - found = current_node; - } - } - } - else - { - current_node = current_node->Next (); - found = current_node; + m_curr = ((Node*)m_table[i])->GetNext(); + m_currBucket = i; + return; } } - return found; -} -void wxHashTable::DeleteContents (bool flag) -{ - int i; - m_deleteContents = flag; - for (i = 0; i < n; i++) - { - if (hash_table[i]) - hash_table[i]->DeleteContents (flag); - } + m_curr = NULL; + m_currBucket = 0; } -void wxHashTable::Clear () +wxHashTable::Node* wxHashTable::Next() { - int i; - for (i = 0; i < n; i++) + if( m_curr == NULL ) + GetNextNode( 0 ); + else { - if (hash_table[i]) - hash_table[i]->Clear (); + m_curr = m_curr->GetNext(); + + if( m_curr == ( (Node*)m_table[m_currBucket] )->GetNext() ) + GetNextNode( m_currBucket + 1 ); } - m_count = 0; + + return m_curr; }