Commit Graph
214 Commits
Author SHA1 Message Date
Martin Baulig dfedf08d98 2004-04-22 Martin Baulig <[email protected]>
Renamed the `NET_1_2' conditional to `NET_2_0' in all files.

svn path=/trunk/mcs/; revision=25877
2004-04-23 02:24:02 +00:00
Atsushi Eno b123e6f7c5 2004-04-05 Atsushi Enomoto <[email protected]>
* DTDObjectModel.cs : (DTDAttributeDefinition) create ArrayList
	  only when they are required.
	* DTDReader.cs,
	  XmlParserInput.cs : raw tag string now don't have to be kept, while
	  it cost so much. Removed unused code. 20% to 30% memory got saved.
	* XmlNotation.cs : removed unused code.
	* XmlTextReader.cs : Removed unused code. ReadString() now uses
	  XmlReader's internal method. Fixed BaseURI to be conformant with
	  W3C XML InfoSet and (subsequently) xml:base specification (i.e.
	  reflect xml:base attribute correctly).

svn path=/trunk/mcs/; revision=25026
2004-04-05 09:32:48 +00:00
Atsushi Eno ee779c6dd8 2004-02-12 Atsushi Enomoto <[email protected]>
* XmlReader.cs : For performance reason, XmlTextReader now uses
	  base ReadInnerXml() and don't store currentTag array unnecessarily.
	* XmlTextReader.cs :
	  - Fixed GetAttribute(int) that might cause index out of range.
	  - Now it consumes the text reader by reading blocks, as MS.NET does.
	    Modified GetRemainder(), PeekChar(), ReadChar() and so on.
	  - Now it doesn't create Value string for linked nodes, unless it
	    is actually required.
	  - some code refactory.

svn path=/trunk/mcs/; revision=23041
2004-02-12 20:33:00 +00:00
Atsushi Eno 8256002451 2004-02-08 Atsushi Enomoto <[email protected]>
* DTDObjectModel.cs : Limit external entity reference from DTD by 256.
	  foreach elimination.  DTDParameterEntityDeclaration should set Root.
	  Compute attribute default value without raising an error.
	  (for non-error reporting reader)
	* DTDReader.cs : Fixes for the above fixes. foreach elimination.
	* DTDValidatingReader.cs, NameTable.cs, XmlAttribute.cs,
	  XmlAttributeCollection.cs, XmlChar.cs, XmlConstruct.cs,
	  XmlDocumentFragment.cs, XmlDocumentNavigator.cs, XmlElement.cs,
	  XmlEntityReference.cs, XmlNamedNodeMap.cs, XmlNode.cs,
	  XmlText.cs : foreach elimination.
	* XmlDocument.cs, XmlSignificantWhitespace.cs, XmlWhitespace.cs :
	  foreach elimination. Removed unnecesary methods.
	* XmlTextReader.cs : code format refactory. Optimized some methods.
	  foreach elimination. Replaced Stack with string array.
	  Replaced StringBuilder with char array. Removed unnecessary methods.

svn path=/trunk/mcs/; revision=22891
2004-02-08 20:27:04 +00:00
Atsushi Eno c90d6dba5b 2004-02-06 Atsushi Enomoto <[email protected]>
* DTDValidatingReader.cs : Fixed MoveToElement() that causes incorrect
	  IsDefault and Depth.
	* XmlAttribute.cs : Fixed .ctor(). Omit more namespace check when
	  checkNamespace = false.
	* XmlNamedNodeMap.cs : Fixed SetNamedItem() to raise events.
	* XmlAttributeCollection.cs : Reimplemented InsertAfter to use
	  InsertBefore() (similar to XmlNode).
	* XmlDocument.cs : Added internal .ctor().  Reimplemented ReadNode()
	  as recursive, to make event order compatible.
	* XmlDocumentType.cs : Use SetNamedItem() (to raise events).
	* XmlElement.cs : Some refactory.  Fixed SetAttributeNode() with
	  string name to block prefixed name.
	* XmlEntity.cs : Don't raise events on setting contents.
	* XmlNode.cs : Some refactory. Added raiseEvent argument to internal
	  InsertBefore().
	* XmlEntityReference.cs : related fix for XmlNode change.
	* XmlTextReader.cs : When the reader is on "attributes" of xmldecl or
	  doctype, Depth 1 lower than usual attribute. Split large function.

