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 XmlSchemaGroup.cs XmlSchemaAny.cs XmlSchemaElement.cs
XmlSchemaNotation.cs XmlSchemaComplexType.cs
XmlSchemaAttributeGroup.cs XmlSchemaSimpleType.cs
XmlSchemaIdentityConstraint.cs XmlSchemaAnyAttribute.cs
XmlSchemaRedefine.cs XmlSchemaAttribute.cs :
avoid incorrect compilation of included schemas, fixed bug #81360.
more fix for wrong targetNamespace propagation within current
processing model. Replaced ParentIsSchema field with a property.
* XsdValidatingReaderTests.cs : added test for bug #81360.
* 81360.xsd, 81360inc1.xsd, 81360inc2.xsd : new test files.
* Makefile : added distfiles.
svn path=/trunk/mcs/; revision=76184
* XmlSchemaIdentityConstraint.cs : give conflicting component in
the error message.
* XmlSchemaElement.cs : When resolving "ref" and "substitutionGroup",
It should use XmlSchema.FindElement() instead of XmlSchema.Elements
so that it does not miss external components.
* XmlSchemaSet.cs, XmlSchema.cs : now in one XmlSchemaSet
compilation, make sure to not handle the same schema twice even
at the schema level.
svn path=/trunk/mcs/; revision=69293
Refactoring compilation to make Compile() portable to
XmlSchemaSet.Compile() and fix multi-schema bugs (not done yet)
* XmlSchema.cs :
Removed "root schema" concept from Compile().
Since nested inclusion does not result in an error, the role of
schemaLocationStack is identical to handledUris, thus removed it.
The handledUris does not have to be a field.
Moved NamedIdentities and IDCollections to XmlSchemaSet.
Renamed a Compile() which is called from XmlSchemaCollection and
XmlSchemaSet as CompileSubset(). Renamed private Compile() as
DoCompile().
public Compile() now internally creates a new XmlSchemaSet and
compiles the set.
* XmlSchemaCollection.cs : now it hooks its schemaSet's validation
event handler and thus XmlSchemaSet does not need to check this
collection's event handler by itself.
XmlSchema.Compile() -> XmlSchema.CompileSubset().
* XmlSchemaSet.cs :
Removed SchemaCollection which became unneccessary.
Added NamedIdentities and IDCollection.
XmlSchema.Compile() -> XmlSchema.CompileSubset().
* XmlSchemaAttributeGroupRef.cs, XmlSchemaXPath.cs
XmlSchemaSimpleTypeList.cs, XmlSchemaComplexContentRestriction.cs,
XmlSchemaGroup.cs, XmlSchemaComplexContentExtension.cs,
XmlSchemaSequence.cs, XmlSchemaSimpleContentRestriction.cs,
XmlSchemaSimpleContentExtension.cs, XmlSchemaAny.cs,
XmlSchemaElement.cs, XmlSchemaNotation.cs, XmlSchemaAll.cs,
XmlSchemaComplexType.cs, XmlSchemaAnnotation.cs,
XmlSchemaAttributeGroup.cs, XmlSchemaSimpleTypeRestriction.cs,
XmlSchemaSimpleContent.cs, XmlSchemaGroupRef.cs,
XmlSchemaChoice.cs, XmlSchemaSimpleType.cs,
XmlSchemaIdentityConstraint.cs, XmlSchemaSimpleTypeUnion.cs,
XmlSchemaAnyAttribute.cs, XmlSchemaComplexContent.cs,
XmlSchemaAttribute.cs, XmlSchemaObject.cs :
removed XmlSchemaObject.IsCompiled(). Check compilation state by
comparing compilation ID directly.
* XmlReader.cs :
For DTD validator, call to SetSchemas() makes no sense.
* XmlValidatingReader.cs : now it internally holds old
XmlSchemaCollection instead of new XmlSchemaSet, to make
XmlSchemaSet.SchemaCollection unneccessary.
Removed SetSchemas() since it is now extraneous because of the
XmlReaderChange above.
svn path=/trunk/mcs/; revision=62988
* XmlSchemaValidatingReader.cs : removed unused constructors.
Now it implements IXmlSchemaInfo. Use XmlSchemaType instead of
Object to represent schema types.
* XmlSchemaAttribute.cs, XmlSchemaElement.cs : AttributeSchemaType
and ElementSchemaType were not working fine for anySimpleType.
* XmlSchemaValidator.cs : When actual schema type was complex,
schema types was not filled correctly. Modified some extra comments.
* XmlSchemaSet.cs, XmlSchemaType.cs : removed extra MonoTODOs.
svn path=/trunk/mcs/; revision=55371
* XmlSchemaElement.cs,
XmlSchemaComplexType.cs,
XmlSchema.cs,
XmlSchemaChoice.cs,
XmlSchemaSimpleType.cs,
XmlSchemaObjectTable.cs,
XmlSchemaObjectCollection.cs,
XmlSchemaCollection.cs,
: All changes are just for warning removal.
svn path=/trunk/mcs/; revision=36586
* XmlSchemaAttribute.cs : AttributeSchemaType could be determined on
compilation time. AttributeType is obsolete.
* XmlSchemaElement.cs : ditto for ElementSchemaType and ElementType.
svn path=/trunk/mcs/; revision=35447
* XmlSchema.cs : Replace XmlSchemaCollection with XmlSchemaSet that
used to maintain compiled schema state.
Simplified code a bit (Include processing).
Set IsCompiled = true only when successfully compiled.
* XmlSchemaCollection.cs : Now it totally delegates its processing
to XmlSchemaSet. Removed unused methods.
* XmlSchemaElement.cs : Added post-compiled information initializer
method, and call it before (re)Compile().
* XmlSchemaSet.cs :
- Replaced internal store from Dictionary to List, since schema
resources for one target namespace can be more than one (that's why
- Schemas(string targetNamespace) returns ICollection).
- Now global schemaset members are added per schema addition (it is
more MS compatible than before).
- Use GetSafeNs() to do targetNamespace comparison correctly.
XmlSchemaSet looks still unstable, so it will be changed again.
* XmlSchemaSimpleTypeRestriction.cs,
XmlSchemaSimpleTypeUnion.cs,
* XmlSchemaUtil.cs : Consider xdt namespace.
svn path=/trunk/mcs/; revision=32143
* BuiltInDatatype.cs : On parsing QName, we don't have to spend costs
on Add()ing parsed name to name table.
* XmlSchemaUtil.cs : Added IsBuiltInDatatypeName().
* XmlSchemaAttribute.cs, XmlSchemaComplexType.cs,
XmlSchemaElement.cs, XmlSchemaSimpleContentExtension.cs,
XmlSchemaSimpleContentRestriction.cs, XmlSchemaSimpleTypeList.cs :
Use the method above instead of Namespace string comparison.
(it will be required to validate schema for schemas.)
* XmlSchemaComplexType.cs : Type Derivation OK (3.4.6) should also
treat null base type as anyType. Derivation Valid Restriction
(3.4.6) should allow base type wildcard absense in case of anyType.
svn path=/trunk/mcs/; revision=22406
* XmlSchema.cs : When we have schema A which includes schema B which
includes schema C (i.e. A->B->C), C components should be compiled.
Here, same URL inclusions are ignored.
* XmlSchemaElement.cs : Hack for missing substitution-group fix.
* XmlSchemaSimpleTypeContent.cs : make actualBaseSchemaType private
and initialize. This fixes bug #53178.
* XmlSchemaSimpleTypeUnion.cs : Forgot to commit ;)
svn path=/trunk/mcs/; revision=22389
* 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
* XmlSchemaSimpleTypeUnion.cs : The same reason as the previous patch.
* XmlSchemaComplexType.cs : Now it handles ContentTypeParticle and
ContentType much more presise than before.
* XmlSchemaElement.cs :
Simplified property handling for reference element.
svn path=/trunk/mcs/; revision=22024
* XmlSchema.cs, XmlSchemaComplexType.cs, XmlSchemaElement.cs :
Invalid attribute should raise an error, not a warning.
svn path=/trunk/mcs/; revision=22014
* 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
* 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.cs :
- Changed missingElementTypeRefs from Hashtable to ArrayList.
- Added internal XmlSchemas for keeping imported schemas.
- Added private Compile() that takes the original rootSchema and
schema location stack for nested inclusion check.
- Added basic xs:import and xs:include support.
- Compile() is now aware of included XmlSchemaObject items.
- Changed Compile() to fill missing elements' types and that of
referencing elements.
- Read() now adds SourceUri property (although only to itself).
* XmlSchemaCollection.cs : Implemented Add().
* XmlSchemaCollectionEnumerator.cs :
Changed .ctor() to use schema collection as its argument.
Fixed Current to return hashtable's Value, instead of Current
(which returns DictionaryEntry).
* XmlSchemaComplexType.cs :
Added internal static AnyType.
Compile() is now searches for its base type into other schemas.
* XmlSchemaElement.cs : anyType is supported.
It now searches for type information after Compile().
SetReferedElementInfo() is now changed to SetSchemaType().
* XmlSchemaObjectTable.cs :
It had problems similar to schema collection. Now it uses internal
class XmlSchemaObjectTableEnumerator to support GetEnumerator().
* XmlSchemaParticle.cs : added internal class XmlSchemaParticleEmpty
and internal static Empty.
svn path=/trunk/mcs/; revision=17000
* XmlSchema.cs, XmlSchemaAll.cs, XmlSchemaAnnotated.cs,
XmlSchemaAnnotation.cs, XmlSchemaAny.cs, XmlSchemaAnyAttribute.cs,
XmlSchemaAttribute.cs, XmlSchemaAttributeGroup.cs,
XmlSchemaAttributeGroupRef.cs, XmlSchemaChoice.cs,
XmlSchemaComplexContent.cs, XmlSchemaComplexContentExtension.cs,
XmlSchemaComplexContentRestriction.cs, XmlSchemaComplexType.cs,
XmlSchemaElement.cs, XmlSchemaGroup.cs, XmlSchemaGroupRef.cs,
XmlSchemaIdentityConstraint.cs, XmlSchemaImport.cs,
XmlSchemaInclude.cs, XmlSchemaKey.cs, XmlSchemaKeyref.cs,
XmlSchemaNotation.cs, XmlSchemaObject.cs, XmlSchemaRedefine.cs,
XmlSchemaSequence.cs, XmlSchemaSimpleContent.cs,
XmlSchemaSimpleContentExtension.cs,
XmlSchemaSimpleContentRestriction.cs, XmlSchemaSimpleType.cs,
XmlSchemaSimpleTypeList.cs, XmlSchemaSimpleTypeRestriction.cs,
XmlSchemaSimpleTypeUnion.cs, XmlSchemaUnique.cs,
XmlSchemaXPath.cs,
As to Compile() and Validate(),
- Added CompilationId and check it while compiling schema components.
- Code refactory. Replaced literal xmlns with XmlSchema.Namespace
- Replaced XmlSchemaInfo with compiling XmlSchema itself (XmlSchema
also has PSVI components inside it, so passing itself seems enough).
- Related to above change, IDCollection was moved to XmlSchema, and
blockDefault/finalDefault/blockResolved/finalResolved resolution
was changed to reference only to schema.BlockDefault/FinalDefault.
- The similar change has done against XmlSchemaForm related stuff.
- Changed compilation order of schema type definitions (it is
workaround). First it compiles types, and then it compiles others.
* XmlSchemaElement.cs : added ElementType PSVI contribution support.
svn path=/trunk/mcs/; revision=16435
* 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
* XmlSchemaReader: A Wrapper class around XmlReader with customized
methods to suit reading a schema.
* General: Implemented Read() method for the schema. There are only
a few minor bugs remaining.
svn path=/trunk/mcs/; revision=5200
* BUGS.txt: New file to keep track of bugs
* ALL: All classes are initialized exactly as in .NET except
1. inclusion of language attribute in schema
2. ComplexContent's Particle is initialized to null whereas .NET
to some internal implementation. IMO Null is more appropriate
* ALL: Changed the Compile methods to return the count of errors.
* ALL: Complile methods are almost complete. Pass 1453 of 3061 tests.
This number should shoot up if we write a parser to read the
Schema instead of using reflection (which is slower too)
svn path=/trunk/mcs/; revision=4926