version 1.1.1.1, 2012/02/21 23:37:58
|
version 1.1.1.2, 2013/07/22 01:22:18
|
Line 1561 xmlRelaxNGRemoveRedefine(xmlRelaxNGParserCtxtPtr ctxt,
|
Line 1561 xmlRelaxNGRemoveRedefine(xmlRelaxNGParserCtxtPtr ctxt,
|
href = xmlGetProp(tmp, BAD_CAST "href"); |
href = xmlGetProp(tmp, BAD_CAST "href"); |
#endif |
#endif |
if (xmlRelaxNGRemoveRedefine(ctxt, href, |
if (xmlRelaxNGRemoveRedefine(ctxt, href, |
inc->doc->children-> | xmlDocGetRootElement(inc->doc)->children, |
children, name) == 1) { | name) == 1) { |
found = 1; |
found = 1; |
} |
} |
#ifdef DEBUG_INCLUDE |
#ifdef DEBUG_INCLUDE |
Line 3059 xmlRelaxNGCompile(xmlRelaxNGParserCtxtPtr ctxt, xmlRel
|
Line 3059 xmlRelaxNGCompile(xmlRelaxNGParserCtxtPtr ctxt, xmlRel
|
list = list->next; |
list = list->next; |
} |
} |
xmlAutomataSetFinalState(ctxt->am, ctxt->state); |
xmlAutomataSetFinalState(ctxt->am, ctxt->state); |
def->contModel = xmlAutomataCompile(ctxt->am); | if (xmlAutomataIsDeterminist(ctxt->am)) |
xmlRegexpIsDeterminist(def->contModel); | def->contModel = xmlAutomataCompile(ctxt->am); |
|
|
xmlFreeAutomata(ctxt->am); |
xmlFreeAutomata(ctxt->am); |
ctxt->state = oldstate; |
ctxt->state = oldstate; |
Line 8884 xmlRelaxNGValidateValue(xmlRelaxNGValidCtxtPtr ctxt,
|
Line 8884 xmlRelaxNGValidateValue(xmlRelaxNGValidCtxtPtr ctxt,
|
case XML_RELAXNG_ZEROORMORE:{ |
case XML_RELAXNG_ZEROORMORE:{ |
xmlChar *cur, *temp; |
xmlChar *cur, *temp; |
|
|
|
if ((ctxt->state->value == NULL) || |
|
(*ctxt->state->value == 0)) { |
|
ret = 0; |
|
break; |
|
} |
oldflags = ctxt->flags; |
oldflags = ctxt->flags; |
ctxt->flags |= FLAGS_IGNORABLE; |
ctxt->flags |= FLAGS_IGNORABLE; |
cur = ctxt->state->value; |
cur = ctxt->state->value; |
Line 8901 xmlRelaxNGValidateValue(xmlRelaxNGValidCtxtPtr ctxt,
|
Line 8906 xmlRelaxNGValidateValue(xmlRelaxNGValidCtxtPtr ctxt,
|
cur = ctxt->state->value; |
cur = ctxt->state->value; |
} |
} |
ctxt->flags = oldflags; |
ctxt->flags = oldflags; |
|
if (ctxt->errNr > 0) |
|
xmlRelaxNGPopErrors(ctxt, 0); |
|
break; |
|
} |
|
case XML_RELAXNG_OPTIONAL:{ |
|
xmlChar *temp; |
|
|
|
if ((ctxt->state->value == NULL) || |
|
(*ctxt->state->value == 0)) { |
|
ret = 0; |
|
break; |
|
} |
|
oldflags = ctxt->flags; |
|
ctxt->flags |= FLAGS_IGNORABLE; |
|
temp = ctxt->state->value; |
|
ret = xmlRelaxNGValidateValue(ctxt, define->content); |
|
ctxt->flags = oldflags; |
|
if (ret != 0) { |
|
ctxt->state->value = temp; |
|
if (ctxt->errNr > 0) |
|
xmlRelaxNGPopErrors(ctxt, 0); |
|
ret = 0; |
|
break; |
|
} |
if (ctxt->errNr > 0) |
if (ctxt->errNr > 0) |
xmlRelaxNGPopErrors(ctxt, 0); |
xmlRelaxNGPopErrors(ctxt, 0); |
break; |
break; |