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

add more 'ugly' diagnostic code to chase down a BUG

Browse source
This commit is contained in:
Geoff McLane 2014-08-04 17:02:54 +02:00
parent 51f87aee07
commit ec35caf1f3
2 changed files with 71 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

79
src/lexer.c
View file

@ -1047,6 +1047,9 @@ 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)
SPRTF("Allocated node %p\n", node );
#endif
return node; return node;
} }
@ -1138,6 +1141,16 @@ 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 (node) SPRTF("Free node %p\n", node );
#endif
/* this is no good ;=((
if (node && doc && doc->lexer) {
if (node == doc->lexer->token) {
doc->lexer->token = NULL; // TY_(NewNode)( doc->lexer->allocator, doc->lexer );
}
}
----------------- */
while ( node ) while ( node )
{ {
Node* next = node->next; Node* next = node->next;
@ -2015,6 +2028,16 @@ void TY_(UngetToken)( TidyDocImpl* doc )
return lexer->token; \ return lexer->token; \
} }
#else #else
#if !defined(NDEBUG) && defined(_MSC_VER)
#define CondReturnTextNode(doc, skip) \
if (lexer->txtend > lexer->txtstart) { \
Node *_node = TY_(TextToken)(lexer); \
lexer->token = _node; \
SPRTF("Returning text node %p...\n",_node); \
return _node; \
}
#else
#define CondReturnTextNode(doc, skip) \ #define CondReturnTextNode(doc, skip) \
if (lexer->txtend > lexer->txtstart) \ if (lexer->txtend > lexer->txtstart) \
{ \ { \
@ -2022,6 +2045,7 @@ void TY_(UngetToken)( TidyDocImpl* doc )
return lexer->token; \ return lexer->token; \
} }
#endif #endif
#endif
/* /*
modes for GetToken() modes for GetToken()
@ -2034,6 +2058,11 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode );
Node* TY_(GetToken)( TidyDocImpl* doc, GetTokenMode mode ) Node* TY_(GetToken)( TidyDocImpl* doc, GetTokenMode mode )
{ {
#if !defined(NDEBUG) && defined(_MSC_VER)
static int pushed_count = 0;
static int lexer_count = 0;
static int insert_count = 0;
#endif
Node *node; Node *node;
Lexer* lexer = doc->lexer; Lexer* lexer = doc->lexer;
@ -2046,7 +2075,13 @@ Node* TY_(GetToken)( TidyDocImpl* doc, GetTokenMode mode )
if (lexer->pushed) if (lexer->pushed)
{ {
lexer->pushed = no; lexer->pushed = no;
return lexer->itoken; node = lexer->itoken;
#if !defined(NDEBUG) && defined(_MSC_VER)
pushed_count++;
SPRTF("%d: Returning pushed node %p, '%s'...\n", pushed_count, node,
node->element ? node->element : "<blank>");
#endif
return node;
} }
/* itoken has been accepted */ /* itoken has been accepted */
lexer->itoken = NULL; lexer->itoken = NULL;
@ -2058,14 +2093,18 @@ Node* TY_(GetToken)( TidyDocImpl* doc, GetTokenMode mode )
|| !(lexer->insert || lexer->inode)) { || !(lexer->insert || lexer->inode)) {
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning pushed token '%s'...\n", node->element ? node->element : "<blank>"); lexer_count++;
SPRTF("%d: Returning lexer node %p, '%s'...\n", lexer_count, node,
node->element ? node->element : "<blank>");
#endif #endif
return node; return node;
} }
lexer->itoken = TY_(InsertedToken)( doc ); lexer->itoken = TY_(InsertedToken)( doc );
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning inserted token '%s'...\n", node->element ? node->element : "<blank>"); insert_count++;
SPRTF("%d: Returning inserted node %p, '%s'...\n", insert_count, node,
node->element ? node->element : "<blank>");
#endif #endif
return node; return node;
} }
@ -2078,7 +2117,7 @@ Node* TY_(GetToken)( TidyDocImpl* doc, GetTokenMode mode )
lexer->token = TY_(InsertedToken)( doc ); lexer->token = TY_(InsertedToken)( doc );
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning Inserted token '%s'...\n", node->element ? node->element : "<blank>"); SPRTF("Returning INSERT node %p, '%s'...\n", node, node->element ? node->element : "<blank>");
#endif #endif
return node; return node;
} }
@ -2088,7 +2127,7 @@ Node* TY_(GetToken)( TidyDocImpl* doc, GetTokenMode mode )
assert( lexer->parent != NULL ); assert( lexer->parent != NULL );
node = GetCDATA(doc, lexer->parent); node = GetCDATA(doc, lexer->parent);
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning Cdatacontent token '%s'...\n", node->element ? node->element : "<blank>"); SPRTF("Returning Cdatacontent node %p, '%s'...\n", node, node->element ? node->element : "<blank>");
#endif #endif
return node; return node;
} }
@ -2225,7 +2264,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
#endif #endif
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning text token len %d...\n", node->end - node->start ); SPRTF("Returning text node %p, len %d...\n", node, node->end - node->start );
#endif #endif
return node; return node;
} }
@ -2456,7 +2495,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
#endif #endif
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning endtag token '%s'...\n", node->element ? node->element : "<blank>"); SPRTF("Returning endtag node %p, '%s'...\n", node, node->element ? node->element : "<blank>");
#endif #endif
return node; /* the endtag token */ return node; /* the endtag token */
@ -2534,7 +2573,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
#endif #endif
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning starttag token '%s'...\n", node->element ? node->element : "<blank>"); SPRTF("Returning starttag node %p, '%s'...\n", node, node->element ? node->element : "<blank>");
if (node->element) { if (node->element) {
//if (stricmp(node->element,"datalist") == 0) { //if (stricmp(node->element,"datalist") == 0) {
// check_me(node->element); // check_me(node->element);
@ -2584,7 +2623,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning comment token '%s'...\n", node->element ? node->element : "<blank>"); SPRTF("Returning comment node %p, '%s'...\n", node, node->element ? node->element : "<blank>");
#endif #endif
return node; return node;
} }
@ -2633,7 +2672,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
lexer->doctype = FindGivenVersion(doc, lexer->token); lexer->doctype = FindGivenVersion(doc, lexer->token);
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning doctype token '%s'...\n", node->element ? node->element : "<blank>"); SPRTF("Returning doctype node %p, '%s'...\n", node, node->element ? node->element : "<blank>");
#endif #endif
return node; return node;
@ -2719,7 +2758,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
lexer->waswhite = no; lexer->waswhite = no;
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning procinstr token '%s'...\n", node->element ? node->element : "<blank>"); SPRTF("Returning procinstr node %p, '%s'...\n", node, node->element ? node->element : "<blank>");
#endif #endif
return node; return node;
@ -2745,7 +2784,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
lexer->token = AspToken(doc); lexer->token = AspToken(doc);
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning ASP token '%s'...\n", node->element ? node->element : "<blank>"); SPRTF("Returning ASP node %p, '%s'...\n", node, node->element ? node->element : "<blank>");
#endif #endif
return node; /* the endtag token */ return node; /* the endtag token */
@ -2773,7 +2812,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
lexer->token = JsteToken(doc); lexer->token = JsteToken(doc);
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning JSTE token '%s'...\n", node->element ? node->element : "<blank>"); SPRTF("Returning JSTE node %p, '%s'...\n", node, node->element ? node->element : "<blank>");
#endif #endif
return node; /* the JSTE token */ return node; /* the JSTE token */
@ -2799,7 +2838,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
lexer->token = PhpToken(doc); lexer->token = PhpToken(doc);
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning PHP token '%s'...\n", node->element ? node->element : "<blank>"); SPRTF("Returning PHP node %p, '%s'...\n", node, node->element ? node->element : "<blank>");
#endif #endif
return node; /* the PHP token */ return node; /* the PHP token */
@ -2833,7 +2872,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
lexer->token->attributes = attributes; lexer->token->attributes = attributes;
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning xml token '%s'...\n", node->element ? node->element : "<blank>"); SPRTF("Returning xml node %p, '%s'...\n", node, node->element ? node->element : "<blank>");
#endif #endif
return node; /* the xml token */ return node; /* the xml token */
} }
@ -2865,7 +2904,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
lexer->token->attributes = attributes; lexer->token->attributes = attributes;
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning XML token '%s'...\n", node->element ? node->element : "<blank>"); SPRTF("Returning XML node %p, '%s'...\n", node, node->element ? node->element : "<blank>");
#endif #endif
return node; /* the XML token */ return node; /* the XML token */
@ -2901,7 +2940,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
lexer->token = SectionToken(doc); lexer->token = SectionToken(doc);
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning SECTION token '%s'...\n", node->element ? node->element : "<blank>"); SPRTF("Returning SECTION node %p, '%s'...\n", node, node->element ? node->element : "<blank>");
#endif #endif
return node; /* the SECTION token */ return node; /* the SECTION token */
@ -2936,7 +2975,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
lexer->token = CDATAToken(doc); lexer->token = CDATAToken(doc);
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning CDATA token '%s'...\n", node->element ? node->element : "<blank>"); SPRTF("Returning CDATA node %p, '%s'...\n", node, node->element ? node->element : "<blank>");
#endif #endif
return node; /* the CDATA token */ return node; /* the CDATA token */
} }
@ -2961,7 +3000,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
#endif #endif
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning textstring token '%s'...\n", node->element ? node->element : "<blank>"); SPRTF("Returning textstring node %p, '%s'...\n", node, node->element ? node->element : "<blank>");
#endif #endif
return node; /* the textstring token */ return node; /* the textstring token */
} }
@ -2978,7 +3017,7 @@ static Node* GetTokenFromStream( TidyDocImpl* doc, GetTokenMode mode )
lexer->token = CommentToken(doc); lexer->token = CommentToken(doc);
node = lexer->token; node = lexer->token;
#if !defined(NDEBUG) && defined(_MSC_VER) #if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("Returning COMMENT token '%s'...\n", node->element ? node->element : "<blank>"); SPRTF("Returning COMMENT node %p, '%s'...\n", node, node->element ? node->element : "<blank>");
#endif #endif
return node; /* the COMMENT token */ return node; /* the COMMENT token */
} }

