/////////////////////////////////////////////////////////////////////////////
-// 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()
// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#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/list.h"
+ #include "wx/hash.h"
#endif
-#include "wx/hash.h"
-
#if wxUSE_OLD_HASH_TABLE
#include <string.h>
wxHashTableBase::wxHashTableBase()
{
- m_deleteContents = FALSE;
+ m_deleteContents = false;
m_hashTable = (wxListBase **)NULL;
m_hashSize = 0;
m_count = 0;
return node;
}
-#if WXWIN_COMPATIBILITY_2_4
-
-// ----------------------------------------------------------------------------
-// wxHashTableLong
-// ----------------------------------------------------------------------------
-
-wxHashTableLong::~wxHashTableLong()
-{
- Destroy();
-}
-
-void wxHashTableLong::Init(size_t size)
-{
- m_hashSize = size;
- m_values = new wxArrayLong *[size];
- m_keys = new wxArrayLong *[size];
-
- for ( size_t n = 0; n < m_hashSize; n++ )
- {
- m_values[n] =
- m_keys[n] = (wxArrayLong *)NULL;
- }
-
- m_count = 0;
-}
-
-void wxHashTableLong::Create(size_t size)
-{
- Init(size);
-}
-
-void wxHashTableLong::Destroy()
-{
- for ( size_t n = 0; n < m_hashSize; n++ )
- {
- delete m_values[n];
- delete m_keys[n];
- }
-
- delete [] m_values;
- delete [] m_keys;
- m_hashSize = 0;
- m_count = 0;
-}
-
-void wxHashTableLong::Put(long key, long value)
-{
- wxCHECK_RET( m_hashSize, _T("must call Create() first") );
-
- size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
-
- if ( !m_keys[slot] )
- {
- m_keys[slot] = new wxArrayLong;
- m_values[slot] = new wxArrayLong;
- }
-
- m_keys[slot]->Add(key);
- m_values[slot]->Add(value);
-
- m_count++;
-}
-
-long wxHashTableLong::Get(long key) const
-{
- wxCHECK_MSG( m_hashSize, wxNOT_FOUND, _T("must call Create() first") );
-
- size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
-
- wxArrayLong *keys = m_keys[slot];
- if ( keys )
- {
- size_t count = keys->GetCount();
- for ( size_t n = 0; n < count; n++ )
- {
- if ( keys->Item(n) == key )
- {
- return m_values[slot]->Item(n);
- }
- }
- }
-
- return wxNOT_FOUND;
-}
-
-long wxHashTableLong::Delete(long key)
-{
- wxCHECK_MSG( m_hashSize, wxNOT_FOUND, _T("must call Create() first") );
-
- size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
-
- wxArrayLong *keys = m_keys[slot];
- if ( keys )
- {
- size_t count = keys->GetCount();
- for ( size_t n = 0; n < count; n++ )
- {
- if ( keys->Item(n) == key )
- {
- long val = m_values[slot]->Item(n);
-
- keys->RemoveAt(n);
- m_values[slot]->RemoveAt(n);
-
- m_count--;
-
- return val;
- }
- }
- }
-
- return wxNOT_FOUND;
-}
-
-// ----------------------------------------------------------------------------
-// wxStringHashTable: more efficient than storing strings in a list
-// ----------------------------------------------------------------------------
-
-wxStringHashTable::wxStringHashTable(size_t sizeTable)
-{
- m_keys = new wxArrayLong *[sizeTable];
- m_values = new wxArrayString *[sizeTable];
-
- m_hashSize = sizeTable;
- for ( size_t n = 0; n < m_hashSize; n++ )
- {
- m_values[n] = (wxArrayString *)NULL;
- m_keys[n] = (wxArrayLong *)NULL;
- }
-}
-
-wxStringHashTable::~wxStringHashTable()
-{
- Destroy();
-}
-
-void wxStringHashTable::Destroy()
-{
- for ( size_t n = 0; n < m_hashSize; n++ )
- {
- delete m_values[n];
- delete m_keys[n];
- }
-
- delete [] m_values;
- delete [] m_keys;
- m_hashSize = 0;
-}
-
-void wxStringHashTable::Put(long key, const wxString& value)
-{
- wxCHECK_RET( m_hashSize, _T("must call Create() first") );
-
- size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
-
- if ( !m_keys[slot] )
- {
- m_keys[slot] = new wxArrayLong;
- m_values[slot] = new wxArrayString;
- }
-
- m_keys[slot]->Add(key);
- m_values[slot]->Add(value);
-}
-
-wxString wxStringHashTable::Get(long key, bool *wasFound) const
-{
- wxCHECK_MSG( m_hashSize, _T(""), _T("must call Create() first") );
-
- size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
-
- wxArrayLong *keys = m_keys[slot];
- if ( keys )
- {
- size_t count = keys->GetCount();
- for ( size_t n = 0; n < count; n++ )
- {
- if ( keys->Item(n) == key )
- {
- if ( wasFound )
- *wasFound = TRUE;
-
- return m_values[slot]->Item(n);
- }
- }
- }
-
- if ( wasFound )
- *wasFound = FALSE;
-
- return _T("");
-}
-
-bool wxStringHashTable::Delete(long key) const
-{
- wxCHECK_MSG( m_hashSize, FALSE, _T("must call Create() first") );
-
- size_t slot = (size_t)abs((int)(key % (long)m_hashSize));
-
- wxArrayLong *keys = m_keys[slot];
- if ( keys )
- {
- size_t count = keys->GetCount();
- for ( size_t n = 0; n < count; n++ )
- {
- if ( keys->Item(n) == key )
- {
- keys->RemoveAt(n);
- m_values[slot]->RemoveAt(n);
- return TRUE;
- }
- }
- }
-
- return FALSE;
-}
-
-#endif // WXWIN_COMPATIBILITY_2_4
-
// ----------------------------------------------------------------------------
// old not type safe wxHashTable
// ----------------------------------------------------------------------------
hash_table = (wxList**) NULL;
Create(the_key_type, size);
m_count = 0;
- m_deleteContents = FALSE;
+ m_deleteContents = false;
/*
n = size;
current_position = -1;
int i;
for (i = 0; i < size; i++)
hash_table[i] = (wxList *) NULL;
- return TRUE;
+ return true;
}
if (!hash_table[position])
{
hash_table[position] = new wxList (wxKEY_INTEGER);
- if (m_deleteContents) hash_table[position]->DeleteContents(TRUE);
+ if (m_deleteContents) hash_table[position]->DeleteContents(true);
}
hash_table[position]->Append (value, object);
if (!hash_table[position])
{
hash_table[position] = new wxList (wxKEY_STRING);
- if (m_deleteContents) hash_table[position]->DeleteContents(TRUE);
+ if (m_deleteContents) hash_table[position]->DeleteContents(true);
}
hash_table[position]->Append (value, object);
if (!hash_table[position])
{
hash_table[position] = new wxList (wxKEY_INTEGER);
- if (m_deleteContents) hash_table[position]->DeleteContents(TRUE);
+ if (m_deleteContents) hash_table[position]->DeleteContents(true);
}
hash_table[position]->Append (k, object);
if (!hash_table[position])
{
hash_table[position] = new wxList (wxKEY_STRING);
- if (m_deleteContents) hash_table[position]->DeleteContents(TRUE);
+ if (m_deleteContents) hash_table[position]->DeleteContents(true);
}
hash_table[position]->Append (key, object);
wxHashTable::Node* wxHashTable::Next ()
{
wxNode *found = (wxNode *) NULL;
- bool end = FALSE;
+ bool end = false;
while (!end && !found)
{
if (!current_node)
{
current_position = -1;
current_node = (wxNode *) NULL;
- end = TRUE;
+ end = true;
}
else
{
Node* prev = start;
for( curr = prev->GetNext(); curr != node;
- prev = curr, curr = curr->GetNext() );
+ prev = curr, curr = curr->GetNext() ) ;
DoUnlinkNode( bucket, node, prev );
}
return int_key;
}
-//
+// ----------------------------------------------------------------------------
+// wxHashTable
+// ----------------------------------------------------------------------------
wxHashTable::wxHashTable( const wxHashTable& table )
+ : wxHashTableBase()
{
DoCopy( table );
}
{
Create( m_keyType, m_size );
- wxASSERT( false );
+ wxFAIL;
}
void wxHashTable::DoDeleteContents( wxHashTableBase_Node* node )
projects / wxWidgets.git / blobdiff