Commit Graph
122 Commits
Author SHA1 Message Date
Atsushi Eno e38f6d2220 2004-09-07 Atsushi Enomoto <[email protected]>
* IXmlType.cs : deprecated in .NET 2.0.

svn path=/trunk/mcs/; revision=33471
2004-09-07 06:29:02 +00:00
Atsushi Eno d59f500948 2004-09-03 Atsushi Enomoto <[email protected]>
* XmlSchema.cs : When schema inclusion results in a recursion, just
	  skip recursed schema.
	* BUGS-MS.txt : added another entry. Reflected response from Microsoft.

svn path=/trunk/mcs/; revision=33258
2004-09-03 10:02:42 +00:00
Atsushi Eno da424bb0a7 2004-08-30 Atsushi Enomoto <[email protected]>
* XmlSchemaType.cs : quick build fix.

svn path=/trunk/mcs/; revision=33012
2004-08-30 02:50:23 +00:00
Atsushi Eno 8f89524e5f 2004-08-30 Atsushi Enomoto <[email protected]>
* XmlSchemaDatatype.cs : Removed FromName(localName) that cannot
	  handle xdt:* types.
	* XmlSchemaType.cs : added internal GetBuiltInType() methods that
	  mix GetBuiltInSimpleType() and GetBuiltInComplexType().

svn path=/trunk/mcs/; revision=33009
2004-08-30 01:33:00 +00:00
Atsushi Eno fe379229e4 2004-08-25 Atsushi Enomoto <[email protected]>
* XmlSchemaSimpleType.cs : Fill list types such as xs:IDREFS.
	* XmlSchemaType.cs :
	  Fixed TypeCode more (broken on predefined list types and xs:anyType).

svn path=/trunk/mcs/; revision=32810
2004-08-25 08:20:25 +00:00
Atsushi Eno 3125c1c2b4 2004-08-25 Atsushi Enomoto <[email protected]>
* XmlSchemaType.cs :
	  anyType was anonymous, thus GetBuiltInComplexType() didn't work.

svn path=/trunk/mcs/; revision=32809
2004-08-25 06:09:20 +00:00
Atsushi Eno 20332463f8 2004-08-24 Atsushi Enomoto <[email protected]>
* XmlSchemaType.cs : return XmlTypeCode.AnyAtomicType for
	  anySimpleType's TypeCode property.

svn path=/trunk/mcs/; revision=32754
2004-08-24 14:30:27 +00:00
Atsushi Eno e91b293dbc 2004-08-10 Atsushi Enomoto <[email protected]>
* 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
2004-08-10 14:25:39 +00:00
Atsushi Eno 4fe7d6d0e2 2004-08-10 Atsushi Enomoto <[email protected]>
* XmlSchemaCollection.cs : replaced CRLF to LF (they were mixed).

svn path=/trunk/mcs/; revision=32142
2004-08-10 14:08:10 +00:00
Atsushi Eno 2fe23db0c0 2004-08-10 Atsushi Enomoto <[email protected]>
* XmlSchema.cs : code reformatting. convert CRLF to LF.
	  Use String.Format() instead of +. Removed commented code.

svn path=/trunk/mcs/; revision=32132
2004-08-10 05:56:33 +00:00
Atsushi Eno af9ff658c4 2004-07-28 Atsushi Enomoto <[email protected]>
* BuiltInDatatype.cs : use XmlQualifiedName.Parse().

svn path=/trunk/mcs/; revision=31541
2004-07-28 09:12:16 +00:00
Atsushi Eno adb3e06e63 2004-07-23 Atsushi Enomoto <[email protected]>
* XmlSchema.cs : Added internal XdtNamespace constant. don't fill
	  schemaset compoenents here.
	* XmlSchemaAttribute.cs : Implemented AttributeSchemaType.
	* XmlSchemaElement.cs : Implemented ElementSchemaType.
	* XmlSchemaSimpleType.cs : Added predefined simple types
	* XmlSchemaType.cs : Implemented GetBuiltInSimpleType().
	* XmlSchemaDatatype.cs : Allow Xdt namespaces too (not completed;
	  quick fix for GetBuiltInSimpleType()).

svn path=/trunk/mcs/; revision=31415
2004-07-23 16:07:03 +00:00
Atsushi Eno 6c7ace253c 2004-07-21 Atsushi Enomoto <[email protected]>
* BUGS-MS.txt : updated including answer excerpts from MS team.
	* BUGS.txt : it turned out that some bugs I wrote as "MS bugs" are
	  actually my bug. Noted them.
	* BuiltInDatatype.cs :
	  Commented out extraneous [CLSCompliant].
	  Switch ParseValue() argument as IXmlNamespaceResolver for 2.0, and
	  XmlNamespaceManager for 1.x.
	  Added TypeCode overrides.
	* XmlSchemaDatatype.cs : Added 2.0 members.
	  Switch IXmlNamespaceResolver and XmlNamespaceManager.
	* XmlSchemaType.cs : Added some NET_2_0 members. removed old 1.2 stuff.