svn path=/trunk/mcs/; revision=22799
2004-02-05 16:05:56 +00:00
Atsushi Eno fdf21b83be 2004-02-04 Atsushi Enomoto <[email protected]>
* DTDObjectModel.cs : Never expand entity on ScanEntityValue().
	* DTDValidatingReader.cs : XmlDeclaration node requires attributes
	  to be movable.
	* XmlAttribute.cs,
	  XmlDocument.cs,
	  XmlDocumentFragment.cs,
	  XmlElement.cs,
	  XmlEntity.cs,
	  XmlLinkedNode.cs,
	  XmlNode.cs,
	  XmlNotation.cs :
	  Added namespace checking flag (required for such xml readers
	  that holds Namespaces=false). Now only XmlNode holds LastLinkedNode.
	* XmlDocumentType.cs,
	  XmlEntity.cs,
	  XmlEntityReference.cs : The children of Entity and EntityReference
	  became correct. They now holds parsed nodes, but it is only when
	  they are appended to the document.
	* XmlNode.cs : Modified insertBeforeIntern() to InsertBefore() with
	  boolean checkNodeType argument.  This method also tries to create
	  Entity's and EntityReference's child nodes.  Also added internal
	  RemoveChild() with boolean checkNodeType argument.
	* XmlNodeReader.cs : Quick hack for ResolveEntity() that became
	  broken with these changes. use InnerXml as input to entityReader.
	* XmlTextReader.cs : XmlDeclaration's value LocalName should be the
	  same as Name.  The names of DTD's pseudo attributes should be empty.
	  Fixed DTD node's Depth (was regarded as attribute value's depth).

svn path=/trunk/mcs/; revision=22767
2004-02-04 17:48:06 +00:00
Atsushi Eno a540306d7f 2004-02-03 Atsushi Enomoto <[email protected]>
* XmlTextReader.cs, DTDReader.cs : fixity fix ;)

svn path=/trunk/mcs/; revision=22744
2004-02-03 15:28:44 +00:00
Atsushi Eno 80b1ad3644 2004-02-03 Atsushi Enomoto <[email protected]>
* ChangeLog : Fixed incorrect description that should be written for
	  DTDValidatingReader.cs but written for DTDReader.cs.
	* DTDValidatingReader.cs : Fixes described in the last DTDReader fix.

	* XmlChar.cs,
	  XmlConstructs.cs : Made XmlChar and XmlConstructs equivalent and
	  replaced XmlChar with XmlConstruts, renaming "XmlChar" to
	  "XmlCharCompact" and "XmlConstructs" to "XmlChar".
	  (XmlChar will be used for compact framework.)
	* DTDReader.cs, XmlParserInput.cs, XmlTextReader.cs :
	  XmlChar related changes.  Support for surrogate pair.
	  It cannot use TextReader's peek anymore (for surrogate pair).
	  Character range check for PI value, attribute value, text
	* XmlTextWriter.cs : Change openElements from Stack to ArrayList.
	  (It calls ToArray() every time.)

svn path=/trunk/mcs/; revision=22741
2004-02-03 15:04:03 +00:00
Atsushi Eno 949ccf26e7 2004-02-03 Atsushi Enomoto <[email protected]>
* XmlChar.cs : now GetPredefinedEntity() returns int and -1 for not
	  predefined entity names.
	* DTDObjectModel.cs : DTDxxxCollection now derives from
	  - DTDCollectionBase that derives from DictionaryBase.
	  - "Literal value" and "replacement text" are handled differently.
	  - Throw XmlException when external entity could not be resolved.
	  - Return ReplacementText for EntityValue.
	* DTDReader.cs :
	  - Support IXmlLineInfo.
	  - Fixed IGNORE section handling to be more strict.
	  - Compute replacement text on reading entity declarations.
	  - Don't expand char references before getting literal entity value.
	  - Check not allowed parameter entity inside internal subset.
	  - Added ValidateWhitespaceNode() to check whitespace's Validity
	    Constraints on external elementdecl and standalone document.
	  - When invalid data against its datatype was found, don't throw
	    parse error.
	  - Other code refactory.
	* XmlTextReader.cs :
	  - Check for invalid Text pattern "]]>" should not depend on line
	    info since it might not be supported.
	  - Check referenced character's validity (WFC).

