Adwaith-Rajesh/gperf
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/gperf.git synced 2025-12-02 13:09:22 +00:00
Code Activity

Remove the global vectors. Move them to the class Search.

Browse Source
This commit is contained in:
Bruno Haible
2002-11-28 12:56:08 +00:00
parent aca3f4abae
commit c73312f0fd
10 changed files with 65 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/search.cc
View File

@@ -36,12 +36,14 @@ static const int TABLE_MULTIPLE = 10;
#define POW(X) ((!X)?1:(X-=1,X|=X>>1,X|=X>>2,X|=X>>4,X|=X>>8,X|=X>>16,(++X)))
Search::Search (KeywordExt_List *list)
: _head (list)
: _head (list),
_alpha_size (option[SEVENBIT] ? 128 : 256),
_occurrences (new int[_alpha_size]),
_asso_values (new int[_alpha_size]),
_determined (new bool[_alpha_size])
{
}
bool Search::_determined[MAX_ALPHA_SIZE];
void
Search::prepare ()
{
@@ -529,7 +531,7 @@ Search::optimize ()
{
srand (reinterpret_cast<long>(time (0)));
for (int i = 0; i < ALPHA_SIZE; i++)
for (int i = 0; i < _alpha_size; i++)
_asso_values[i] = (rand () & asso_value_max - 1);
}
else
@@ -537,7 +539,7 @@ Search::optimize ()
int asso_value = option.get_initial_asso_value ();
if (asso_value) /* Initialize array if user requests non-zero default. */
for (int i = ALPHA_SIZE - 1; i >= 0; i--)
for (int i = _alpha_size - 1; i >= 0; i--)
_asso_values[i] = asso_value & get_asso_max () - 1;
}
_max_hash_value = max_key_length () + get_asso_max () * get_max_keysig_size ();
@@ -603,7 +605,7 @@ Search::~Search ()
{
fprintf (stderr, "\ndumping occurrence and associated values tables\n");
for (int i = 0; i < ALPHA_SIZE; i++)
for (int i = 0; i < _alpha_size; i++)
if (_occurrences[i])
fprintf (stderr, "asso_values[%c] = %6d, occurrences[%c] = %6d\n",
i, _asso_values[i], i, _occurrences[i]);