svn path=/trunk/mcs/; revision=31335
2004-07-21 14:52:25 +00:00
Atsushi Eno c396b3e156 2004-07-13 Atsushi Enomoto <[email protected]>
* XmlSchemaBuiltInType.cs, XmlSchemaValidity.cs, XmlTypeCode.cs
	  : fixed annoying enum errors.
	* XmlSchemaCollection.cs : completely delegate to XmlSchemaSet.
	* XmlSchemaSet.cs : sealed classes. Use ListDictionary (avoid annoying
	  order preservation matter). NameTable null check for .ctor().
	  Fill GlobalAttributes, GlobalElements, GlobalTypes correctly.
	  Add(string, XmlReader) checks namespace conflicts, while
	  Add(XmlSchema) does not. Fixed Schemas() return type.

svn path=/trunk/mcs/; revision=31079
2004-07-13 13:42:32 +00:00
Atsushi Eno 2cd43b9ee7 2004-07-11 Atsushi Enomoto <[email protected]>
* XmlSchemaDatatypeVariety.cs : Fixed class name typo.
	* XmlValueConverter.cs : fixed return types.

svn path=/trunk/mcs/; revision=30991
2004-07-11 03:02:56 +00:00
Duncan Mak 8fa6e766dd Add MIT license to System.XML.DLL
svn path=/trunk/mcs/; revision=30055
2004-06-21 18:07:31 +00:00
Atsushi Eno 4cf0759319 2004-06-18 Atsushi Enomoto <[email protected]>
* CustomSerializer.cs, XmlSchemaException.cs,
	  XmlSchemaParticle.cs, XmlSchemaSimpleTypeRestriction.cs
	  : Globalization.

svn path=/trunk/mcs/; revision=29827
2004-06-18 01:25:07 +00:00
Atsushi Eno 1262953080 2004-06-10 Atsushi Enomoto <[email protected]>
* XmlSchemaFacet.cs : Fixed internal protected --> internal.

svn path=/trunk/mcs/; revision=29158
2004-06-10 05:29:42 +00:00
Atsushi Eno adfc9a4885 2004-06-06 Atsushi Enomoto <[email protected]>
* XmlSchema.cs : Make sure to close url-based XmlTextReader.

svn path=/trunk/mcs/; revision=28909
2004-06-06 14:48:43 +00:00
Atsushi Eno bba3fd5d13 2004-06-03 Atsushi Enomoto <[email protected]>
* BuiltInDatatype.cs,
	  XmlSchemaFacet.cs,
	  XmlSchemaSimpleTypeRestriction.cs,
	  XmlSchemaXPath.cs : modified some enum const to static readonly
	  (.NET 1.0 does not allow it). Use safe overload of LookupNamespace().

svn path=/trunk/mcs/; revision=28790
2004-06-03 21:03:29 +00:00
Atsushi Eno 68bc8cf585 2004-05-22 Atsushi Enomoto <[email protected]>
* XmlSchemaDatatypeVariety.cs,
	  XmlSchemaValidity.cs : they are NET_2_0 enums.

svn path=/trunk/mcs/; revision=27896
2004-05-22 17:54:59 +00:00
Atsushi Eno 744ed5b65f 2004-05-22 Atsushi Enomoto <[email protected]>
* XmlValueConverter.cs : missed NET_2_0.

svn path=/trunk/mcs/; revision=27889
2004-05-22 17:13:47 +00:00
Atsushi Eno 01f2cf3765 2004-05-22 Atsushi Enomoto <[email protected]>
* IXmlSchemaInfo.cs,
	  IXmlType.cs,
	  XmlSchemaDatatypeVariety.cs,
	  XmlSchemaValidity.cs,
	  XmlTypeCode.cs,
	  XmlValueConverter.cs : added.

	* XmlSchemaInfo.cs : removed (.NET 1.2).

	* XmlSchemaBuiltInType.cs,
	  XmlSchemaSet.cs : updated.

svn path=/trunk/mcs/; revision=27883
2004-05-22 16:57:46 +00:00
Atsushi Eno 1b720ab0bd 2004-05-19 Atsushi Enomoto <[email protected]>
* CustomSerializer.cs : Added custom serializer for XmlSchema, that is
	  generated by SerializationCodeGenerator and edited a bit.
	* XmlSchema.cs : Use XmlSchemaSerializationWriter.

