2004-01-15 Atsushi Enomoto <atsushi@ximian.com>

	* XsdValidatingReader.cs : Now use ValidatableParticle instead of
	  ContentTypeParticle.  Use BaseXmlSchemaType.

svn path=/trunk/mcs/; revision=22109

diff --git a/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog b/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog
index b936c49945fb17e0dc6362334300edde64608026..3ede2581876290da21591b86d5fa683cdf9b501c 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog
+++ b/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog
@@ -1,3 +1,8 @@
+2004-01-15  Atsushi Enomoto <atsushi@ximian.com>
+
+       * XsdValidatingReader.cs : Now use ValidatableParticle instead of
+         ContentTypeParticle.  Use BaseXmlSchemaType.
+
 2004-01-14  Atsushi Enomoto <atsushi@ximian.com>
 
        * XsdIdentityState.cs :

diff --git a/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs b/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
index 22bd277bc283b863f10e6c7e43326bc5f5b59903..1f09fbe47668b1072e9c5097b289e466db1caba8 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
+++ b/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
@@ -687,7 +687,7 @@ namespace Mono.Xml.Schema
                                                 * be restriction?
                                                 * */
                                                 // mmm, will check later.
-                                               XmlSchemaSimpleType baseType = str.ActualBaseSchemaType as XmlSchemaSimpleType;
+                                               XmlSchemaSimpleType baseType = st.BaseXmlSchemaType as XmlSchemaSimpleType;
                                                if (baseType != null) {
                                                         AssessStringValid(baseType, dt, normalized);
                                                }
@@ -866,7 +866,7 @@ namespace Mono.Xml.Schema
                        // Finally, create child particle state.
                        XmlSchemaComplexType xsComplexType = SchemaType as XmlSchemaComplexType;
                        if (xsComplexType != null)
-                               childParticleState = stateManager.Create (xsComplexType.ContentTypeParticle);
+                               childParticleState = stateManager.Create (xsComplexType.ValidatableParticle);
                        else if (stateManager.ProcessContents == XmlSchemaContentProcessing.Lax)
                                childParticleState = stateManager.Create (XmlSchemaAny.AnyTypeContent);
                        else