svn path=/trunk/mcs/; revision=22730
2004-02-03 08:07:35 +00:00
Atsushi Eno fa84bb251d 2004-01-28 Atsushi Enomoto <[email protected]>
* DTDReader.cs : Added Normalization.  Parameter Entity declaration
	  should block invalid characters. (GEDecl should be fixed as well.)
	* XmlConstruct.cs : Should allow surrogate chars.
	* XmlNotation.cs : When prefix is empty (i.e. almost all cases)
	  Name should not add ':'. Patch by Boris Kirzner.
	* XmlTextReader.cs : Modified private ReadCharacterReference() to
	  return the character (or -1 when should not return anything).
	  Now Text character reference are checked their character range.
	  Set DTDReader.Normalization as well as the reader itself.

svn path=/trunk/mcs/; revision=22580
2004-01-28 16:27:49 +00:00
Atsushi Eno 5dc2265c13 2004-01-26 Atsushi Enomoto <[email protected]>
* 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
2004-01-26 18:25:39 +00:00
Eran Domb c1638d2b25 Fix a big in Close () method - close the underlying stream.
svn path=/trunk/mcs/; revision=21942
2004-01-11 14:36:31 +00:00
Atsushi Eno 779b2bb2f0 2004-01-07 Atsushi Enomoto <[email protected]>
* XmlNamespaceManager.cs : Implemented .NET 1.2 methods that take
	  atomizedNames argument.
	* XmlTextReader.cs : Use new namespace manager methods.
	  Reduced NameTable.Add().
	* DTDObjectModel.cs : fixed incorrectly commented-out line.

svn path=/trunk/mcs/; revision=21810
2004-01-07 14:46:43 +00:00
Atsushi Eno 65b863c896 2004-01-07 Atsushi Enomoto <[email protected]>
* DTDObjectModel.cs, DTDReader.cs, XmlSecureResolver.cs :
	  avoiding obvious exception.
	* DTDReader.cs, XmlTextReader.cs : Some optimization.
	  Avoided extraneous PeekChar() and reduced name string creation.

svn path=/trunk/mcs/; revision=21797
2004-01-07 09:05:23 +00:00
David Sheldon d70eb80a72 2004-01-05 David Sheldon <[email protected]>
* XmlTextReader.cs: Fixed constructors taking string url to not
   loose the absolute part of the path.

svn path=/trunk/mcs/; revision=21726
2004-01-05 22:30:46 +00:00
Atsushi Eno 2b27ae7138 2003-12-15 Atsushi Enomoto <[email protected]>
* XmlTextReader.cs : BaseURI was broken. This fixes bug #52098.

svn path=/trunk/mcs/; revision=21192
2003-12-15 19:44:03 +00:00
Atsushi Eno ebbc046198 2003-11-22 Atsushi Enomoto <[email protected]>
* XmlTextReader.cs : Fixed ReadInnerXml(). This fixes bug #51267.

svn path=/trunk/mcs/; revision=20328
2003-11-22 02:54:34 +00:00
Atsushi Eno 5f6674b5da 2003-10-25 Atsushi Enomoto <[email protected]>
* DTDReader.cs, DTDValidatingReader.cs, XmlInputStream.cs,
	  XmlTextReader.cs : More cleanup.
	* XmlDocument.cs : Removed CheckName(). Code cleanup.
	* XmlElement.cs : .ctor() now adds default attributes (if required).
	* XmlAttribute.cs, XmlElement.cs, XmlEntity.cs, XmlEntityReference.cs,
	  XmlNotation.cs : Now uses OwnerDocument's NameTable.

svn path=/trunk/mcs/; revision=19404
2003-10-26 03:39:03 +00:00
Atsushi Eno 4cb580369a 2003-10-25 Atsushi Enomoto <[email protected]>
* DTDReader.cs,
	  XmlConstructs.cs,
	  XmlTextReader.cs,
	  XmlWriter.cs : Fixed incorrect access modifier.
	* XmlTextWriter.cs : Imported state variable from XmlWriter.
	* DTDValidatingReader.cs : Removed extraneous MonoTODO.
	* XmlConvert.cs : Implemented ToTimeSpan().
	  Modified ToDateTime() to reuse the same array.

