Originally this implementation checked recursion based on RELAX NG-inspired
algorithm explained at http://www.thaiopensource.com/relaxng/simplify.html.
This works only for "simple" syntax, which premises that every <element> is
defined under top-level <define> element. XML Schema doesn't follow this
and could result in infinite loop like reported.
The latest REC-xmlschema-1 denotes the explicit rule on illegal recursion
on 3.8.6 (Model Group Correct) as:
2 Circular groups are disallowed. That is, within the {particles} of a group there must not be at any depth a particle whose {term} is the group itself.
... so, I simply replaced the checker with simple Stack.
(oh, and for old Stack I haven't bothered to replace non-generic collection
everywhere. XSD is as dead as System.Collection.)
* XmlSchema.cs : Raise warning event when external schema could not
be resolved.
* XmlSchemaAll.cs : Fixed incorrect IsEmptiable computation.
* XmlSchemaAny.cs : Fixed incorrect occurence computation.
* XmlSchemaChoice.cs : compiledItems were incorrectly appended.
* XmlSchemaComplexType.cs : Now validatableParticle became extraneous.
* XmlSchemaGroupBase.cs : Here we should not get optimized particle
because it might cause infinite loop.
* XmlSchemaGroupRef.cs : Fixed Validate() to avoid null reference
exception (only occur with ValidationEventHandler). Fixed Occurence
embedding logic that was useless because of particle optimization.
svn path=/trunk/mcs/; revision=22507
* XmlSchema.cs :
- Removed extra property Language. Fill substitution-group info
before ContentTypeParticle is computed.
* XmlSchemaComplexType.cs : ContentType and ContentTypeParticle are
now computer before Validate() (to exclude 3.4.2 from 3.4.6
component constraint check).
* XmlSchemaObject.cs, XmlSchemaParticle.cs :
Added CopyInfo() for cloning objects.
* XmlSchemaObjectTable.cs :
Add() doesn't have to reject same named items.
* XmlSchemaParticle.cs :
- Renamed internal class XmlSchemaParticleEmpty to EmptyParticle
(for ease of post compilation infoset comparison).
- GetMinEffectiveTotalRange() should return max occurs for element and
any.
* XmlSchemaParticle.cs,
XmlSchemaAll.cs,
XmlSchemaAny.cs,
XmlSchemaChoice.cs,
XmlSchemaElement.cs,
XmlSchemaGroupBase.cs,
XmlSchemaGroupRef.cs,
XmlSchemaSequence.cs :
- Removed ActualParticle property.
- Added GetOptimizedParticle() to get ContentTypeParticle.
- ContentTypeParticle is now created as different object from
user-specified "Particle" property.
- Return Empty particle when model groups contains no Items.
- When Items contains exactly 1 item, return the item (unless it is
top level choice model group - it causes DBR problem).
- ValidateDerivationValidRestriction() and related WXS 3.9.6 DBR
check methods such as ValidateNSRecurseCheckCardinality() now
returns a bool value and avoids exceptions on each failure time.
- ValidateRecurse() now doesn't progress base particle incorrectly.
(it caused incorrect order-preserving-mapping error.)
- 3.9.6 Recurse, RecurseLax, MapAndSum are now treated as different.
* XmlSchemaAll.cs : occurence validation shoud be done against values
after computation (ValidatedMaxOccurs).
* XmlSchemaChoice.cs : When Items is empty, then invoke warning event.
* XmlSchemaElement.cs :
- Consider referencedElement also for SubstitutionGroupElement.
- Removed SubstitutingChoice which is not in use.
- when it was targeted as substitution group by other elements, its
ContentTypeParticle should be substitution choice (see 3.9.6
Particle Valid (Restriction) term 2.1).
- Added FillsubstitutionElementInfo() (see XmlSchema.cs above).
* XmlSchemaGroup.cs : Removed extra check on model group (because it
is impossible to specify non-model-group particle).
* XmlSchemaIdentityConstraint.cs,
XmlSchemaKey.cs,
XmlSchemaKeyRef.cs,
XmlSchemaUnique.cs : Removed extraneous MonoTODO.
* XmlSchemaSimpleContent.cs : Made actualSchemaType as internal.
* XmlSchemaSimpleType.cs : Removed extraneous new Datatype property.
* XmlSchemaSimpleTypeRestriction.cs : Renamed actualBaseSchemaType to
ActualBaseSchemaType.
* XmlSchemaSimpleTypeList.cs, XmlSchemaSimpleTypeUnion.cs :
Removed unused actualBaseSchemaType code.
* XmlSchemaType.cs : use recently introduced BaseXmlSchemaType.
* XmlSchemaUtil.cs : Removed unused CheckLanguage().
svn path=/trunk/mcs/; revision=22323
* XmlSchemaSet.cs : implemented some members.
* XmlSchemaCollection.cs : modified to use internal schema set (This
class provides more precise schema validation feature and will be
commonly used for XPathNavigator2).
Added .NET 1.1 .ctor() which takes XmlResolver.
* XmlSchema.cs : fix related to above changes.
Use validation event handler on Read() at all required places.
Added .NET 1.1 .ctor() which takes XmlResolver.
* XmlSchemaComplexType.cs : content type comparison was incorrect.
Renamed confusing method.
* XmlSchemaElement.cs : don't use ContentTypeParticle in
CheckRecursion(), where that property might not be determined yet.
* XmlSchemaGroupBase.cs : Modified ValidateRecurse() a bit (currently
no effect)
* XmlSchemaGroupBase.cs,
XmlSchemaChoice.cs,
XmlSchemaAll.cs,
XmlSchemaSequence.cs : moved CheckRecursion to XmlSchemaGroupBase.
* XmlSchemaObjectTable.cs : Fixed missing error info.
* BUGS-MS.txt : Added info a bit.
svn path=/trunk/mcs/; revision=21880
* BUGS-MS.txt : added list derivation and facet case.
* XmlSchemaComplexType.cs :
Added some description. Avoided null reference exception in
some places.
Fixed incorrect 3.4.6 Derivation Valid (Extension) 1.4.1.2.2 and
3.9.6 Particle Valid (Extension) 2.
* XmlSchemaGroupBase.cs : Fixed ParticleEquals() which didn't work
properly against sequence and all.
svn path=/trunk/mcs/; revision=21842
* BuiltInDatatype.cs : XsdByte was incorrectly typed as byte, while
the correct binding is sbyte.
* XmlSchemaAll.cs,
XmlSchemaChoice.cs,
XmlSchemaSequence.cs,
XmlSchemaGroupBase.cs : ActualParticle now considers pointlessness
described in WXS structures 3.9.6.
Added ValidateRecurse() to support 'Recurse' validation.
* XmlSchemaComplexType.cs : Removed incorrect content type conformity
check.
* XmlSchemaElement.cs : Implemented 'RecurseAsIfGroup' validation
described in WXS structures 3.9.6. Fixed type derivation check to
do only if the base type is not anyType.
* XmlSchemaSimpleTypeRestriction.cs : Should catch Regex()
construction exception. ValidateList... and ValidateNonList... was
in reverse.
* XmlSchemaUtil.cs : Removed extra MonoTODO. Removed CheckToken().
svn path=/trunk/mcs/; revision=19385
* XmlSchemaAll.cs,
XmlSchemaChoice.cs,
XmlSchemaGroupBase.cs,
XmlSchemaSequence.cs : Now CompiledItems went to XmlSchemaGroupBase.
* XmlSchemaAny.cs,
XmlSchemaElement.cs,
XmlSchemaGroupBase.cs,
XmlSchemaGroupRef.cs,
XmlSchemaParticle.cs,
XmlSchemaSequence.cs : Added ParticleEquals() method to compare
whether the particles are equal in the context of WXS part 1 - 3.9.6.
* XmlSchemaAny.cs : Implemented ValidateDerivationByRestriction().
* XmlSchemaAnyAttribute.cs : Removed extraneous lines and added my
responsibility on this class.
Added ValidateWildcardAllowsNamespaceName().
* XmlSchemaAttribute.cs : Added ValidatedUse which holds post-
compilation value of "Use".
* XmlSchemaAttributeGroup.cs,
XmlSchemaAttributeGroupRef.cs : Removed MonoTODO (same as some other
classes) since there is no more errors on attribute stuff ;-)
* XmlSchemaComplexType.cs : complex content extension must block
derivation from any built-in primitive types.
Fixed wildcard derivation by restriction.
ValidateDerivationByRestriction() now checks attribute related
validity of DBR (derivation by restriction).
Now uses ParticleEquals() for particle DBR check.
* XmlSchemaSequence.cs : Fixed to use CompiledItems instead of Items.
svn path=/trunk/mcs/; revision=19347
* XmlSchema: The Read and Write methods are no more [MonoTODO] :)
* XmlSchemaAppInfo: Xml Markup is now being read.
* XmlSchemaDocumentation: Xml Markup is now being read.
* All: Unhandled attributes are being handled properly.
* All: Reordered the properties in all cs files to match with MS
Implementation. This was required since the order is importatnt
for the XmlSerializer.
svn path=/trunk/mcs/; revision=5322