Commit 60929625 authored by William M. Brack's avatar William M. Brack
Browse files

fixed problem with IS_COMPILABLE flag (bug 130216)

* relaxng.c: fixed problem with IS_COMPILABLE flag
  (bug 130216)
parent f8e66680
Sat Mar 27 09:56:14 PST 2004 William Brack <wbrack@mmm.com.hk>
* relaxng.c: fixed problem with IS_COMPILABLE flag
(bug 130216)
Fri Mar 26 18:28:32 CET 2004 Daniel Veillard <daniel@veillard.com>
 
* parser.c: applied patch from Dave Beckett to correct line number
......
......@@ -2340,7 +2340,8 @@ xmlRelaxNGAddValidError(xmlRelaxNGValidCtxtPtr ctxt,
/*
* generate the error directly
*/
if (((ctxt->flags & 1) == 0) || (ctxt->flags & 2)) {
if (((ctxt->flags & FLAGS_IGNORABLE) == 0) ||
(ctxt->flags & FLAGS_NEGATIVE)) {
xmlNodePtr node, seq;
/*
......@@ -2880,9 +2881,15 @@ xmlRelaxNGIsCompileable(xmlRelaxNGDefinePtr def)
break;
list = list->next;
}
if (ret == 0)
/*
* Because the routine is recursive, we must guard against
* discovering both COMPILABLE and NOT_COMPILABLE
*/
if (ret == 0) {
def->dflags &= ~IS_COMPILABLE;
def->dflags |= IS_NOT_COMPILABLE;
if (ret == 1)
}
if ((ret == 1) && !(def->dflags &= IS_NOT_COMPILABLE))
def->dflags |= IS_COMPILABLE;
#ifdef DEBUG_COMPILE
if (ret == 1) {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment