2004-12-16 Atsushi Enomoto <atsushi@ximian.com>

	* XsdValidatingReader.cs : added ActualSchemaType to context type.
	* XmlSchemaValidatingReader.cs : added SchemaInfo override.

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

diff --git a/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog b/mcs/class/System.XML/Mono.Xml.Schema/ChangeLog
index bca32836653ee0a962862785512e0675f1320d85..c265b8f4e82e6389e2d0e07d1fedf7484b120e4e 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-12-16  Atsushi Enomoto <atsushi@ximian.com>
+
+       * XsdValidatingReader.cs : added ActualSchemaType to context type.
+       * XmlSchemaValidatingReader.cs : added SchemaInfo override.
+
 2004-12-16  Atsushi Enomoto <atsushi@ximian.com>
 
        * XsdParticleValidationState.cs :

diff --git a/mcs/class/System.XML/Mono.Xml.Schema/XmlSchemaValidatingReader.cs b/mcs/class/System.XML/Mono.Xml.Schema/XmlSchemaValidatingReader.cs
index de5d1d2f36eed5913360bf9d825a9bd173400b0c..51b9b08319c70a1115c3b3aeae645d2e625b7229 100755 (executable)
--- a/mcs/class/System.XML/Mono.Xml.Schema/XmlSchemaValidatingReader.cs
+++ b/mcs/class/System.XML/Mono.Xml.Schema/XmlSchemaValidatingReader.cs
@@ -449,6 +449,10 @@ namespace Mono.Xml.Schema
                        get { return reader.ReadState; }
                }
 
+               public override IXmlSchemaInfo SchemaInfo {
+                       get { return xsinfo; }
+               }
+
                public override string Value {
                        get {
                                if (currentDefaultAttribute < 0)

diff --git a/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs b/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
index aa7c14435154d78d266e2a55b8e282473a13e155..4c5a4c66732d884254ba07df583dcc9ca49b566c 100644 (file)
--- a/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
+++ b/mcs/class/System.XML/Mono.Xml.Schema/XsdValidatingReader.cs
@@ -1722,6 +1722,21 @@ namespace Mono.Xml.Schema
                        }
                }
 
+#if NET_2_0
+               public XmlSchemaType ActualSchemaType {
+                       get {
+                               object at = ActualType;
+                               if (at == null)
+                                       return null;
+                               XmlSchemaType st = at as XmlSchemaType;
+                               if (st == null)
+                                       st = XmlSchemaType.GetBuiltInSimpleType (
+                                       ((XmlSchemaDatatype) at).TypeCode);
+                               return st;
+                       }
+               }
+#endif
+
                public bool IsInvalid {
                        get { return State == XsdValidationState.Invalid; }
                }