svn path=/trunk/mcs/; revision=27680
2004-05-19 14:57:24 +00:00
Atsushi Eno a30aba7e98 2004-05-13 Atsushi Enomoto <[email protected]>
* XmlSchema.cs : Removed FIXME. No PSVI required.
	* XmlSchemaAll.cs : Removed FIXME. It was not done.
	* XmlSchemaAttributeGroupRef.cs : Removed FIXME. It can be annotated.
	* XmlSchemaChoice.cs : not FIXME but LAMESPEC.
	* XmlSchemaSimpleTypeRestriction.cs : Added check for non
	  XmlSchemaFacet items on Compile(). Thus removed FIXME.
	* XmlSchemaUtil.cs : Fixed SplitList to handle sequential spaces.
	  Thus removed FIXME.
	* XmlSchemaObjectTable. cs: modified to use HybridDictionary (mostly
	  for avoiding iterator order difference).

svn path=/trunk/mcs/; revision=27232
2004-05-13 07:09:03 +00:00
Atsushi Eno e0cfce445b 2004-05-13 Atsushi Enomoto <[email protected]>
* XmlSchemaSimpleTypeRestriction.cs : Removed MonoTODO. done.

svn path=/trunk/mcs/; revision=27222
2004-05-13 05:01:01 +00:00
Atsushi Eno 848a8c8c44 2004-05-12 Atsushi Enomoto <[email protected]>
* BuiltInDatatype.cs : made classes/enums internal.

svn path=/trunk/mcs/; revision=27150
2004-05-12 09:12:13 +00:00
Atsushi Eno 6b9acee880 2004-05-05 Atsushi Enomoto <[email protected]>
* BuiltInDatatype.cs : trivia fix

svn path=/trunk/mcs/; revision=26738
2004-05-05 04:56:09 +00:00
Atsushi Eno b13d1c2c41 2004-05-05 Atsushi Enomoto <[email protected]>
* BuiltInDatatype.cs : added BUGGY_MS_COMPLIANT condition and that
	  handles ms-compatible properties.
	* XmlSchemaComplexType.cs : ditto for ContentTypeParticle of xs:anyType.
	  Make sure ContentType for xs:anyType is Mixed.
	* XmlSchemaUtil.cs : ditto for <xs:attribute use="prohibited" ..>

svn path=/trunk/mcs/; revision=26737
2004-05-05 04:44:49 +00:00
Atsushi Eno c381e2e366 2004-05-05 Atsushi Enomoto <[email protected]>
* XmlSchema.cs : Write() handles schema namespace for xmlserializer
	  (it does not look to be handled inside xmlserializer).

svn path=/trunk/mcs/; revision=26735
2004-05-05 04:27:22 +00:00
Ben Maurer 5db92a2ab9 readonlyificate
svn path=/trunk/mcs/; revision=26466
2004-04-30 20:56:49 +00:00
Ben Maurer bc37e00fc3 constify
svn path=/trunk/mcs/; revision=26464
2004-04-30 20:46:43 +00:00
Atsushi Eno e4ff98d731 2004-04-27 Atsushi Enomoto <[email protected]>
* XmlSchemaComplexType.cs : Set basetype as ur-type for such complex
	  type that has an immediate Particle (W3C specified as restriction
	  of ur-type).

svn path=/trunk/mcs/; revision=26084
2004-04-27 20:54:30 +00:00
Atsushi Eno c35e3cfe51 2004-04-27 Atsushi Enomoto <[email protected]>
* XmlSchemaAttribute.cs : When type was inline simple type, it is not
	  validated correctly.
	* XmlSchemaSimpleType.cs : When Content was restriction, DataType was
	  not indicating base type's Datatype correctly.

svn path=/trunk/mcs/; revision=26050
2004-04-27 10:34:28 +00:00
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 628f4cd017 2004-04-06 Atsushi Enomoto <[email protected]>
* XmlSchemaDatatype.cs : optimized Normalize() not to create
	  extraneous string objects.

svn path=/trunk/mcs/; revision=25065
2004-04-05 23:20:40 +00:00
Atsushi Eno a97fb3b779 2004-03-15 Atsushi Enomoto <[email protected]>
* reverted the latest XmlSchemaUnique.cs change (MS.NET looks fine to
	  reject incorrect schemas ;-)

svn path=/trunk/mcs/; revision=24080
2004-03-15 23:02:12 +00:00
Alon Gazit 45049587af Changed Read implementation.
Currently can read "field" element before "selector" element (like MS).

