/////////////////////////////////////////////////////////////////////////////
-// Name: hash.cpp
+// Name: src/common/hash.cpp
// Purpose: wxHashTable implementation
// Author: Julian Smart
-// Modified by:
+// 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
-// Licence: wxWindows licence
+// Copyright: (c) Julian Smart
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "hash.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
// 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 <string.h>
-#include <stdarg.h>
-
-IMPLEMENT_DYNAMIC_CLASS(wxHashTable, wxObject)
-
-wxHashTable::wxHashTable (int the_key_type, int size)
+wxHashTableBase_Node::wxHashTableBase_Node( long key, void* value,
+ wxHashTableBase* table )
+ : m_value( value ), m_hashPtr( table )
{
- 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;
-*/
+ m_key.integer = key;
}
-wxHashTable::~wxHashTable (void)
+wxHashTableBase_Node::wxHashTableBase_Node( const wxString& key, void* value,
+ wxHashTableBase* table )
+ : m_value( value ), m_hashPtr( table )
{
- Destroy();
+ m_key.string = new wxString(key);
}
-void wxHashTable::Destroy(void)
+wxHashTableBase_Node::~wxHashTableBase_Node()
{
- 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;
+ if( m_hashPtr ) m_hashPtr->DoRemoveNode( this );
}
-bool wxHashTable::Create(int the_key_type, int size)
+//
+
+wxHashTableBase::wxHashTableBase()
+ : m_size( 0 ), m_count( 0 ), m_table( NULL ), m_keyType( wxKEY_NONE ),
+ m_deleteContents( false )
{
- 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;
}
+void wxHashTableBase::Create( wxKeyType keyType, size_t size )
+{
+ m_keyType = keyType;
+ m_size = size;
+ m_table = new wxHashTableBase_Node*[ m_size ];
+
+ for( size_t i = 0; i < m_size; ++i )
+ m_table[i] = NULL;
+}
-void wxHashTable::DoCopy(const wxHashTable& table)
+void wxHashTableBase::Clear()
{
- 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]);
+ for( size_t i = 0; i < m_size; ++i )
+ {
+ Node* end = m_table[i];
+
+ if( end == NULL )
+ continue;
+
+ Node *curr, *next = end->GetNext();
+
+ do
+ {
+ curr = next;
+ next = curr->GetNext();
+
+ DoDestroyNode( curr );
+
+ delete curr;
+ }
+ while( curr != end );
+
+ m_table[i] = NULL;
}
- }
+
+ m_count = 0;
}
-void wxHashTable::Put (long key, long value, wxObject * object)
+void wxHashTableBase::DoRemoveNode( wxHashTableBase_Node* node )
{
- // Should NEVER be
- long k = (long) key;
- if (k < 0)
- k = -k;
-
- int position = (int) (k % n);
- if (!hash_table[position])
- {
- hash_table[position] = new wxList (wxKEY_INTEGER);
- if (m_deleteContents) hash_table[position]->DeleteContents(TRUE);
- }
-
- hash_table[position]->Append (value, object);
- m_count++;
+ size_t bucket = ( m_keyType == wxKEY_INTEGER ?
+ node->m_key.integer :
+ MakeKey( *node->m_key.string ) ) % m_size;
+
+ if( node->GetNext() == node )
+ {
+ // single-node chain (common case)
+ m_table[bucket] = NULL;
+ }
+ else
+ {
+ Node *start = m_table[bucket], *curr;
+ Node* prev = start;
+
+ for( curr = prev->GetNext(); curr != node;
+ prev = curr, curr = curr->GetNext() ) ;
+
+ DoUnlinkNode( bucket, node, prev );
+ }
+
+ DoDestroyNode( node );
}
-void wxHashTable::Put (long key, const wxChar *value, wxObject * object)
+void wxHashTableBase::DoDestroyNode( wxHashTableBase_Node* node )
{
- // Should NEVER be
- long k = (long) key;
- if (k < 0)
- k = -k;
-
- int position = (int) (k % n);
- if (!hash_table[position])
- {
- hash_table[position] = new wxList (wxKEY_INTEGER);
- if (m_deleteContents) hash_table[position]->DeleteContents(TRUE);
- }
-
- hash_table[position]->Append (value, object);
- m_count++;
+ // 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::Put (long key, wxObject * object)
+void wxHashTableBase::Destroy()
{
- // Should NEVER be
- long k = (long) key;
- if (k < 0)
- k = -k;
-
- int position = (int) (k % n);
- 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++;
+ Clear();
+
+ wxDELETEA(m_table);
+ m_size = 0;
}
-void wxHashTable::Put (const wxChar *key, wxObject * object)
+void wxHashTableBase::DoInsertNode( size_t bucket, wxHashTableBase_Node* node )
{
- int position = (int) (MakeKey (key) % n);
+ if( m_table[bucket] == NULL )
+ {
+ m_table[bucket] = node->m_next = node;
+ }
+ else
+ {
+ Node *prev = m_table[bucket];
+ Node *next = prev->m_next;
- if (!hash_table[position])
- {
- hash_table[position] = new wxList (wxKEY_STRING);
- if (m_deleteContents) hash_table[position]->DeleteContents(TRUE);
- }
+ prev->m_next = node;
+ node->m_next = next;
+ m_table[bucket] = node;
+ }
- hash_table[position]->Append (key, object);
- m_count++;
+ ++m_count;
}
-wxObject *wxHashTable::Get (long key, long value) const
+void wxHashTableBase::DoPut( long key, long hash, void* data )
{
- // Should NEVER be
- long k = (long) key;
- if (k < 0)
- k = -k;
-
- int position = (int) (k % n);
- if (!hash_table[position])
- return (wxObject *) NULL;
- else
- {
- wxNode *node = hash_table[position]->Find (value);
- if (node)
- return node->Data ();
- else
- return (wxObject *) NULL;
- }
+ wxASSERT( m_keyType == wxKEY_INTEGER );
+
+ size_t bucket = size_t(hash) % m_size;
+ Node* node = new wxHashTableBase_Node( key, data, this );
+
+ DoInsertNode( bucket, node );
}
-wxObject *wxHashTable::Get (long key, const wxChar *value) const
+void wxHashTableBase::DoPut( const wxString& key, long hash, void* data )
{
- // Should NEVER be
- long k = (long) key;
- if (k < 0)
- k = -k;
-
- int position = (int) (k % n);
- if (!hash_table[position])
- return (wxObject *) NULL;
- else
- {
- wxNode *node = hash_table[position]->Find (value);
- if (node)
- return node->Data ();
- else
- return (wxObject *) NULL;
- }
+ wxASSERT( m_keyType == wxKEY_STRING );
+
+ size_t bucket = size_t(hash) % m_size;
+ Node* node = new wxHashTableBase_Node( key, data, this );
+
+ DoInsertNode( bucket, node );
}
-wxObject *wxHashTable::Get (long key) const
+void* wxHashTableBase::DoGet( long key, long hash ) const
{
- // Should NEVER be
- long k = (long) key;
- if (k < 0)
- k = -k;
-
- int position = (int) (k % n);
- if (!hash_table[position])
- return (wxObject *) NULL;
- else
+ wxASSERT( m_keyType == wxKEY_INTEGER );
+
+ size_t bucket = size_t(hash) % m_size;
+
+ if( m_table[bucket] == NULL )
+ return NULL;
+
+ Node *first = m_table[bucket]->GetNext(),
+ *curr = first;
+
+ do
{
- wxNode *node = hash_table[position]->Find (k);
- return node ? node->Data () : (wxObject*)NULL;
+ if( curr->m_key.integer == key )
+ return curr->m_value;
+
+ curr = curr->GetNext();
}
+ while( curr != first );
+
+ return NULL;
}
-wxObject *wxHashTable::Get (const wxChar *key) const
+void* wxHashTableBase::DoGet( const wxString& key, long hash ) const
{
- int position = (int) (MakeKey (key) % n);
+ wxASSERT( m_keyType == wxKEY_STRING );
+
+ size_t bucket = size_t(hash) % m_size;
+
+ if( m_table[bucket] == NULL )
+ return NULL;
+
+ Node *first = m_table[bucket]->GetNext(),
+ *curr = first;
- if (!hash_table[position])
- return (wxObject *) NULL;
- else
+ do
{
- wxNode *node = hash_table[position]->Find (key);
- return node ? node->Data () : (wxObject*)NULL;
+ if( *curr->m_key.string == key )
+ return curr->m_value;
+
+ curr = curr->GetNext();
}
+ while( curr != first );
+
+ return NULL;
}
-wxObject *wxHashTable::Delete (long key)
+void wxHashTableBase::DoUnlinkNode( size_t bucket, wxHashTableBase_Node* node,
+ wxHashTableBase_Node* prev )
{
- // Should NEVER be
- long k = (long) key;
- if (k < 0)
- k = -k;
-
- int position = (int) (k % n);
- if (!hash_table[position])
- return (wxObject *) NULL;
- else
- {
- wxNode *node = hash_table[position]->Find (k);
- if (node)
- {
- wxObject *data = node->Data ();
- delete node;
- m_count--;
- return data;
- }
- else
- return (wxObject *) NULL;
- }
+ if( node == m_table[bucket] )
+ m_table[bucket] = prev;
+
+ if( prev == node && prev == node->GetNext() )
+ m_table[bucket] = NULL;
+ else
+ prev->m_next = node->m_next;
+
+ DoDestroyNode( node );
+ --m_count;
}
-wxObject *wxHashTable::Delete (const wxChar *key)
+void* wxHashTableBase::DoDelete( long key, long hash )
{
- int position = (int) (MakeKey (key) % n);
- if (!hash_table[position])
- return (wxObject *) NULL;
- else
+ wxASSERT( m_keyType == wxKEY_INTEGER );
+
+ 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)
- {
- wxObject *data = node->Data ();
- delete node;
- m_count--;
- return data;
- }
- else
- return (wxObject *) NULL;
+ if( curr->m_key.integer == key )
+ {
+ void* retval = curr->m_value;
+ curr->m_value = NULL;
+
+ DoUnlinkNode( bucket, curr, prev );
+ delete curr;
+
+ return retval;
+ }
+
+ prev = curr;
+ curr = curr->GetNext();
}
+ while( curr != first );
+
+ return NULL;
}
-wxObject *wxHashTable::Delete (long key, int value)
+void* wxHashTableBase::DoDelete( const wxString& key, long hash )
{
- // Should NEVER be
- long k = (long) key;
- if (k < 0)
- k = -k;
-
- int position = (int) (k % n);
- if (!hash_table[position])
- return (wxObject *) NULL;
- else
+ wxASSERT( m_keyType == wxKEY_STRING );
+
+ 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 (value);
- if (node)
- {
- wxObject *data = node->Data ();
- delete node;
- m_count--;
- return data;
- }
- else
- return (wxObject *) NULL;
+ if( *curr->m_key.string == key )
+ {
+ void* retval = curr->m_value;
+ curr->m_value = NULL;
+
+ DoUnlinkNode( bucket, curr, prev );
+ delete curr;
+
+ return retval;
+ }
+
+ prev = curr;
+ curr = curr->GetNext();
}
+ while( curr != first );
+
+ return NULL;
}
-wxObject *wxHashTable::Delete (long key, const wxChar *value)
+long wxHashTableBase::MakeKey( const wxString& str )
{
- int position = (int) (key % n);
- 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;
- }
+ long int_key = 0;
+
+ const wxStringCharType *p = str.wx_str();
+ while( *p )
+ int_key += *p++;
+
+ return int_key;
}
-long wxHashTable::MakeKey (const wxChar *string) const
+// ----------------------------------------------------------------------------
+// wxHashTable
+// ----------------------------------------------------------------------------
+
+wxHashTable::wxHashTable( const wxHashTable& table )
+ : wxHashTableBase()
{
- long int_key = 0;
+ DoCopy( table );
+}
- while (*string)
- int_key += (wxUChar) *string++;
+const wxHashTable& wxHashTable::operator=( const wxHashTable& table )
+{
+ Destroy();
+ DoCopy( table );
- return int_key;
+ return *this;
}
-void wxHashTable::BeginFind (void)
+void wxHashTable::DoCopy( const wxHashTable& WXUNUSED(table) )
{
- current_position = -1;
- current_node = (wxNode *) NULL;
+ Create( m_keyType, m_size );
+
+ wxFAIL;
}
-wxNode *wxHashTable::Next (void)
+void wxHashTable::DoDeleteContents( wxHashTableBase_Node* node )
{
- wxNode *found = (wxNode *) NULL;
- bool end = FALSE;
- while (!end && !found)
- {
- if (!current_node)
- {
- 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;
- }
- }
- return found;
+ delete ((wxHashTable_Node*)node)->GetData();
}
-void wxHashTable::DeleteContents (bool flag)
+void wxHashTable::GetNextNode( size_t bucketStart )
{
- int i;
- m_deleteContents = flag;
- for (i = 0; i < n; i++)
+ for( size_t i = bucketStart; i < m_size; ++i )
{
- if (hash_table[i])
- hash_table[i]->DeleteContents (flag);
+ if( m_table[i] != NULL )
+ {
+ m_curr = ((Node*)m_table[i])->GetNext();
+ m_currBucket = i;
+ return;
+ }
}
+
+ m_curr = NULL;
+ m_currBucket = 0;
}
-void wxHashTable::Clear (void)
+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;
}
projects / wxWidgets.git / blobdiff