12
src/localize.c
View file

@ -15,6 +15,9 @@
#include "message.h" #include "message.h"
#include "tmbstr.h" #include "tmbstr.h"
#include "utf8.h" #include "utf8.h"
#if !defined(NDEBUG) && defined(_MSC_VER)
#include "sprtf.h"
#endif
/* used to point to Web Accessibility Guidelines */ /* used to point to Web Accessibility Guidelines */
#define ACCESS_URL "http://www.w3.org/WAI/GL" #define ACCESS_URL "http://www.w3.org/WAI/GL"
@ -1046,17 +1049,26 @@ static void messagePos( TidyDocImpl* doc, TidyReportLevel level,
if ( line > 0 && col > 0 ) if ( line > 0 && col > 0 )
{ {
ReportPosition(doc, line, col, buf, sizeBuf); ReportPosition(doc, line, col, buf, sizeBuf);
#if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("%s",buf);
#else
for ( cp = buf; *cp; ++cp ) for ( cp = buf; *cp; ++cp )
TY_(WriteChar)( *cp, doc->errout ); TY_(WriteChar)( *cp, doc->errout );
#endif
} }
LevelPrefix( level, buf, sizeBuf ); LevelPrefix( level, buf, sizeBuf );
#if !defined(NDEBUG) && defined(_MSC_VER)
SPRTF("%s",buf);
SPRTF("%s\n",messageBuf);
#else
for ( cp = buf; *cp; ++cp ) for ( cp = buf; *cp; ++cp )
TY_(WriteChar)( *cp, doc->errout ); TY_(WriteChar)( *cp, doc->errout );
for ( cp = messageBuf; *cp; ++cp ) for ( cp = messageBuf; *cp; ++cp )
TY_(WriteChar)( *cp, doc->errout ); TY_(WriteChar)( *cp, doc->errout );
TY_(WriteChar)( '\n', doc->errout ); TY_(WriteChar)( '\n', doc->errout );
#endif
TidyDocFree(doc, buf); TidyDocFree(doc, buf);
} }
TidyDocFree(doc, messageBuf); TidyDocFree(doc, messageBuf);