svn path=/trunk/mcs/; revision=23686
2004-03-04 13:23:15 +00:00
Atsushi Eno b46e22b92a 2004-02-26 Atsushi Enomoto <[email protected]>
* XmlSchemaCollection.cs : Implemented SyncRoot and IsSynchronized
	  (as always synchronized).

svn path=/trunk/mcs/; revision=23480
2004-02-26 10:18:21 +00:00
Atsushi Eno 4755d3e031 2004-02-16 Atsushi Enomoto <[email protected]>
* XmlSchema.cs,
	  XmlSchemaAttribute.cs
	  XmlSchemaAttributeGroup.cs,
	  XmlSchemaComplexContent.cs,
	  XmlSchemaComplexType.cs,
	  XmlSchemaContent.cs,
	  XmlSchemaDatatype.cs,
	  XmlSchemaNotation.cs,
	  XmlSchemaObject.cs,
	  XmlSchemaParticle.cs : extra TODO removal. foreach elimination.
	    Moved attribute group recursion check field from XmlSchemaObject
	    to XmlSchemaAttributeGroup.
	    Fixed XmlSchemaParticle.EmptyParticle class access modifier.
	* XmlSchemaSimpleType.cs,
	  XmlSchemaSimpleTypeContent.cs,
	  XmlSchemaSimpleTypeList.cs,
	  XmlSchemaSimpleTypeRestriction.cs,
	  XmlSchemaSimpleTypeUnion.cs : Removed "actualBaseSchemaType" field
	    and the owner simpleType should hold the corresponding type info.
	    Collect base type info in prior to validation.

svn path=/trunk/mcs/; revision=23143
2004-02-16 19:38:38 +00:00
Atsushi Eno 06dcbf55a3 2004-02-05 Atsushi Enomoto <[email protected]>
* BUGS-MS.txt : fixed incorrect thought on case 008. Added case 014.
	* BUGS.txt : FYI.

svn path=/trunk/mcs/; revision=22803
2004-02-05 16:23:00 +00:00
Atsushi Eno a4d7dd056a 2004-02-03 Atsushi Enomoto <[email protected]>
* BuiltInDatatype.cs : Fixed some Parse() for token based datatypes.
	* XmlSchemaAny.cs : set properties for cloned particle. This will fix
	  bugzilla #53668.
	* XmlSchemaParticle.cs : copy occurence string after computation of
	  validated min/max occurence. This will fix bug #53667.

svn path=/trunk/mcs/; revision=22731
2004-02-03 08:09:06 +00:00
Atsushi Eno 110c7c12fd 2004-01-26 Atsushi Enomoto <[email protected]>
* 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
2004-01-26 18:24:22 +00:00
Atsushi Eno 279ee7f9e6 2004-01-22 Atsushi Enomoto <[email protected]>
* 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
2004-01-22 16:31:31 +00:00
Atsushi Eno b8eda76bbd 2004-01-22 Atsushi Enomoto <[email protected]>
* 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
2004-01-22 09:26:02 +00:00
Atsushi Eno 70d8738c62 2004-01-22 Atsushi Enomoto <[email protected]>
* XmlSchemaSimpleTypeRestriction.cs : regexp improvements. Modify
	  pattern string as "^str$" and convert WXS specific char classes into
	  .NET regexp patterns.

svn path=/trunk/mcs/; revision=22386
2004-01-22 07:52:08 +00:00
Atsushi Eno ccd5f38514 2004-01-21 Atsushi Enomoto <[email protected]>
* 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
2004-01-21 08:06:51 +00:00
Atsushi Eno 65e898a786 2004-01-21 Atsushi Enomoto <[email protected]>
* XmlSchemaXPath.cs : wildcard with prefix (e.g. @foo:*) was
	  incorrectly treated.

svn path=/trunk/mcs/; revision=22320
2004-01-21 04:52:34 +00:00
Atsushi Eno ff34df6059 2004-01-20 Atsushi Enomoto <[email protected]>
* SchemaDataValueType.cs : UriValueType.ToString() should return
	  actual URI string (as MS's XmlSchemaUri class does).
	* XmlSchemaReader.cs : Make it internal.

svn path=/trunk/mcs/; revision=22288
2004-01-20 07:41:39 +00:00
David Sheldon e1e3df901a 2004-01-16 David Sheldon <[email protected]>
* BuiltInDatatype.cs: added guard to stop index out of range error for
         invalid Base64 characters.

svn path=/trunk/mcs/; revision=22152
2004-01-16 08:39:15 +00:00