c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed xsd:all when used in conjunction with substitution groups adding

Browse Source 
* xmlschemas.c: fixed xsd:all when used in conjunction with
  substitution groups
* test/schemas/allsg_* result/schemas/allsg_*: adding specific
  regression tests, strangely missing from NIST/Sun/Microsoft
  testsuites
Daniel
This commit is contained in:
Daniel Veillard 2005-07-18 21:34:03 +00:00
parent afc05b6871
commit a980befc8f
21 changed files with 205 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Mon Jul 18 20:49:28 CEST 2005 Daniel Veillard <daniel@veillard.com>
* xmlschemas.c: fixed xsd:all when used in conjunction with
substitution groups
* test/schemas/allsg_* result/schemas/allsg_*: adding specific
regression tests, strangely missing from NIST/Sun/Microsoft
testsuites
Sun Jul 17 07:11:27 CEST 2005 Daniel Veillard <daniel@veillard.com>
* xmlschemas.c: fixed bug #307508, a bad automata was built but

1
result/schemas/allsg_0_0 Normal file
View File

@ -0,0 +1 @@
./test/schemas/allsg_0.xml validates

0
result/schemas/allsg_0_0.err Normal file
View File

1
result/schemas/allsg_0_1 Normal file
View File

@ -0,0 +1 @@
./test/schemas/allsg_1.xml validates

0
result/schemas/allsg_0_1.err Normal file
View File

1
result/schemas/allsg_0_2 Normal file
View File

@ -0,0 +1 @@
./test/schemas/allsg_2.xml validates

0
result/schemas/allsg_0_2.err Normal file
View File

1
result/schemas/allsg_0_3 Normal file
View File

@ -0,0 +1 @@
./test/schemas/allsg_3.xml fails to validate

1
result/schemas/allsg_0_3.err Normal file
View File

@ -0,0 +1 @@
./test/schemas/allsg_3.xml:6: element gm-B-1: Schemas validity error : Element '{urn:test:foo}gm-B-1': This element is not expected. Expected is one of ( {urn:test:foo}gh-A, {urn:test:foo}gm-A-2, {urn:test:foo}gm-A-1 ).

1
result/schemas/allsg_0_4 Normal file
View File

@ -0,0 +1 @@
./test/schemas/allsg_4.xml fails to validate

1
result/schemas/allsg_0_4.err Normal file
View File

@ -0,0 +1 @@
./test/schemas/allsg_4.xml:6: element gm-A-1: Schemas validity error : Element '{urn:test:foo}gm-A-1': This element is not expected. Expected is one of ( {urn:test:foo}gh-B, {urn:test:foo}gm-B-2, {urn:test:foo}gm-B-1 ).

1
result/schemas/allsg_0_5 Normal file
View File

@ -0,0 +1 @@
./test/schemas/allsg_5.xml fails to validate

1
result/schemas/allsg_0_5.err Normal file
View File

@ -0,0 +1 @@
./test/schemas/allsg_5.xml:7: element gm-B-2: Schemas validity error : Element '{urn:test:foo}gm-B-2': This element is not expected.

7
test/schemas/allsg_0.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0"?>
<foo xmlns="urn:test:foo"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:test:foo sg-all.xsd">
<gm-B-2/>
<gm-A-1/>
</foo>

26
test/schemas/allsg_0.xsd Normal file
View File

@ -0,0 +1,26 @@
<?xml version="1.0"?>
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
targetNamespace="urn:test:foo"
xmlns:foo="urn:test:foo">
<!-- Substitution group heads. -->
<xsd:element name="gh-A" abstract="true"/>
<xsd:element name="gh-B" abstract="true"/>
<!-- Substitution group members. -->
<xsd:element name="gm-A-1" substitutionGroup="foo:gh-A"/>
<xsd:element name="gm-A-2" substitutionGroup="foo:gh-A"/>
<xsd:element name="gm-B-1" substitutionGroup="foo:gh-B"/>
<xsd:element name="gm-B-2" substitutionGroup="foo:gh-B"/>
<xsd:element name="foo">
<xsd:complexType>
<xsd:all>
<xsd:element ref="foo:gh-A"/>
<xsd:element ref="foo:gh-B"/>
</xsd:all>
</xsd:complexType>
</xsd:element>
</xsd:schema>

8
test/schemas/allsg_1.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0"?>
<foo xmlns="urn:test:foo"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:test:foo sg-all.xsd">
<gm-B-2/>
<gm-A-2/>
</foo>

8
test/schemas/allsg_2.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0"?>
<foo xmlns="urn:test:foo"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:test:foo sg-all.xsd">
<gm-A-2/>
<gm-B-2/>
</foo>

7
test/schemas/allsg_3.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0"?>
<foo xmlns="urn:test:foo"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:test:foo sg-all.xsd">
<gm-B-2/>
<gm-B-1/>
</foo>

7
test/schemas/allsg_4.xml Normal file
View File

@ -0,0 +1,7 @@
<?xml version="1.0"?>
<foo xmlns="urn:test:foo"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:test:foo sg-all.xsd">
<gm-A-1/>
<gm-A-1/>
</foo>

