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

Remove debug alloc msgs, and show attributes

Browse source
This commit is contained in:
Geoff McLane 2014-09-14 20:53:34 +02:00
parent 2faeefbc22
commit 0f04eaa7d6
1 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/lexer.c
View file

@ -48,17 +48,39 @@
#endif #endif
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
static Bool show_attrs = yes;
static void Show_Node( TidyDocImpl* doc, const char *msg, Node *node ) static void Show_Node( TidyDocImpl* doc, const char *msg, Node *node )
{ {
Lexer* lexer = doc->lexer; Lexer* lexer = doc->lexer;
Bool lex = ((msg[0] == 'l')&&(msg[1] == 'e')) ? yes : no; Bool lex = ((msg[0] == 'l')&&(msg[1] == 'e')) ? yes : no;
if (lexer && lexer->token && (lexer->token->type == TextNode)) { if (lexer && lexer->token && (lexer->token->type == TextNode)) {
SPRTF("Returning %s TextNode %p... %s\n", msg, node, if (show_attrs) {
lex ? "lexer" : "stream"); SPRTF("Returning %s TextNode ... %s\n", msg,
lex ? "lexer" : "stream");
} else {
SPRTF("Returning %s TextNode %p... %s\n", msg, node,
lex ? "lexer" : "stream");
}
} else { } else {
SPRTF("Returning %s node %p <%s>... %s\n", msg, node, if (show_attrs) {
node->element ? node->element : "blank", AttVal* av;
lex ? "lexer" : "stream"); tmbstr name = node->element ? node->element : "blank";
SPRTF("Returning %s node <%s", msg, name);
for (av = node->attributes; av; av = av->next) {
name = av->attribute;
if (name) {
SPRTF(" %s",name);
if (av->value) {
SPRTF("=\"%s\"", av->value);
}
}
}
SPRTF("> %s\n", lex ? "lexer" : "stream");
} else {
SPRTF("Returning %s node %p <%s>... %s\n", msg, node,
node->element ? node->element : "blank",
lex ? "lexer" : "stream");
}
} }
} }
#define GTDBG(a,b,c) Show_Node(a,b,c) #define GTDBG(a,b,c) Show_Node(a,b,c)
@ -1066,7 +1088,7 @@ Node *TY_(NewNode)(TidyAllocator* allocator, Lexer *lexer)
node->column = lexer->columns; node->column = lexer->columns;
} }
node->type = TextNode; node->type = TextNode;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_ALLOCATION)
SPRTF("Allocated node %p\n", node ); SPRTF("Allocated node %p\n", node );
#endif #endif
return node; return node;
@ -1160,7 +1182,7 @@ void TY_(RemoveAttribute)( TidyDocImpl* doc, Node *node, AttVal *attr )
*/ */
void TY_(FreeNode)( TidyDocImpl* doc, Node *node ) void TY_(FreeNode)( TidyDocImpl* doc, Node *node )
{ {
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER) && defined(DEBUG_ALLOCATION)
if (node) SPRTF("Free node %p\n", node ); if (node) SPRTF("Free node %p\n", node );
#endif #endif
/* this is no good ;=(( /* this is no good ;=((