lib/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2.git synced 2025-07-29 11:41:22 +03:00
Code Activity

- valid.c test/VCM/v2[34].xml: Fixed bug #54631 added specific test

Browse Source 
case
- INSTALL: was empty added stuff from the FAQ
Daniel
This commit is contained in:
Daniel Veillard
2001-05-15 08:53:16 +00:00
parent a265af7988
commit e62d36c4fd
5 changed files with 99 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
valid.c
View File

@ -23,6 +23,8 @@
#include <libxml/xmlerror.h>
#include <libxml/list.h>
/* #define DEBUG_VALID_ALGO */
/*
* Generic function for accessing stacks in the Validity Context
*/
@ -137,8 +139,6 @@ vstateVPop(xmlValidCtxtPtr ctxt) {
PUSH_AND_POP(static, xmlNodePtr, node)
/* #define DEBUG_VALID_ALGO */
#ifdef DEBUG_VALID_ALGO
static void
xmlValidPrintNode(xmlNodePtr cur) {
@ -3278,7 +3278,6 @@ xmlValidateSkipIgnorable(xmlNodePtr child) {
static int
xmlValidateElementType(xmlValidCtxtPtr ctxt) {
int ret = -1;
int consumed = 1;
int determinist = 1;
NODE = xmlValidateSkipIgnorable(NODE);
@ -3306,7 +3305,6 @@ cont:
DEBUG_VALID_MSG("restaured parent branch");
DEBUG_VALID_STATE(NODE, CONT)
ret = 1;
consumed = 0;
goto analyze;
}
@ -3315,8 +3313,7 @@ cont:
* we may have to save a backup state here. This is the equivalent
* of handling epsilon transition in NFAs.
*/
if ((consumed) && (CONT != NULL) &&
(CONT->parent != NULL) &&
if ((CONT != NULL) &&
((CONT->ocur == XML_ELEMENT_CONTENT_MULT) ||
(CONT->ocur == XML_ELEMENT_CONTENT_OPT) ||
((CONT->ocur == XML_ELEMENT_CONTENT_PLUS) && (OCCURENCE)))) {
@ -3350,7 +3347,6 @@ cont:
} while ((NODE != NULL) &&
((NODE->type != XML_ELEMENT_NODE) &&
(NODE->type != XML_TEXT_NODE)));
consumed = 1;
ret = 1;
break;
} else {
@ -3381,7 +3377,6 @@ cont:
} while ((NODE != NULL) &&
((NODE->type != XML_ELEMENT_NODE) &&
(NODE->type != XML_TEXT_NODE)));
consumed = 1;
} else {
DEBUG_VALID_MSG("element failed");
ret = 0;
@ -3442,7 +3437,6 @@ analyze:
}
if (cur != ctxt->vstate->node)
determinist = -3;
consumed = 0;
goto cont;
case XML_ELEMENT_CONTENT_PLUS:
if (OCCURENCE == 0) {
@ -3454,7 +3448,6 @@ analyze:
}
if (cur != ctxt->vstate->node)
determinist = -3;
consumed = 0;
goto cont;
}
DEBUG_VALID_MSG("Plus branch found");
@ -3569,7 +3562,6 @@ analyze:
}
if (cur != ctxt->vstate->node)
determinist = -3;
consumed = 0;
goto cont;
}
if (ret == 0) {
@ -3581,7 +3573,6 @@ analyze:
DEBUG_VALID_MSG("exhaustion, failed");
return(0);
}
consumed = 0;
if (cur != ctxt->vstate->node)
determinist = -3;
goto cont;