emelie/tidy-html5
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

New config option now drives the list; memory deallocated.

Browse source
This commit is contained in:
Jim Derry 2017-09-23 07:20:31 -04:00
parent 23c28e5b82
commit 70681131d6
3 changed files with 46 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
src/attrs.c
View file

@ -930,15 +930,31 @@ AttVal* TY_(RepairAttrValue)(TidyDocImpl* doc, Node* node, ctmbstr name, ctmbstr
}
void TY_(FreeAttrPriorityList)( TidyDocImpl* doc )
{
PriorityAttribs *priorities = &(doc->attribs.priorityAttribs);
if ( priorities->list )
{
uint i = 0;
while ( priorities->list[i] != NULL )
{
TidyFree( doc->allocator, priorities->list[i] );
i++;
}
TidyFree( doc->allocator, priorities->list );
}
}
void TY_(DefinePriorityAttribute)(TidyDocImpl* doc, ctmbstr name)
{
enum { capacity = 10 };
PriorityAttribs *priorities = &(doc->attribs.priorityAttribs);
/* @TODO: Don't forget to free this stuff */
if ( !priorities->list )
{
priorities->list = malloc( sizeof(ctmbstr) * capacity );
priorities->list = TidyAlloc(doc->allocator, sizeof(ctmbstr) * capacity );
priorities->list[0] = NULL;
priorities->capacity = capacity;
priorities->count = 0;
@ -953,15 +969,6 @@ void TY_(DefinePriorityAttribute)(TidyDocImpl* doc, ctmbstr name)
priorities->list[priorities->count] = TY_(tmbstrdup)( doc->allocator, name);
priorities->count++;
priorities->list[priorities->count] = NULL;
uint i = 0;
while ( priorities->list[i] != NULL )
{
printf("Array contains %s.\n", priorities->list[i]);
i++;
}
printf("Adding %s to list.\n", name);
}
@ -2210,15 +2217,15 @@ void CheckType( TidyDocImpl* doc, Node *node, AttVal *attval)
}
static
AttVal *SortAttVal( AttVal* list, TidyAttrSortStrategy strat );
AttVal *SortAttVal( TidyDocImpl* doc, AttVal* list, TidyAttrSortStrategy strat );
void TY_(SortAttributes)(Node* node, TidyAttrSortStrategy strat)
void TY_(SortAttributes)(TidyDocImpl* doc, Node* node, TidyAttrSortStrategy strat)
{
while (node)
{
node->attributes = SortAttVal( node->attributes, strat );
node->attributes = SortAttVal( doc, node->attributes, strat );
if (node->content)
TY_(SortAttributes)(node->content, strat);
TY_(SortAttributes)(doc, node->content, strat);
node = node->next;
}
}
@ -2260,6 +2267,8 @@ typedef int(*ptAttValComparator)(AttVal *one, AttVal *two, ctmbstr *list);
/* Returns the index of the item in the array, or -1 if not in the array */
static
int indexof( ctmbstr item, ctmbstr *list )
{
if ( list )
{
uint i = 0;
while ( list[i] != NULL ) {
@ -2267,6 +2276,7 @@ int indexof( ctmbstr item, ctmbstr *list )
return i;
i++;
}
}
return -1;
}
@ -2332,7 +2342,7 @@ ptAttValComparator GetAttValComparator(TidyAttrSortStrategy strat, ctmbstr *list
case TidySortAttrAlpha:
return AlphaComparator;
case TidySortAttrNone:
if ( list[0] )
if ( list && list[0] )
return PriorityComparator;
break;
}
@ -2341,15 +2351,14 @@ ptAttValComparator GetAttValComparator(TidyAttrSortStrategy strat, ctmbstr *list
/* The sort routine */
static
AttVal *SortAttVal( AttVal *list, TidyAttrSortStrategy strat)
AttVal *SortAttVal( TidyDocImpl* doc, AttVal *list, TidyAttrSortStrategy strat)
{
/* Get the list from the pass-in tidyDoc, which is a to-do.
We'll use this static list temporarily.
*/
// ctmbstr doc[] = { NULL };
ctmbstr temp_list[] = { "id", "name", "class", NULL }; /* temp until option */
/* Get the list from the passed-in tidyDoc. */
// ctmbstr* priorityList = (ctmbstr*)doc->attribs.priorityAttribs.list;
// ctmbstr priorityList[] = { "id", NULL };
ctmbstr* priorityList = (ctmbstr*)doc->attribs.priorityAttribs.list;
ptAttValComparator ptComparator = GetAttValComparator(strat, temp_list);
ptAttValComparator ptComparator = GetAttValComparator(strat, priorityList);
AttVal *p, *q, *e, *tail;
int insize, nmerges, psize, qsize, i;
@ -2360,7 +2369,7 @@ AttVal *SortAttVal( AttVal *list, TidyAttrSortStrategy strat)
if (!list)
return NULL;
/* If no comparator, return the list as is */
/* If no comparator, return the list as-is */
if (ptComparator == 0)
return list;
@ -2397,7 +2406,7 @@ AttVal *SortAttVal( AttVal *list, TidyAttrSortStrategy strat)
} else if (qsize == 0 || !q) {
/* q is empty; e must come from p. */
e = p; p = p->next; psize--;
} else if (ptComparator(p,q, temp_list) <= 0) {
} else if (ptComparator(p,q, priorityList) <= 0) {
/* First element of p is lower (or same);
* e must come from p. */
e = p; p = p->next; psize--;

7
src/attrs.h
View file

@ -60,8 +60,9 @@ enum
ANCHOR_HASH_SIZE=1021u
};
/* Keeps a list of attributes that are sorted ahead of the others. */
typedef struct _priorityAttribs {
ctmbstr* list;
tmbstr* list;
uint count;
uint capacity;
} PriorityAttribs;
@ -144,13 +145,15 @@ void TY_(FreeAnchors)( TidyDocImpl* doc );
void TY_(InitAttrs)( TidyDocImpl* doc );
void TY_(FreeAttrTable)( TidyDocImpl* doc );
void TY_(FreeAttrPriorityList)( TidyDocImpl* doc );
void TY_(AppendToClassAttr)( TidyDocImpl* doc, AttVal *classattr, ctmbstr classname );
/*
the same attribute name can't be used
more than once in each element
*/
void TY_(RepairDuplicateAttributes)( TidyDocImpl* doc, Node* node, Bool isXml );
void TY_(SortAttributes)(Node* node, TidyAttrSortStrategy strat);
void TY_(SortAttributes)(TidyDocImpl* doc, Node* node, TidyAttrSortStrategy strat);
Bool TY_(IsBoolAttribute)( AttVal* attval );
Bool TY_(attrIsEvent)( AttVal* attval );

3
src/tidylib.c
View file

@ -181,6 +181,7 @@ void tidyDocRelease( TidyDocImpl* doc )
TY_(FreeConfig)( doc );
TY_(FreeAttrTable)( doc );
TY_(FreeAttrPriorityList)( doc );
TY_(FreeTags)( doc );
/*\
* Issue #186 - Now FreeNode depend on the doctype, so the lexer is needed
@ -2215,7 +2216,7 @@ int tidyDocSaveStream( TidyDocImpl* doc, StreamOut* out )
else
TY_(ReplacePreformattedSpaces)(doc, &doc->root);
TY_(SortAttributes)(&doc->root, sortAttrStrat);
TY_(SortAttributes)(doc, &doc->root, sortAttrStrat);
if ( showMarkup && (doc->errors == 0 || forceOutput) )
{