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
* XmlValidatingReader.cs : In ReadTypedValue(), treat Whitespace
nodes as target string nodes as well as other text nodes.
* XsdValidatingReader.cs :
Don't use normalized string as input to AssessStringValid(). It
incorrectly invalidates strings against simple types with length-
related facets.
Now that we don't ignore whitespaces, we need to explicitly allow
pure whitespace texts in ElementOnly/Empty model.
* XmlSchemaSimpleTypeRestriction.cs : maxLength and minLength were
likely to be ignored in ValidateNonListValueWithFacets().
* XmlSchemaValidator.cs : Don't use normalized string value as the
input to AssessStringValid().
* XsdValidatingReaderTests.cs : test for ReadTypeValue() that it
does not ignore whitespace nodes, and it does not normalize string
incorrectly.
svn path=/trunk/mcs/; revision=55129
* XmlValidatingReader.cs : ReadTypedValue() was not working with
non-XmlSchemaDatatype types.
* XsdValidatingReaderTests.cs : test for ReadTypeValue() with simple
type restriction.
svn path=/trunk/mcs/; revision=55127
* XsdValidatingReader.cs : XmlReader.ReadTypedValue() does not exist
anymore, so it is not override.
* XmlNamespaceManager.cs : NameTable is virtual in 2.0 RTM.
* XmlReader.cs : IsEmptyElement is reverted to be abstract in 2.0 RTM.
ReadTypedValue() is removed.
* XmlValidatingReader.cs : ReadTypedValue() is not virtual now.
* XmlWriter.cs : Settings is virtual.
* XPathNodeIterator.cs : added [DebuggerDisplay]. pretty useless tho.
* XPathNavigator.cs : [DebuggerDisplay] as well.
SelectSingleNode() and AppendChildElement() are now virtual.
svn path=/trunk/mcs/; revision=52637
* XmlDocument.cs: Added an InheritanceDemand for Unrestricted on
CreateDocumentType and ReadNode methods.
* XmlException.cs: Added a Demand for SerializationFormatter on
GetObjectData method.
* XmlResolver.cs: Added an InheritanceDemand for Unrestricted on
ResolveUri method.
* XmlSecureResolver.cs: Fixed exception when creating evidences with
an empty URL in CreateEvidenceForUrl method. Only call ResolvePolicy
and PermitOnly if the security manager is enabled.
* XmlTextReader.cs: Added an InheritanceDemand for Unrestricted on the
class.
* XmlTextReader2.cs: Added an InheritanceDemand for Unrestricted on
the class.
* XmlValidatingReader.cs: Added an InheritanceDemand for Unrestricted
on the class.
svn path=/trunk/mcs/; revision=49179
* XmlValidatingReader.cs : LookupNamespace() was trying to access to
null reference to validatingReader.
* DTDValidatingReader.cs : Fixed default xmlns* attribute handling.
It used to be valid only at the declaring element.
* XmlValidatingReaderTests.cs : added DefaultXmlnsAttributeLookup().
svn path=/trunk/mcs/; revision=46120
* System.Xml.dll.sources : XPathAtomicValue.cs -> XmlAtomicValue.cs.
* XmlAtomicValue.cs : moved from XPathAtomicValue, removed some stuff.
* SubtreeXmlReader.cs :
removed atomizedName related 2.0 member (deprecated).
* XPathAtomicValue.cs :
it is now XmlAtomicValue and in sys.xml.schema.
* XPathNavigator.cs, Expression.cs :
removed atomizedName related 2.0 members (deprecated).
* XsdValidatingReader.cs :
removed atomicName related 2.0 members (deprecated in beta2).
* XmlNodeReader2.cs, XmlTextReader2.cs, XmlValidatingReader.cs,
XmlNamespaceManager.cs, IXmlNamespaceResolver.cs,
DTDValidatingReader.cs : Removed most of "atomizedName" related
stuff that are obsoleted in 2.0 beta2.
* XQueryConvert.cs : XPathAtomicValue -> XmlAtomicValue.
* XmlNamespaceManagerTests.cs : removed atomizedName related tests.
svn path=/trunk/mcs/; revision=44083
* XmlReader.cs : ReadElementContentAsBinHex() was calling ..AsBase64().
* XmlValidatingReader.cs : In set_EntityHandling(), set that property
of DTDValidatingReader.
* XmlNodeReader2.cs,
XmlNodeReaderImpl.cs : added simplified implementation that splits
entity handling and anything else.
* XQueryConvert.cs : implemented ShouldCheckValueFacets().
Use Convert class instead of simple casts (check range).
* XmlReaderSettings.cs : added SetSchemas() for XPathNavigator.
svn path=/trunk/mcs/; revision=38088
* XsdValidatingReader.cs : making smarter relationship between
XmlValidatingReader. Added ValidationEventHandler and ValidationType.
nonDefaultAttributeCount was extraneous.
Added 'checkIdentity' (i.e. !IgnoreIdentityConstraints).
DefaultAttributesCache property did make little sense, so just
reverted to ArrayList field.
* XmlValidatingReader.cs : making smarter relationship between
XsdValidatingReader.
svn path=/trunk/mcs/; revision=37429
* XmlQualifiedName.cs : in 2.0 it is [Serializable].
* XmlTextReader.cs : removed unused local variable.
* XmlTextWriter.cs : Improved some exception messages.
moved some private fields into #if NET_2_0.
* XmlValidatingReader.cs : rename specifiedResolver to
resolverSpecified and use it in internal get_Resolver().
Added [Obsolete] for ReadTypedValue() whose base is obsoleted.
svn path=/trunk/mcs/; revision=36465
* XmlTextReader.cs : Fixed EOF not to return true when it is just
closed. Element and EndElement location is now adjusted to be the
same as MS.NET does. This fixes bug #63505 and #63507.
ResetState() now throws InvalidOperationException() as MS.NET does.
* WriteState.cs : added missing 2_0 enumeration.
* XmlReader.cs : ReadTypedValue() is virtual.
* XmlValidatingReader.cs : ReadTypedValue() is override under 2_0.
svn path=/trunk/mcs/; revision=32558
* XmlAttributeCollection.cs : In .net 2.0, it became sealed class.
* IXmlDataEvidence.cs : not "Evidences" but "Evidence".
* XmlInputStream.cs : new csc rejected implicit int->char cast.
* XmlNamespaceManager.cs : In net_2_0, LookupNamespace(string) and
LookupPrefix(string) does not require argument string as atomized.
Added HasNamespace (string, bool).
* XmlReader.cs : Added Settings and SchemaInfo properties.
* XmlReaderSettings.cs : Added NameTable. Throw XmlException when
attempt to set Schemas.
* XmlTextReader.cs : Fixed "Evidences" to "Evidence". new csc rejected
implicit int->char cast.
* XmlValidatingReader.cs : Fixed "Evidences" to "Evidence".
svn path=/trunk/mcs/; revision=30919
* DTDObjectModel.cs :
- DTDNode's BaseURI should not always refer to that of DTD's.
- Use absolute URI's .ToString() instead of AbsolutePath.
* DTDReader.cs : Throw XmlException for illegal character references.
* DTDValidatingReader.cs :
- Share XmlResolver when the actual reader is XmlTextReader.
(MS's XmlValidatingReader and XmlTextReader do this.)
- Added its own EntityHandling property.
* XmlValidatingReader.cs : Share XmlResolver with XmlTextReader.
* XmlReader.cs,
XmlTextReader.cs : Added new NET_1_2 members.
* XmlElement.cs : Removed extra lines (caused by XmlTextWriter bugs).
* XmlEntityReference.cs : Forgot to add, the real fix by Boris.
svn path=/trunk/mcs/; revision=22509
* DTDValidatingReader.cs : Now it handles whitespace entity as
significant.
* XmlConvert.cs : As to NIST testcases, exponential support on single
and double floating point numbers.
* XmlValidatingReader.cs : If it IsDefault, then line number and line
position returns 0.
svn path=/trunk/mcs/; revision=19384
* XmlAttributeCollection.cs : Fixed synchronization stuff.
* XmlConvert.cs : Added two FromBinHexString() methods.
* XmlTextReader.cs : Modified to use one of the above method.
* XmlValidatingReader.cs : XsdValidatingReader.XmlResolver will be
disabled (in the next commit), so resolver won' be set to it.
Attempt to validate against XDR now throws NotSupportedException.
svn path=/trunk/mcs/; revision=19191
* XmlNode.cs : GetPrefixOfNamespace() also contained a bug similar to
GetNamespaceOfPrefix() fixed at 2003-10-13.
* XmlTextReader.cs : ReadBase64() should keep incomplete base64 block
which remained by previous call of this method.
* XmlUrlResolver.cs : Added assertion for file Uri path's absoluteness.
* XmlValidatingReader.cs : Notice about intention of XDR won't be
supported (at least in Mono 1.0).
svn path=/trunk/mcs/; revision=19187
* DTDValidatingReader.cs : Simplified to use
XmlSchemaUtil.GetParserContext().
* XmlValidatingReader.cs : ValidationType.Auto should always use
XsdValidatingReader because xsi:schemaLocation might be used.
svn path=/trunk/mcs/; revision=18441
* XmlValidatingReader.cs : Implemented SchemaType. Added support for
ValidationType.Schema. Added support for XmlResolver. Fixed
ReadTypedValue() not to consume EndElement.
svn path=/trunk/mcs/; revision=17561
* DTDValidatingReader.cs : Added SchemaType.
Read() Assures to return to element.
* DTDObjectModel.cs : Removed DTDEntityDeclaration.BaseURI.
* XmlReader.cs : ReadString() should be virtual in NET_1_1.
* XmlTextReader.cs : 1) Depth should consider Attribute and its values.
Introduced insideAttribute field to support them.
2) ReadAttributeValue() should consider empty string.
* XmlValidatingReader.cs :
Fixed several properties which premised as if it was already read.
Encoding and Namespaces now throws NotSupportedException for other
than XmlTextReader.
Implemented ReadTypedValue() based on IHasXmlSchemaInfo.SchemaType.
svn path=/trunk/mcs/; revision=17330
* DTDObjectModel.cs : added XmlResolver related members. Added
invalid entity recursion logic. Added encodingdecl check on textdecl.
* DTDValidatingReader.cs : It now implements IHasXmlParserContext.
* XmlChar.cs : IsPubidChar() should not allow TAB(	).
* XmlDocumentType.cs : 1) internal CreateDocumentType() was now changed
to receive DTDObjectModel to support other than XmlTextReader.
2) Most of its public member is now based on DTDObjectModel.
* XmlDocument.cs : 1) Synchronous change with XmlDocumentType.
2) ReadNode() now considers XmlParserContext's DTDObjectModel for
other than XmlTextReader (such as XmlValidatingReader).
* XmlNode.cs : code cleanup only.
* XmlParserInput.cs : added HasPEBuffer, used to check illegal nesting.
* XmlTextReader.cs : 1) Illegal entity reference check logic was moved
from ReadContent() to SetEntityReferenceProperties(). 2) Indentation
change on ReadEntityReference(). 3) ReadAttribute() now checks
reference to external entity reference. 4) Added textdecl encoding
check. 5) DTDObjectModel fields are now set correctly. 6) added
PERef markup nest check. 7) If PEDecl was not found, it might be WFC
violation, not only be VC violation. 8) ReadEntityDecl() now receives
its declared entity itself, and this method checks IsInternalSubset.
* XmlValidatingReader.cs : 1) Added GetInternalPerserContext().
2) ValidationType.None should be the same as Auto, not DTD (in the
future it should keep xml schema's default values).
Pending Stuff in XmlTextReader which breaks some NUnit tests;
1) SetEntityReferenceProperies() has check for illegal references.
2) ReadAttribute(bool) has similar check for illegal references.
svn path=/trunk/mcs/; revision=17218
* XmlInputStream.cs :
Fixed Initialize() that might result in incorrect buffer.
CanRead and Position should consider buffer (especially when the
stream was EOF).
CanSeek should use stream's CanSeek.
* XmlChar.cs : added GetPredefinedEntity().
* DTDObjectModel.cs :
- Modified ComputeDefaultValue() to use it.
- Fixed NormalizedDefaultValue not to expect parsed value as string.
- ResolveExternalEntity now detects invalid standalone specification.
- DTDParameterEntityDeclaration.Value is now changed to property and
keep its resolved value of literal value of external value using
new Resolve (XmlResolver) method (called only by XmlTextReader).
* DTDValidatingReader.cs :
- It now handles entity-expanded Whitespace and SignificantWhitespace
correctly. Does not raise unexpected text not allowed error.
- Fixed MoveToAttribute()s to move internal reader correctly, and
should be able to move in other cases than on element node.
- On Read()ing document type and ResolveEntity(), it now sets
XmlResolver on text reader.
- On ID constraints check and type verification, it now uses
normalized attribute or its tokenized value(s).
- Fixed ValidateAttributes() to add default values when
ValidationType is Auto.
* XmlParserContext.cs : added internal Dtd setter.
* XmlParserInput.cs :
InsertParameterEntityBuffer() should add surrounding whitespaces.
Removed unused code block.
* XmlTextReader.cs :
- Modified ReadReference(), ReadAttribute() and Dereference() to use
XmlChar.GetPredefinedEntity().
- When returning entity reference, it checks extity declaration
existence in certain conditions.
- ReadAttribute() now skips general entity replacement on reading
entity value.
- ReadText() now handles whitespace texts as XmlNodeType.Whitespace.
- ReadXmlDeclaration() holds isStandalone, which might be used in
entity reference's well-formedness check.
- internal 'DTD' now uses XmlParserContext.Dtd.
- isInternalSubset was meaningless. Now uses input stack's Count.
- Added some required SkipWhitespace().
- Several parameter entity handling changes. Added GetPEValue(name).
TryExpandPERef() now uses ImportAsPERef(). ReadParameterEntityDecl()
now uses its Resolve() when it was external PE. Now it uses value
buffer instead of currentTag, to efficiently read (included) PE.
CompileDeclaration() now uses ImportAsPERef instead of ExpandPERef().
ImportAsPERef() simply inserts the value to currentInput.
ReadEntityDecl() also uses value buffer. Removed non-used methods.
- Default attributes are now stored in normalized form.
- Dereference() now considers non-expanding predefined entities.
* XmlValidatingReader.cs : now holds Schemas, and ValidationType.Auto
is more correctly supported.
* XmlAttributeCollection.cs :
When removing default attribute, it immediately inserts the attribute.
RemoveAll() should consider default (not-removable) attributes.
* XmlDocument.cs :
Should have its default XmlResolver. Added Internal Resolver.
Some Load() should use its XmlResolver.
ImportNode() should copy its children in node level, not value level.
It also have to consider not to copy default attribute on importing
XmlElement.
* XmlDocumentType.cs : Now uses document's XmlResolver to read DTD.
* XmlAttribute.cs,
XmlDocumentFragment.cs.
XmlElement.cs : use XmlResolver on InnerXml. Removed some MonoTODO.
* XmlNodeReader.cs : GetInternalParserConext() should provide its DTD.
ResolveEntity() uses XmlResolver on entityReader.
svn path=/trunk/mcs/; revision=17202
* DTDObjectModel.cs :
- Added validation error check (and AddError(), Errors).
- Fixed ComputeDefaultValue() to handle various references correctly.
- DTDEntityDeclaration.EntityValue became property, and added
LiteralEntityValue. The new one holds resolved value.
Added ResolveExternalEntity(). It now required root in .ctor().
* DTDValidatingReader.cs :
- Now it handles namespaced attributes (as input to xsd validator).
- Added XmlResolver property as usual XmlReader.
- Added currentEntityHandling field so that it can stand changing
XmlValidatingReader's EntityHandling dynamically.
- FilterNormalization() now requires name for getting datatypes and
can stand for non-current attribute normalization.
- Splitted ReadContent() from Read() that can be called recursively
when expanding entities.
- Now handles Entity not found error *after* resolution of entities,
as MS.NET does.
- Read()ing DTD checks its Errors and raises validation error events.
In some situations, DTD parsing may detect VC error, not WFC error.
It also strictly checks NData existence.
- Handling of entity-resolved text is a bit changed and Read()ing
element, endElement, cdata now changed to switch collecting text
and collected text.
- content type ANY should allow texts.
- Added enumerated attribute validity check.
- Added Name/Names creation rule check for ID/IDREF/IDREFS.
- Added entity existence check for ENTITY/ENTITIES attributes.
- Added NMTOKEN creation rule check for NMTOKEN/NMTOKENS.
- Fixed to remove extraneous #REQUIRED check.
- Contributing default attribute is now only applied to the case
ValidationType is DTD or None.
- ResolveEntity() now handles external entities.
Added Mono.Xml.IXmlParserContext interface support.
* XmlDocumentType.cs : Fixed to use BaseURI to build DTD model.
* XmlTextReader.cs :
- Fixed ReadAttributeValue() to reset returnEntityReference.
- Added bool MaybeTextDecl only for ResolveEntity().
- Fixed ReadWhitespace(). In fact its value is considered even if it
is in the end of the XML.
- Fixed ReadXmlDeclaration(). Now skips text declaration.
- CompileDTDSubset() now checks IGNORE/INCLUDE section end balances.
- ReadContentSpec() should set OrderType = OR for mixed model.
Fixed to set content element name correctly.
- ImportAsPERef() now skips Text declaration.
- Type of enumerated default attributes shold be string.
- Undeclared PE error is now handled as DTD's VC error, not
XmlTextReader's WFC error.
* XmlValidatingReader.cs : BaseURI should provide that of
original XmlReader's when read was not started yet.
Fixed XmlResolver to delegate to DTDValidatingReader.
* XmlAttributeCollection.cs : Acquiring attList declaration is
insufficient especially in case of lack of elementdecl.
* XmlChar.cs : (Maybe this is compact than XmlConstructs.)
added IsWhitespace(),IsNCNameChar(),IsName(),IsNCName(),IsNmToken(),
IsPubid(). Copies IsValidIANAEncoding() from XmlConstructs.
* XmlInputStream.cs : Removed "version" declaration check. It should
be done by XmlTextReader.
* XmlNodeReader.cs : added internal GetInternalParserContext() and now
it can be used in XmlValidatingReader.ResolveEntity().
ResolveEntity() sets XmlTextReader.MaybeTextDecl.
svn path=/trunk/mcs/; revision=17167
* DTDObjectModel.cs : Added BaseURI (but not used yet).
DTDAttListDeclaration.ctro() now requires root dtd object model.
* DTDValidatingReader.cs : Read() now expands EntityReference if
entity handling of validating reader is ExpandEntities.
* XmlReader.cs,
XmlTextReader.cs,
XmlNodeReader.cs,
XmlValidatingReader.cs : Implemented "virtual" ReadInnerXml and
ReadOuterXml which are modified in MS.NET 1.1.
* XmlConstructs.cs : added int version of IsValid, IsInvalid,
IsContent, IsMarkup and IsNCNameStart.
Fixed int version of IsXXX() to check array index range.
Added IsValidName (string).
* XmlTextReader.cs :
- Read() handles document with non document element as an error.
- ReadText() and ReadCharacterReference() checkes illegal characters.
- ReadEntityReference() checks name validity.
- ReadProcessingInstruction() rejects such name that starts with
"xml" ignoring case, and checks attributes more strictly.
- ReadDeclaration() rejects unrecognized kind of declaration.
- In many places, added "required whitespace" check in DTD markup.
- DTD content model now disallows mixing use of '|' and ','.
svn path=/trunk/mcs/; revision=17012
* XmlDocumentFragment.cs : I missed to add it in relation to the
previous XmlParserContext patch. Similar to XmlAttribute/XmlElement.
* XmlNodeReader.cs : removed some TODO attributes.
* DTDValidatingReader.cs,
XmlValidatingReader.cs : Implemented ResolveEntity().
svn path=/trunk/mcs/; revision=17001
* XmlTextReader.cs :
Read() now handles parser context stuff (BaseURI, XmlLang and
XmlSpace) correctly for an empty element.
Normalization property now doesn't throw an error. Will be used soon.
* XmlValidatingReader.cs : added ValidationType.None support (wait for
the next DTDValidatingReader update for "not firing event handler).
* XmlNodeReader.cs : jun. 30th commit seems wrong. It keeps its state.
svn path=/trunk/mcs/; revision=16609
* DTDValidatingReader.cs :
changed base class to XmlReader and implemented IXmlLineInfo members.
changed .ctor() argument from event handler to validating reader.
Removed some #if ... #else ... #endif blocks.
Added validation event support for Read() using HandleError().
* XmlValidatingReader.cs : added internal OnValidationEvent().
* XmlDocument.cs : ReadNode() now checks reader's state more strictly.
svn path=/trunk/mcs/; revision=16430