fixed bug #307508, a bad automata was built but this showed as an
* xmlschemas.c: fixed bug #307508, a bad automata was built but
this showed as an indeterminist result
Daniel
diff --git a/ChangeLog b/ChangeLog
index c300752..947a0b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jul 17 07:11:27 CEST 2005 Daniel Veillard <daniel@veillard.com>
+
+ * xmlschemas.c: fixed bug #307508, a bad automata was built but
+ this showed as an indeterminist result
+
Thu Jul 14 17:53:02 CEST 2005 Daniel Veillard <daniel@veillard.com>
* xmlschemastypes.c: found the last bug raised by NIST tests in
diff --git a/xmlschemas.c b/xmlschemas.c
index 4411f39..45b79be 100644
--- a/xmlschemas.c
+++ b/xmlschemas.c
@@ -11182,6 +11182,10 @@
NULL, counter);
} else {
+ ctxt->state = xmlAutomataNewEpsilon(ctxt->am,
+ oldstate, NULL);
+ oldstate = ctxt->state;
+
sub = particle->children->children;
while (sub != NULL) {
xmlSchemaBuildAContentModel(ctxt,
@@ -11190,6 +11194,13 @@
}
xmlAutomataNewEpsilon(ctxt->am, ctxt->state,
oldstate);
+ /*
+ * epsilon needed to block previous trans from
+ * being allowed to enter back from another
+ * construct
+ */
+ ctxt->state = xmlAutomataNewEpsilon(ctxt->am,
+ ctxt->state, NULL);
if (particle->minOccurs == 0) {
xmlAutomataNewEpsilon(ctxt->am,
oldstate, ctxt->state);
@@ -11261,7 +11272,7 @@
}
} else {
int counter;
- xmlAutomataStatePtr hop;
+ xmlAutomataStatePtr hop, base;
int maxOccurs = particle->maxOccurs == UNBOUNDED ?
UNBOUNDED : particle->maxOccurs - 1;
int minOccurs =
@@ -11272,22 +11283,21 @@
* which went through the choice.
*/
counter =
- xmlAutomataNewCounter(ctxt->am, minOccurs,
- maxOccurs);
+ xmlAutomataNewCounter(ctxt->am, minOccurs, maxOccurs);
hop = xmlAutomataNewState(ctxt->am);
+ base = xmlAutomataNewState(ctxt->am);
sub = particle->children->children;
while (sub != NULL) {
- ctxt->state = start;
+ ctxt->state = base;
xmlSchemaBuildAContentModel(ctxt,
(xmlSchemaParticlePtr) sub, name);
xmlAutomataNewEpsilon(ctxt->am, ctxt->state, hop);
sub = sub->next;
- }
- xmlAutomataNewCountedTrans(ctxt->am, hop, start,
- counter);
- xmlAutomataNewCounterTrans(ctxt->am, hop, end,
- counter);
+/* DVDVDV */ }
+ xmlAutomataNewEpsilon(ctxt->am, start, base);
+ xmlAutomataNewCountedTrans(ctxt->am, hop, base, counter);
+ xmlAutomataNewCounterTrans(ctxt->am, hop, end, counter);
}
if (particle->minOccurs == 0) {
xmlAutomataNewEpsilon(ctxt->am, start, end);
@@ -24267,7 +24277,7 @@
*/
static void
-warningSplit(void *ctx, const char *msg, ...) {
+warningSplit(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) {
xmlSchemaSAXPlugPtr ctxt = (xmlSchemaSAXPlugPtr) ctx;
if ((ctxt != NULL) && (ctxt->user_sax != NULL) &&
(ctxt->user_sax->warning != NULL)) {
@@ -24275,7 +24285,7 @@
}
}
static void
-errorSplit(void *ctx, const char *msg, ...) {
+errorSplit(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) {
xmlSchemaSAXPlugPtr ctxt = (xmlSchemaSAXPlugPtr) ctx;
if ((ctxt != NULL) && (ctxt->user_sax != NULL) &&
(ctxt->user_sax->error != NULL)) {
@@ -24283,7 +24293,7 @@
}
}
static void
-fatalErrorSplit(void *ctx, const char *msg, ...) {
+fatalErrorSplit(void *ctx, const char *msg ATTRIBUTE_UNUSED, ...) {
xmlSchemaSAXPlugPtr ctxt = (xmlSchemaSAXPlugPtr) ctx;
if ((ctxt != NULL) && (ctxt->user_sax != NULL) &&
(ctxt->user_sax->fatalError != NULL)) {