2005-11-07 Lluis Sanchez Gual <lluis@novell.com>

	* XmlSchemaImporter.cs: Added support for restrictions with
	embedded simple type definitions. 


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

1 files changed, 8 insertions, 3 deletions

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
index 443c7a17c51..64f7e4f058c 100644
--- a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
@@ -1132,7 +1132,7 @@ namespace System.Xml.Serialization
 			if (IsPrimitiveTypeNamespace (qname.Namespace))

 				return TypeTranslator.GetPrimitiveTypeData (qname.Name);

 

-			throw new InvalidOperationException ("Definition of type " + qname + " not found");

+			throw new InvalidOperationException ("Definition of type '" + qname + "' not found");

 		}

 

 		TypeData FindBuiltInType (XmlQualifiedName qname, XmlSchemaSimpleType st)

@@ -1140,8 +1140,13 @@ namespace System.Xml.Serialization
 			if (CanBeEnum (st))

 				return ImportType (qname, null, true).TypeData;

 

-			if (st.Content is XmlSchemaSimpleTypeRestriction) {

-				return FindBuiltInType (GetContentBaseType (st.Content));

+			if (st.Content is XmlSchemaSimpleTypeRestriction) {
+				XmlSchemaSimpleTypeRestriction rest = (XmlSchemaSimpleTypeRestriction) st.Content;
+				XmlQualifiedName bn = GetContentBaseType (rest);
+				if (bn == XmlQualifiedName.Empty && rest.BaseType != null)
+					return FindBuiltInType (qname, rest.BaseType);
+				else
+					return FindBuiltInType (bn);

 			}

 			else if (st.Content is XmlSchemaSimpleTypeList) {

 				return FindBuiltInType (GetContentBaseType (st.Content)).ListTypeData;