8
test/schemas/allsg_5.xml Normal file
View File

@ -0,0 +1,8 @@
<?xml version="1.0"?>
<foo xmlns="urn:test:foo"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:test:foo sg-all.xsd">
<gm-B-1/>
<gm-A-2/>
<gm-B-2/>
</foo>

152
xmlschemas.c
View File

@ -10878,11 +10878,10 @@ xmlSchemaFreeParserCtxt(xmlSchemaParserCtxtPtr ctxt)
static void
xmlSchemaBuildContentModelForSubstGroup(xmlSchemaParserCtxtPtr pctxt,
xmlSchemaParticlePtr particle)
xmlSchemaParticlePtr particle, int counter, xmlAutomataStatePtr end)
{
xmlAutomataStatePtr start;
xmlAutomataStatePtr start, tmp;
xmlSchemaElementPtr elemDecl, member;
xmlAutomataStatePtr end;
xmlSchemaSubstGroupPtr substGroup;
int i;
@ -10891,7 +10890,8 @@ xmlSchemaBuildContentModelForSubstGroup(xmlSchemaParserCtxtPtr pctxt,
* Wrap the substitution group with a CHOICE.
*/
start = pctxt->state;
end = xmlAutomataNewState(pctxt->am);
if (end == NULL)
end = xmlAutomataNewState(pctxt->am);
substGroup = xmlSchemaGetElementSubstitutionGroup(pctxt, elemDecl);
if (substGroup == NULL) {
xmlSchemaPErr(pctxt, GET_NODE(particle),
@ -10901,7 +10901,22 @@ xmlSchemaBuildContentModelForSubstGroup(xmlSchemaParserCtxtPtr pctxt,
"available.\n", elemDecl->name, NULL);
return;
}
if (particle->maxOccurs == 1) {
if (counter >= 0) {
/*
* NOTE that we put the declaration in, even if it's abstract,
*/
tmp = xmlAutomataNewCountedTrans(pctxt->am, start, NULL, counter);
xmlAutomataNewTransition2(pctxt->am, tmp, end,
elemDecl->name, elemDecl->targetNamespace, elemDecl);
/*
* Add subst. group members.
*/
for (i = 0; i < substGroup->members->nbItems; i++) {
member = (xmlSchemaElementPtr) substGroup->members->items[i];
xmlAutomataNewTransition2(pctxt->am, tmp, end,
member->name, member->targetNamespace, member);
}
} else if (particle->maxOccurs == 1) {
/*
* NOTE that we put the declaration in, even if it's abstract,
*/
@ -10914,14 +10929,12 @@ xmlSchemaBuildContentModelForSubstGroup(xmlSchemaParserCtxtPtr pctxt,
*/
for (i = 0; i < substGroup->members->nbItems; i++) {
member = (xmlSchemaElementPtr) substGroup->members->items[i];
xmlAutomataNewEpsilon(pctxt->am,
xmlAutomataNewTransition2(pctxt->am,
start, NULL,
member->name, member->targetNamespace, member),
end);
tmp = xmlAutomataNewOnceTrans2(pctxt->am, start, NULL,
member->name, member->targetNamespace,
1, 1, member);
xmlAutomataNewEpsilon(pctxt->am, tmp, end);
}
} else {
int counter;
xmlAutomataStatePtr hop;
int maxOccurs = particle->maxOccurs == UNBOUNDED ?
UNBOUNDED : particle->maxOccurs - 1;
@ -10938,8 +10951,8 @@ xmlSchemaBuildContentModelForSubstGroup(xmlSchemaParserCtxtPtr pctxt,
elemDecl->name, elemDecl->targetNamespace, elemDecl),
hop);
/*
* Add subst. group members.
*/
* Add subst. group members.
*/
for (i = 0; i < substGroup->members->nbItems; i++) {
member = (xmlSchemaElementPtr) substGroup->members->items[i];
xmlAutomataNewEpsilon(pctxt->am,
@ -10965,7 +10978,7 @@ xmlSchemaBuildContentModelForElement(xmlSchemaParserCtxtPtr ctxt,
/*
* Substitution groups.
*/
xmlSchemaBuildContentModelForSubstGroup(ctxt, particle);
xmlSchemaBuildContentModelForSubstGroup(ctxt, particle, -1, NULL);
} else {
xmlSchemaElementPtr elemDecl;
xmlAutomataStatePtr start;
@ -10977,8 +10990,9 @@ xmlSchemaBuildContentModelForElement(xmlSchemaParserCtxtPtr ctxt,
if (particle->maxOccurs == 1) {
start = ctxt->state;
ctxt->state = xmlAutomataNewTransition2(ctxt->am, start, NULL,
elemDecl->name, elemDecl->targetNamespace, elemDecl);
} else if ((particle->maxOccurs >= UNBOUNDED) && (particle->minOccurs < 2)) {
elemDecl->name, elemDecl->targetNamespace, elemDecl);
} else if ((particle->maxOccurs >= UNBOUNDED) &&
(particle->minOccurs < 2)) {
/* Special case. */
start = ctxt->state;
ctxt->state = xmlAutomataNewTransition2(ctxt->am, start, NULL,
@ -11294,7 +11308,7 @@ xmlSchemaBuildAContentModel(xmlSchemaParserCtxtPtr ctxt,
(xmlSchemaParticlePtr) sub, name);
xmlAutomataNewEpsilon(ctxt->am, ctxt->state, hop);
sub = sub->next;
/* DVDVDV */ }
}
xmlAutomataNewEpsilon(ctxt->am, start, base);
xmlAutomataNewCountedTrans(ctxt->am, hop, base, counter);
xmlAutomataNewCounterTrans(ctxt->am, hop, end, counter);
@ -11306,7 +11320,7 @@ xmlSchemaBuildAContentModel(xmlSchemaParserCtxtPtr ctxt,
break;
}
case XML_SCHEMA_TYPE_ALL:{
xmlAutomataStatePtr start;
xmlAutomataStatePtr start, hop;
xmlSchemaParticlePtr sub;
xmlSchemaElementPtr elemDecl;
int lax;
@ -11332,30 +11346,98 @@ xmlSchemaBuildAContentModel(xmlSchemaParserCtxtPtr ctxt,
* already ensured during the parse of the content of
* <all>.
*/
if ((sub->minOccurs == 1) &&
(sub->maxOccurs == 1)) {
xmlAutomataNewOnceTrans2(ctxt->am, ctxt->state,
ctxt->state,
elemDecl->name,
elemDecl->targetNamespace,
1, 1, elemDecl);
} else if ((sub->minOccurs == 0) &&
(sub->maxOccurs == 1)) {
if (elemDecl->flags & XML_SCHEMAS_ELEM_SUBST_GROUP_HEAD) {
int counter;
xmlAutomataNewCountTrans2(ctxt->am, ctxt->state,
ctxt->state,
elemDecl->name,
elemDecl->targetNamespace,
0,
1,
elemDecl);
}
/*
* This is an abstract group, we need to share
* the same counter for all the element transitions
* derived from the group
*/
counter = xmlAutomataNewCounter(ctxt->am,
sub->minOccurs, sub->maxOccurs);
xmlSchemaBuildContentModelForSubstGroup(ctxt,
sub, counter, ctxt->state);
} else {
if ((sub->minOccurs == 1) &&
(sub->maxOccurs == 1)) {
xmlAutomataNewOnceTrans2(ctxt->am, ctxt->state,
ctxt->state,
elemDecl->name,
elemDecl->targetNamespace,
1, 1, elemDecl);
} else if ((sub->minOccurs == 0) &&
(sub->maxOccurs == 1)) {
xmlAutomataNewCountTrans2(ctxt->am, ctxt->state,
ctxt->state,
elemDecl->name,
elemDecl->targetNamespace,
0,
1,
elemDecl);
}
}
sub = (xmlSchemaParticlePtr) sub->next;
}
lax = particle->minOccurs == 0;
ctxt->state =
xmlAutomataNewAllTrans(ctxt->am, ctxt->state, NULL, lax);
break;
#if 0
xmlAutomataStatePtr start, end, base;
xmlSchemaParticlePtr sub;
xmlSchemaElementPtr elemDecl;
int nbtrans = 0;
int lax = particle->minOccurs == 0;
int counter = -1;
sub = (xmlSchemaParticlePtr) particle->children->children;
if (sub == NULL)
break;
start = ctxt->state;
end = xmlAutomataNewState(ctxt->am);
base = xmlAutomataNewState(ctxt->am);
xmlAutomataNewEpsilon(ctxt->am, start, base);
if (!lax) {
while (sub != NULL) {
sub = (xmlSchemaParticlePtr) sub->next;
nbtrans++;
}
sub = (xmlSchemaParticlePtr) particle->children->children;
nbtrans--;
counter = xmlAutomataNewCounter(ctxt->am, nbtrans, nbtrans);
}
while (sub != NULL) {
ctxt->state = base;
elemDecl = (xmlSchemaElementPtr) sub->children;
if (elemDecl == NULL) {
xmlSchemaPErr(ctxt, NULL,
XML_SCHEMAP_INTERNAL,
"Internal error: xmlSchemaBuildAContentModel, "
"<element> particle a NULL term.\n", NULL, NULL);
return;
};
xmlSchemaBuildContentModelForElement(ctxt,
(xmlSchemaParticlePtr) sub, 1);
if (lax) {
xmlAutomataNewEpsilon(ctxt->am, ctxt->state, base);
xmlAutomataNewEpsilon(ctxt->am, ctxt->state, end);
} else {
xmlAutomataNewCountedTrans(ctxt->am, ctxt->state,
base, counter);
xmlAutomataNewCounterTrans(ctxt->am, ctxt->state,
end, counter);
}
sub = (xmlSchemaParticlePtr) sub->next;
}
ctxt->state = end;
break;
#endif
}
default:
xmlGenericError(xmlGenericErrorContext,