svn path=/trunk/mcs/; revision=19373
2003-10-25 09:36:42 +00:00
Atsushi Eno b8058c932d 2003-10-19 Atsushi Enomoto <[email protected]>
* 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
2003-10-19 13:56:55 +00:00
Atsushi Eno d86a6f346b 2003-10-19 Atsushi Enomoto <[email protected]>
* XmlChar.cs : added WhitespaceChars, used in common.
	* XmlConvert.cs,
	  XmlDeclaration.cs,
	  XmlParserInput.cs,
	  XmlTextReader.cs,
	  XmlTextWriter.cs : String.Trim()
	* XmlConvert.cs : shifted XmlConstructs to XmlChar.
	* XmlTextReader.cs : Implemented Normalization.

svn path=/trunk/mcs/; revision=19188
2003-10-19 09:23:29 +00:00
Atsushi Eno c7fa9e9505 2003-10-19 Atsushi Enomoto <[email protected]>
* 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
2003-10-19 04:47:46 +00:00
Atsushi Eno 15ed3550d0 2003-10-13 Atsushi Enomoto <[email protected]>
* XmlDocument.cs : Fixed bugzilla #49607. Save() outputs XML
	  declaration even though there is no XmlDeclaration child.
	* XmlTextReader.cs : Fixed Init() so that ResetState() should work.

svn path=/trunk/mcs/; revision=18976
2003-10-13 17:48:28 +00:00
Atsushi Eno a02a5b1d9c 2003-10-09 Atsushi Enomoto <[email protected]>
* Added DTDReader.cs. It is almost importation of XmlTextReader.
	* DTDObjectModel.cs :
	  - More .NET-ism. Properties took place of fields.
	  - Imported PE set from XmlTextReader. Added location info.
	  - Added DTDEntityBase common to PE and GE.
	  - More correct text declaration handling with new XmlTextReader.
	* DTDValidatingReader.cs :
	  - Now uses entity resolving XmlTextReader to validate attributes
	    correctly. Implemented standalone
	  - Standalone and default related validity constraints check.
	* XmlImplementation.cs: Implemented HasFeature().
	* XmlNode.cs : Implemented Supports().
	* XmlNodeReader.cs : Modified to use XmlTextReader.SkipTextDeclaration()
	* XmlParserInput.cs : Removed extraneous members.
	* XmlTextReader.cs :
	  - All DTD related functionality now goes to DTDReader.cs
	  - It became old simple TextReader input style.
	  - Implemented GetRemainder().
	  - Implemented ReadBase64(), ReadBinHex() and ReadChars(), using
	    additional new private method ReadUntilEndTag().
	  - Removed incomplete MaybeTextDecl and added SkipTextDeclaration().
	    ReadXmlDeclaration() now became simple.
	  - More strict entity reference check at SetEntityReferenceProperty()
	  - Removed extraneous members.
	* XmlWriter.cs : WriteNode(XmlNodeType.None) does not raise error.

svn path=/trunk/mcs/; revision=18812
2003-10-09 19:13:16 +00:00
Gonzalo Paniagua Javier aebbfda1ff 2003-10-09 Gonzalo Paniagua Javier <[email protected]>
* XmlTextReader.cs: when we get an unexpected EOF in ReadContent, set
	the state before throwing the exception if depth > 0.

svn path=/trunk/mcs/; revision=18786
2003-10-09 02:35:08 +00:00
Atsushi Eno f3b6ece17d 2003-10-04 Atsushi Enomoto <[email protected]>
* XmlDocumentFragment.cs,
	  XmlElement.cs,
	  XmlEntityReference.cs : Removed extraneous MonoTODO.
	* XmlNode.cs : Implemented Normalize().
	* XmlNodeReader.cs :
	  - AttributeCount and HasAttributes should return its owner element's
	    value, to be consistent with XmlTextReader.
	  - Fixed Depth to reflect correct attribute/attribute-value iteration.
	  - simplified ownerElement and HasValue.
	  - Prefix won't return null.
	  - MoveToElement() should also work against attribute value nodes.
	* XmlTextReader.cs : MoveToElement() should return false if it is
	  positioned at element itself.

