Reformat changes, and add some small debugging information to catch errors

[mono.git] / mcs / class / System.XML / System.Xml.Schema / XmlSchemaKeyref.cs

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaKeyref.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaKeyref.cs
index fdf88199334991563d3315efd23d6b5e1093fc10..f22a40f23bd26a1137b75ff9d0fa34e8b1f52fb4 100755 (executable)
--- a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaKeyref.cs
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaKeyref.cs
@@ -12,7 +12,7 @@ namespace System.Xml.Schema
        public class XmlSchemaKeyref : XmlSchemaIdentityConstraint\r
        {\r
                private XmlQualifiedName refer;\r
-               private int errorCount;\r
+               private static string xmlname = "keyref";\r
 \r
                public XmlSchemaKeyref()\r
                {\r
@@ -33,9 +33,12 @@ namespace System.Xml.Schema
                [MonoTODO]\r
                internal new int Compile(ValidationEventHandler h, XmlSchemaInfo info)\r
                {\r
-                       errorCount = base.Compile(h,info);\r
+                       errorCount += base.Compile(h,info);\r
                        if(refer == null || refer.IsEmpty)\r
                                error(h,"refer must be present");\r
+                       else if(!XmlSchemaUtil.CheckQName(refer))\r
+                               error(h,"Refer is not a valid XmlQualifiedName");\r
+\r
                        return errorCount;\r
                }\r
                \r
@@ -50,5 +53,99 @@ namespace System.Xml.Schema
                        errorCount++;\r
                        ValidationHandler.RaiseValidationError(handle, this, message);\r
                }\r
+               //<key \r
+               //  id = ID \r
+               //  name = NCName \r
+               //  refer = QName \r
+               //  {any attributes with non-schema namespace . . .}>\r
+               //  Content: (annotation?, (selector, field+))\r
+               //</key>\r
+               internal static XmlSchemaKeyref Read(XmlSchemaReader reader, ValidationEventHandler h)\r
+               {\r
+                       XmlSchemaKeyref keyref = new XmlSchemaKeyref();\r
+                       reader.MoveToElement();\r
+\r
+                       if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)\r
+                       {\r
+                               error(h,"Should not happen :1: XmlSchemaKeyref.Read, name="+reader.Name,null);\r
+                               reader.Skip();\r
+                               return null;\r
+                       }\r
+\r
+                       keyref.LineNumber = reader.LineNumber;\r
+                       keyref.LinePosition = reader.LinePosition;\r
+                       keyref.SourceUri = reader.BaseURI;\r
+\r
+                       while(reader.MoveToNextAttribute())\r
+                       {\r
+                               if(reader.Name == "id")\r
+                               {\r
+                                       keyref.Id = reader.Value;\r
+                               }\r
+                               else if(reader.Name == "name")\r
+                               {\r
+                                       keyref.Name = reader.Value;\r
+                               }\r
+                               else if(reader.Name == "refer")\r
+                               {\r
+                                       Exception innerex;\r
+                                       keyref.refer = XmlSchemaUtil.ReadQNameAttribute(reader,out innerex);\r
+                                       if(innerex != null)\r
+                                               error(h, reader.Value + " is not a valid value for refer attribute",innerex);\r
+                               }\r
+                               else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)\r
+                               {\r
+                                       error(h,reader.Name + " is not a valid attribute for keyref",null);\r
+                               }\r
+                               else\r
+                               {\r
+                                       XmlSchemaUtil.ReadUnhandledAttribute(reader,keyref);\r
+                               }\r
+                       }\r
+                       \r
+                       reader.MoveToElement();\r
+                       if(reader.IsEmptyElement)\r
+                               return keyref;\r
+\r
+                       //  Content: annotation?, selector, field+\r
+                       int level = 1;\r
+                       while(reader.ReadNextElement())\r
+                       {\r
+                               if(reader.NodeType == XmlNodeType.EndElement)\r
+                               {\r
+                                       if(reader.LocalName != xmlname)\r
+                                               error(h,"Should not happen :2: XmlSchemaKeyref.Read, name="+reader.Name,null);\r
+                                       break;\r
+                               }\r
+                               if(level <= 1 && reader.LocalName == "annotation")\r
+                               {\r
+                                       level = 2; //Only one annotation\r
+                                       XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);\r
+                                       if(annotation != null)\r
+                                               keyref.Annotation = annotation;\r
+                                       continue;\r
+                               }\r
+                               if(level <= 2 && reader.LocalName == "selector")\r
+                               {\r
+                                       level = 3;\r
+                                       XmlSchemaXPath selector = XmlSchemaXPath.Read(reader,h,"selector");\r
+                                       if(selector != null)\r
+                                               keyref.Selector = selector;\r
+                                       continue;\r
+                               }\r
+                               if(level <= 3 && reader.LocalName == "field")\r
+                               {\r
+                                       level = 3;\r
+                                       if(keyref.Selector == null)\r
+                                               error(h,"selector must be defined before field declarations",null);\r
+                                       XmlSchemaXPath field = XmlSchemaXPath.Read(reader,h,"field");\r
+                                       if(field != null)\r
+                                               keyref.Fields.Add(field);\r
+                                       continue;\r
+                               }\r
+                               reader.RaiseInvalidElementError();\r
+                       }\r
+                       return keyref;\r
+               }\r
        }\r
 }\r