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

enhanced the enhancement, fixed another couple of special cases.

* parser.c: enhanced the enhancement, fixed another couple of
  special cases.
parent eb8509c2
Fri May 14 12:37:24 HKT 2004 William Brack <wbrack@mmm.com.hk>
* parser.c: enhanced the enhancement, fixed another couple of
special cases.
Fri May 14 11:48:33 HKT 2004 William Brack <wbrack@mmm.com.hk>
 
* parser.c: small enhancement to dtd handling of (a?)+ (bug 142487)
......
......@@ -4794,8 +4794,13 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
}
NEXT;
if (RAW == '?') {
if (ret != NULL)
ret->ocur = XML_ELEMENT_CONTENT_OPT;
if (ret != NULL) {
if ((ret->ocur == XML_ELEMENT_CONTENT_PLUS) ||
(ret->ocur == XML_ELEMENT_CONTENT_MULT))
ret->ocur = XML_ELEMENT_CONTENT_MULT;
else
ret->ocur = XML_ELEMENT_CONTENT_OPT;
}
NEXT;
} else if (RAW == '*') {
if (ret != NULL) {
......@@ -4822,8 +4827,9 @@ xmlParseElementChildrenContentDecl (xmlParserCtxtPtr ctxt, int inputchk) {
if (ret != NULL) {
int found = 0;
if (ret->ocur == XML_ELEMENT_CONTENT_OPT)
ret->ocur == XML_ELEMENT_CONTENT_MULT;
if ((ret->ocur == XML_ELEMENT_CONTENT_OPT) ||
(ret->ocur == XML_ELEMENT_CONTENT_MULT))
ret->ocur = XML_ELEMENT_CONTENT_MULT;
else
ret->ocur = XML_ELEMENT_CONTENT_PLUS;
/*
......
Markdown is supported
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