svn path=/trunk/mcs/; revision=18589
2003-10-04 15:09:59 +00:00
Atsushi Eno 469f0f2e8a 2003-10-04 Atsushi Enomoto <[email protected]>
* XmlTextReader.cs : Improved SignificantWhitespace handling.

svn path=/trunk/mcs/; revision=18582
2003-10-04 05:30:23 +00:00
Atsushi Eno 1a44cecb32 2003-09-30 Atsushi Enomoto <[email protected]>
* XmlTextReader.cs : Attribute value token properties were incorrectly
	  set by the linked node.

svn path=/trunk/mcs/; revision=18436
2003-09-30 17:17:52 +00:00
Atsushi Eno 2b05aa1793 2003-09-21 Atsushi Enomoto <[email protected]>
* XmlTextReader.cs :
	  - Fix for bugzilla #48337 (containing Ben's advice on that).
	  - Added internal XmlTokenInfo classes. Nodes are now handled as token
	    objects (linked node, attributes and attribute values). Most of the
	    node state properties and iterating methods are changed to refer to
	    the token classes (except for value builder availability). Removed
	    fields which are never used. CompileDTDSubset() is changed in
	    reflection to nodeType field removal.
	  - Fixed Depth that should vary in moving between attributes and/or
	    reading attribute values.
	  - LineNumber and LinePosition now returns more correct location.
	  - Fixed Value that should still return true if its value is an empty
	    attribute value string.
	  - EntityValue is checked WFC constraints even thoug it is not used.
	  - All .ctor() now initializes ReadState as Initial.
	  - Read() should be available for attribute value constructor.
	* XmlAttribute.cs : set_InnerXml() now calls reader's Read().

svn path=/trunk/mcs/; revision=18240
2003-09-21 08:05:31 +00:00
Ben Maurer e3dbc393a2 2003-08-18 Ben Maurer <[email protected]>
* System.Xml.dll.source: add System.Xml/HighWaterStack.cs
        * XmlChar.cs (IsWhitespace): Spare enumerator allocation.
        * XmlTextWriter.cs (WriteWhitespace): Enumerators are very high in
        fat, use low-fat loops instead. Even better, call the function
        inside XmlChar for code reuse.
        * HighWaterStack.cs (added): New class that acts like a Stack, but
        helps with memory allocation.
        * XmlNamespaceManager.cs, XmlParserContext.cs: Rewrote to use
        HighWaterStack.
        * XmlTextReader.cs: Remove orderedAttributesEnumerator variable,
        use a variable that stores the position in the ArrayList.

