Use a hash table for anchors
This commit is contained in:
parent
76c2b57fa6
commit
11a8648818
44
src/attrs.c
44
src/attrs.c
|
@ -904,21 +904,25 @@ static void FreeAnchor(TidyDocImpl* doc, Anchor *a)
|
||||||
void TY_(RemoveAnchorByNode)( TidyDocImpl* doc, Node *node )
|
void TY_(RemoveAnchorByNode)( TidyDocImpl* doc, Node *node )
|
||||||
{
|
{
|
||||||
TidyAttribImpl* attribs = &doc->attribs;
|
TidyAttribImpl* attribs = &doc->attribs;
|
||||||
Anchor *delme = NULL, *curr, *prev = NULL;
|
Anchor *delme = NULL, *curr, *prev;
|
||||||
|
uint h;
|
||||||
|
|
||||||
for ( curr=attribs->anchor_list; curr!=NULL; curr=curr->next )
|
for (h = 0; h < ANCHOR_HASH_SIZE; h++) {
|
||||||
|
prev = NULL;
|
||||||
|
for ( curr=attribs->anchor_hash[h]; curr!=NULL; curr=curr->next )
|
||||||
{
|
{
|
||||||
if ( curr->node == node )
|
if ( curr->node == node )
|
||||||
{
|
{
|
||||||
if ( prev )
|
if ( prev )
|
||||||
prev->next = curr->next;
|
prev->next = curr->next;
|
||||||
else
|
else
|
||||||
attribs->anchor_list = curr->next;
|
attribs->anchor_hash[h] = curr->next;
|
||||||
delme = curr;
|
delme = curr;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
prev = curr;
|
prev = curr;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
FreeAnchor( doc, delme );
|
FreeAnchor( doc, delme );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -935,34 +939,51 @@ static Anchor* NewAnchor( TidyDocImpl* doc, ctmbstr name, Node* node )
|
||||||
return a;
|
return a;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static uint anchorNameHash(ctmbstr s)
|
||||||
|
{
|
||||||
|
uint hashval;
|
||||||
|
|
||||||
|
for (hashval = 0; *s != '\0'; s++)
|
||||||
|
hashval = *s + 31*hashval;
|
||||||
|
|
||||||
|
return hashval % ANCHOR_HASH_SIZE;
|
||||||
|
}
|
||||||
|
|
||||||
/* add new anchor to namespace */
|
/* add new anchor to namespace */
|
||||||
static Anchor* AddAnchor( TidyDocImpl* doc, ctmbstr name, Node *node )
|
static Anchor* AddAnchor( TidyDocImpl* doc, ctmbstr name, Node *node )
|
||||||
{
|
{
|
||||||
|
uint h;
|
||||||
TidyAttribImpl* attribs = &doc->attribs;
|
TidyAttribImpl* attribs = &doc->attribs;
|
||||||
Anchor *a = NewAnchor( doc, name, node );
|
Anchor *a = NewAnchor( doc, name, node );
|
||||||
|
tmbstr lname = TY_(tmbstrdup)(doc->allocator, name);
|
||||||
|
lname = TY_(tmbstrtolower)(lname);
|
||||||
|
h = anchorNameHash(lname);
|
||||||
|
|
||||||
if ( attribs->anchor_list == NULL)
|
if ( attribs->anchor_hash[h] == NULL)
|
||||||
attribs->anchor_list = a;
|
attribs->anchor_hash[h] = a;
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
Anchor *here = attribs->anchor_list;
|
Anchor *here = attribs->anchor_hash[h];
|
||||||
while (here->next)
|
while (here->next)
|
||||||
here = here->next;
|
here = here->next;
|
||||||
here->next = a;
|
here->next = a;
|
||||||
}
|
}
|
||||||
|
|
||||||
return attribs->anchor_list;
|
TidyDocFree(doc, lname);
|
||||||
|
return attribs->anchor_hash[h];
|
||||||
}
|
}
|
||||||
|
|
||||||
/* return node associated with anchor */
|
/* return node associated with anchor */
|
||||||
static Node* GetNodeByAnchor( TidyDocImpl* doc, ctmbstr name )
|
static Node* GetNodeByAnchor( TidyDocImpl* doc, ctmbstr name )
|
||||||
{
|
{
|
||||||
|
uint h;
|
||||||
TidyAttribImpl* attribs = &doc->attribs;
|
TidyAttribImpl* attribs = &doc->attribs;
|
||||||
Anchor *found;
|
Anchor *found;
|
||||||
tmbstr lname = TY_(tmbstrdup)(doc->allocator, name);
|
tmbstr lname = TY_(tmbstrdup)(doc->allocator, name);
|
||||||
lname = TY_(tmbstrtolower)(lname);
|
lname = TY_(tmbstrtolower)(lname);
|
||||||
|
h = anchorNameHash(lname);
|
||||||
|
|
||||||
for ( found = attribs->anchor_list; found != NULL; found = found->next )
|
for ( found = attribs->anchor_hash[h]; found != NULL; found = found->next )
|
||||||
{
|
{
|
||||||
if ( TY_(tmbstrcmp)(found->name, lname) == 0 )
|
if ( TY_(tmbstrcmp)(found->name, lname) == 0 )
|
||||||
break;
|
break;
|
||||||
|
@ -979,12 +1000,15 @@ void TY_(FreeAnchors)( TidyDocImpl* doc )
|
||||||
{
|
{
|
||||||
TidyAttribImpl* attribs = &doc->attribs;
|
TidyAttribImpl* attribs = &doc->attribs;
|
||||||
Anchor* a;
|
Anchor* a;
|
||||||
while (NULL != (a = attribs->anchor_list) )
|
uint h;
|
||||||
|
for (h = 0; h < ANCHOR_HASH_SIZE; h++) {
|
||||||
|
while (NULL != (a = attribs->anchor_hash[h]) )
|
||||||
{
|
{
|
||||||
attribs->anchor_list = a->next;
|
attribs->anchor_hash[h] = a->next;
|
||||||
FreeAnchor(doc, a);
|
FreeAnchor(doc, a);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* public method for inititializing attribute dictionary */
|
/* public method for inititializing attribute dictionary */
|
||||||
void TY_(InitAttrs)( TidyDocImpl* doc )
|
void TY_(InitAttrs)( TidyDocImpl* doc )
|
||||||
|
|
|
@ -55,10 +55,15 @@ struct _AttrHash
|
||||||
typedef struct _AttrHash AttrHash;
|
typedef struct _AttrHash AttrHash;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
enum
|
||||||
|
{
|
||||||
|
ANCHOR_HASH_SIZE=1021u
|
||||||
|
};
|
||||||
|
|
||||||
struct _TidyAttribImpl
|
struct _TidyAttribImpl
|
||||||
{
|
{
|
||||||
/* anchor/node lookup */
|
/* anchor/node lookup */
|
||||||
Anchor* anchor_list;
|
Anchor* anchor_hash[ANCHOR_HASH_SIZE];
|
||||||
|
|
||||||
/* Declared literal attributes */
|
/* Declared literal attributes */
|
||||||
Attribute* declared_attr_list;
|
Attribute* declared_attr_list;
|
||||||
|
|
Loading…
Reference in a new issue