svn path=/trunk/mcs/; revision=17385
2003-08-18 21:54:50 +00:00
Atsushi Eno 8a41b1cdd2 2003-08-14 Atsushi Enomoto <[email protected]>
* 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
2003-08-14 15:56:58 +00:00
Atsushi Eno cd0ee00b63 2003-08-10 Atsushi Enomoto <[email protected]>
* 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(&#9;).
	* 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
2003-08-10 07:20:07 +00:00
Atsushi Eno 60b921f4e7 2003-08-09 Atsushi Enomoto <[email protected]>
* XmlTextReader.cs : Checked and fixed all TryExpandPERef() invokation
	  and supplied SkipWhitespace() as they needed. It broke monodoc.
	  Fixed ReadEntityValueDecl() to get correct value.

svn path=/trunk/mcs/; revision=17203
2003-08-09 15:24:07 +00:00
Atsushi Eno 54cf27af0a 2003-08-08 Atsushi Enomoto <[email protected]>
* 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
2003-08-09 09:48:35 +00:00
Atsushi Eno 87249885f7 2003-08-07 Atsushi Enomoto <[email protected]>
* 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
2003-08-07 22:08:17 +00:00
Atsushi Eno 993194539b 2003-08-03 Atsushi Enomoto <[email protected]>
* DTDValidatingReader.cs,
	  XmlNodeReader.cs,
	  XmlReader.cs,
	  XmlTextReader.cs,
	  XmlValidatingReader.cs : fixed pragma USE_VERSION_1_0 to NET_1_0.

svn path=/trunk/mcs/; revision=17016
2003-08-03 14:38:55 +00:00
Atsushi Eno 065f369a36 2003-08-03 Atsushi Enomoto <[email protected]>
* 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
2003-08-03 06:30:38 +00:00
Atsushi Eno 3de188080d 2003-07-31 Atsushi Enomoto <[email protected]>
* XmlParserContext.cs,
	  XmlAttribute.cs,
	  XmlElement.cs : Added internal Dtd and new internal XmlParserContext
	  .ctor() that takes DTDObjectModel. And then rewrote classes which
	  uses DTD information. Changed DocTypeName, InternalSubset, PublicId
	  and SystemId to use DTDObjectModel.
	* DTDObjectModel.cs :
	  Added DTDObjectModel.InternalSubsetHasPEReference.
	  Added DTDEntityDeclaration.IsInternalSubset.
	* XmlTextReader.cs :
	  Added internal GetInternalParserContext (to build entity reader).
	  Added private isIntSubset to check if the DTD subset is internal or
	  external, which might affect well-formedness constraints.
	  Changed GenerateDTDObjectModel to return the resulting DTD model.

	* XmlEntityReference.cs : implemented BaseURI.
	* XmlNodeReader.cs :
	  - Implemented ResolveEntity() and CanResolveEntity(). In fact
	    it leads too many changes on almost all methods and properties,
	    since they now must be aware of entityReader.
	  - fixed ownerElement that might be used to return from attribute
	    value to the element through parent attribtues.
	  - Now changed indexer to call GetAttribute() and moved actual logic
	    to the matching GetAttribute() methods.

svn path=/trunk/mcs/; revision=16946
2003-07-31 18:01:50 +00:00
Atsushi Eno 155737a339 2003-07-26 Atsushi Enomoto <[email protected]>
* XmlDocumentType.cs :
	  modified private DTD to dtd and added internal DTD (the same thing).
	* XmlElement.cs :
	  Fixed SetAttributeNode() to check if specified attribute is already
	  set to the other element. In fact it is W3C DOM's specification but
	  MS.NET 1.0 failed to catch it.
	* XmlTextReader.cs :
	  ReadAttributeValue() should check if the value of the attribute is
	  already read when the whole value is entity reference.
	  Also, Name of text nodes should be "", not "#text"

svn path=/trunk/mcs/; revision=16716
2003-07-26 19:38:37 +00:00
Atsushi Eno 344d80fd69 2003-07-26 Atsushi Enomoto <[email protected]>
* XmlAttribute.cs : .ctor() shouldallow localName "xml" (not prefix)
	  with http://www.w3.org/XML/1998/namespace.
	* XmlEntity.cs : patch by Aleksey Sanin. InnerText is now supported.
	* XmlNode.cs : InnerText should handle CDATA and whitespaces.
	* XmlTextReader.cs : Should allow " (#PCDATA)* " in ReadContentSpec().
	* XmlTextWriter.cs : Quick fix for accepting (and writing) same-named
	  attributes (as MS.NET does). It isn't good way and I may change it.

svn path=/trunk/mcs/; revision=16702
2003-07-26 08:47:54 +00:00
Atsushi Eno 750f51d4f9 2003-07-24 Atsushi Enomoto <[email protected]>
* 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
2003-07-24 16:19:39 +00:00
Atsushi Eno e34b50d2a3 2003-07-15 Atsushi Enomoto <[email protected]>
* DTDValidatingReader.cs :
	  added DTDObjectModel support for non-XmlTextReader XmlReader
	  e.g. XmlNodeReader (Read() method).
	* XmlDocument.cs :
	  added internal CreateDocumentType(XmlTextReader) and moved
	  ReadDoctypeNode() to XmlDocumentType.ImportFromDTD().
	* XmlDocumentType.cs :
	  added internal .ctor(XmlTextReader, document) and ImportFromDTD().
	* XmlTextReader.cs :
	  Renamed useSbForVal (valueBuilderAvailable), valSb (valueBuilder)
	  and currentSubset (DTD).
	  Added GenerateDTDObjectModel() (for independent doctype parsing).

svn path=/trunk/mcs/; revision=16267
2003-07-15 16:58:54 +00:00
Atsushi Eno 86b8448fdb 2003-07-12 Atsushi Enomoto <[email protected]>
* XmlAttribute.cs,
	  XmlElement.cs : Fixed CloneNode() for bug #46129.
	* XmlDocument.cs : Fixed MakeReaderErrorMessage that specified invalid
	  String.Format arguments, and basically XmlException.ctor(
	  IXmlLineInfo, message) seems good idea to use.
	* XmlTextReader.cs :
	  - Fixed .ctor(Stream, XmlNodeType, XmlParserContext) which had
	    required non-null context which don't have to exist.
	  - Added state check. Introduced 'currentState' and 'maybeTextDecl'
	    (for external entity) and removed hasEnteredDocument. Added
	    state-check logic to ReadStartTag(), ReadEndTag(), ReadText(),
	    ReadCData(), ReadDoctypeDecl() and ReadWhitespace().
	  - Replaced throw ReaderError() with throw new XmlException() and
	    fixed that some error hadn't thrown, only created.
	  - ResetState() should re-initialize existing private members other
	    than some specified fields.
	  - Private AddAttribute() should check if the same-named attribute
	    already exists.
	* DTDObjectModel.cs : Additive declaration for ATTLIST is availabe now.

svn path=/trunk/mcs/; revision=16131
2003-07-12 07:39:25 +00:00
Lluis Sanchez d6e1901b61 * XmlTextReader.cs : Implemented ResetState() method.
svn path=/trunk/mcs/; revision=16059
2003-07-09 16:48:52 +00:00
Atsushi Eno d6b7b632e3 2003-07-06 Atsushi Enomoto <[email protected]>
* XmlDocument.cs : Load(string filename) should close its stream.
	  Small change for the latest DTDObjectModel change.
	* XmlTextReader.cs : Changed for the latest DTDObjectModel change (all
	  changed methods are only related to DTD stuff).
	  Now uses XmlSchemaDatatype for attribute type definition.
	* XmlValidatingReader : initial (limited) support for DTD validation.
	  It can handle only XmlTextReader.
	* DTDObjectModel.cs : changed radically for initial validation support.
	* added DTDAutomata.cs and DTDValidatingReader.cs.

svn path=/trunk/mcs/; revision=15983
2003-07-06 16:17:31 +00:00
Atsushi Eno c97844a111 2003-06-21 Atsushi Enomoto <[email protected]>
* XmlTextReader.cs : removed CRLFs. Fixed private InitializeContext()
	  to use known Uri way (used in XmlUrlResolver) instead of UriBuilder.

svn path=/trunk/mcs/; revision=15530
2003-06-21 07:22:57 +00:00
Ben Maurer 3a76435d6d 2003-06-20 Ben Maurer <[email protected]>
* XmlTextReader.cs: Reduces memory allocation when the reader is
	not queried for some values.

svn path=/trunk/mcs/; revision=15518
2003-06-20 17:30:51 +00:00
Atsushi Eno c1afba2caf 2003-06-16 Atsushi Enomoto <[email protected]>
* XmlNodeReader.cs : fixed MoveToNextAttribute(). In some cases
	  this method set current node null.
	* XmlTextReader.cs : fixed GetAttribute (name, ns), which returned
	  String.Empty instead of null (expected value).
	* XmlTextReader.cs,
	  XmlUrlResolver.cs,
	  XmlInputStream.cs : fixed BaseURI problem (bug #44231).

svn path=/trunk/mcs/; revision=15440
2003-06-16 16:57:39 +00:00
Lluis Sanchez 5584fe9d90 * XmlTextReader.cs : MoveToAttribute methods must set the enumerator to the right
position, since MoveToNextAttribute may be called after it.
	  SetProperties(): attributes do not "inherit" the namespace.
	* XmlDocument.cs: ReadNode(), ReadAttributeNode(): must keep the current reader position.

svn path=/trunk/mcs/; revision=14975
2003-05-28 22:13:28 +00:00
Atsushi Eno 5ca10162aa 2003-05-27 Atsushi Enomoto <[email protected]>
* NameTable.cs : Add() sets the given name string interned.
	* XmlParserContext.cs : added internal PushScope() and PopScope() to
	  hold stacks of xml:base, xml:lang and xml:space.
	* XmlTextReader.cs : implemented XmlLang and XmlSpace (only as a
	  property for stacked attributes). Renamed Initialize() to Initialize-
	  Context(). Modified to use XmlParserContext.PushScope()/PopScope().

svn path=/trunk/mcs/; revision=14891
2003-05-26 17:59:08 +00:00