2004-12-11 Atsushi Enomoto <[email protected]>

	* XsdIdentityState.cs,
	  XsdIdentityPath.cs,
	  XsdKeyTable.cs : fixed mixed line ending.



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

mcs/class/System.XML/Mono.Xml.Schema/ChangeLog

@@ -1,3 +1,9 @@
+2004-12-11  Atsushi Enomoto <[email protected]>
+
+	* XsdIdentityState.cs,
+	  XsdIdentityPath.cs,
+	  XsdKeyTable.cs : fixed mixed line ending.
+
 2004-12-11  Atsushi Enomoto <[email protected]>
 
 	* XsdValidatingReader.cs,

mcs/class/System.XML/Mono.Xml.Schema/XsdIdentityPath.cs

@@ -33,77 +33,77 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-using System;
-using System.Collections;
-using System.Xml;
-using System.Xml.Schema;
-
-namespace Mono.Xml.Schema
-{
-	internal class XsdIdentitySelector
-	{
-		XsdIdentityPath [] selectorPaths;
-
-		ArrayList fields = new ArrayList ();
-		XsdIdentityField [] cachedFields;
-
-		public XsdIdentitySelector (XmlSchemaXPath selector)
-		{
-			selectorPaths = selector.CompiledExpression;
-		}
-
-		public XsdIdentityPath [] Paths {
-			get { return selectorPaths; }
-		}
-
-		public void AddField (XsdIdentityField field)
-		{
-			cachedFields = null;
-			fields.Add (field);
-		}
-
-		public XsdIdentityField [] Fields {
-			get {
-				if (cachedFields == null)
-					cachedFields = fields.ToArray (typeof (XsdIdentityField)) as XsdIdentityField [];
-				return cachedFields;
-			}
-		}
-	}
-
-	internal class XsdIdentityField
-	{
-		XsdIdentityPath [] fieldPaths;
-		int index;
-
-		public XsdIdentityField (XmlSchemaXPath field, int index)
-		{
-			this.index = index;
-			fieldPaths = field.CompiledExpression;
-		}
-
-		public XsdIdentityPath [] Paths {
-			get { return fieldPaths; }
-		}
-
-		public int Index {
-			get { return index; }
-		}
-	}
-
-	internal class XsdIdentityPath
-	{
-		public XsdIdentityStep [] OrderedSteps;
-		public bool Descendants;
-	}
-
-	internal class XsdIdentityStep
-	{
-		public bool IsCurrent;
-		public bool IsAttribute;
-		public bool IsAnyName;
-		public string NsName;
-		public string Name;
-		public string Namespace = "";
-	}
-}
+using System;
+using System.Collections;
+using System.Xml;
+using System.Xml.Schema;
+
+namespace Mono.Xml.Schema
+{
+	internal class XsdIdentitySelector
+	{
+		XsdIdentityPath [] selectorPaths;
+
+		ArrayList fields = new ArrayList ();
+		XsdIdentityField [] cachedFields;
+
+		public XsdIdentitySelector (XmlSchemaXPath selector)
+		{
+			selectorPaths = selector.CompiledExpression;
+		}
+
+		public XsdIdentityPath [] Paths {
+			get { return selectorPaths; }
+		}
+
+		public void AddField (XsdIdentityField field)
+		{
+			cachedFields = null;
+			fields.Add (field);
+		}
+
+		public XsdIdentityField [] Fields {
+			get {
+				if (cachedFields == null)
+					cachedFields = fields.ToArray (typeof (XsdIdentityField)) as XsdIdentityField [];
+				return cachedFields;
+			}
+		}
+	}
+
+	internal class XsdIdentityField
+	{
+		XsdIdentityPath [] fieldPaths;
+		int index;
+
+		public XsdIdentityField (XmlSchemaXPath field, int index)
+		{
+			this.index = index;
+			fieldPaths = field.CompiledExpression;
+		}
+
+		public XsdIdentityPath [] Paths {
+			get { return fieldPaths; }
+		}
+
+		public int Index {
+			get { return index; }
+		}
+	}
+
+	internal class XsdIdentityPath
+	{
+		public XsdIdentityStep [] OrderedSteps;
+		public bool Descendants;
+	}
+
+	internal class XsdIdentityStep
+	{
+		public bool IsCurrent;
+		public bool IsAttribute;
+		public bool IsAnyName;
+		public string NsName;
+		public string Name;
+		public string Namespace = "";
+	}
+}

mcs/class/System.XML/Mono.Xml.Schema/XsdIdentityState.cs

@@ -31,53 +31,53 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Globalization;
-using System.Xml;
-using System.Xml.Schema;
-
-namespace Mono.Xml.Schema
-{
-	internal class XsdKeyEntryField
-	{
-		XsdKeyEntry entry;
-		XsdIdentityField field;
-
-		public XsdKeyEntryField (XsdKeyEntry entry, XsdIdentityField field)
-		{
-			this.entry = entry;
-			this.field = field;
-		}
-
-		public XsdIdentityField Field {
-			get { return field; }
-		}
-
-		public bool FieldFound;
-		public int FieldLineNumber;
-		public int FieldLinePosition;
-		public bool FieldHasLineInfo;
-		public XsdAnySimpleType FieldType;
-
-		public object Identity;
-		public bool IsXsiNil;
-
-		public int FieldFoundDepth;
-		public XsdIdentityPath FieldFoundPath;
-
-		public bool Consuming;
-		public bool Consumed;
-
-		// Return false if there is already the same key.
-		public bool SetIdentityField (object identity, bool isXsiNil, XsdAnySimpleType type, int depth, IXmlLineInfo li)
-		{
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.Xml;
+using System.Xml.Schema;
+
+namespace Mono.Xml.Schema
+{
+	internal class XsdKeyEntryField
+	{
+		XsdKeyEntry entry;
+		XsdIdentityField field;
+
+		public XsdKeyEntryField (XsdKeyEntry entry, XsdIdentityField field)
+		{
+			this.entry = entry;
+			this.field = field;
+		}
+
+		public XsdIdentityField Field {
+			get { return field; }
+		}
+
+		public bool FieldFound;
+		public int FieldLineNumber;
+		public int FieldLinePosition;
+		public bool FieldHasLineInfo;
+		public XsdAnySimpleType FieldType;
+
+		public object Identity;
+		public bool IsXsiNil;
+
+		public int FieldFoundDepth;
+		public XsdIdentityPath FieldFoundPath;
+
+		public bool Consuming;
+		public bool Consumed;
+
+		// Return false if there is already the same key.
+		public bool SetIdentityField (object identity, bool isXsiNil, XsdAnySimpleType type, int depth, IXmlLineInfo li)
+		{
 			FieldFoundDepth = depth;
 			Identity = identity;
 			IsXsiNil = isXsiNil;
 			FieldFound |= isXsiNil;
-			FieldType = type;
+			FieldType = type;
 			Consuming = false;
 			Consumed = true;
 			if (li != null && li.HasLineInfo ()) {
@@ -95,283 +95,283 @@ namespace Mono.Xml.Schema
 			}
 
 			return true;
-		}
-
-		// It might throw Exception including other than XmlSchemaException (ReadTypedValue).
-		internal XsdIdentityPath FieldMatches (ArrayList qnameStack, XsdValidatingReader reader)
-		{
-			for (int i = 0; i < field.Paths.Length; i++) {
-				XsdIdentityPath path = field.Paths [i];
-				if (FieldFound && (reader.Depth > this.FieldFoundDepth && this.FieldFoundPath == path))
-					continue;
-
-				// Only "." hits.
-				if (path.OrderedSteps.Length == 0) {
-					if (reader.Depth == entry.StartDepth)
-						return path;
-					else
-						continue;
-				}
-				// It does not hit as yet (too shallow to hit).
-				if (reader.Depth - entry.StartDepth < path.OrderedSteps.Length - 1)
-					continue;
-
-				bool isAttributePath = false;
-				int iter = path.OrderedSteps.Length;
-				if (path.OrderedSteps [iter-1].IsAttribute) {
-					isAttributePath = true;
-					iter--;
-				}
-				if (path.Descendants && reader.Depth < entry.StartDepth + iter)
-					continue;
-				else if (!path.Descendants && reader.Depth != entry.StartDepth + iter)
-					continue;
-
-				iter--;
-
-				XsdIdentityStep step;
-				for (; iter >= 0; iter--) {
-					step = path.OrderedSteps [iter];
-					if (step.IsAnyName)
-						continue;
-					XmlQualifiedName qname = (XmlQualifiedName) qnameStack [entry.StartDepth + iter + 1];
-					if (step.NsName != null && qname.Namespace == step.NsName)
-						continue;
-					if ((step.Name == "*" || step.Name == qname.Name) &&
-						step.Namespace == qname.Namespace)
-						continue;
-					else
-						break;
-				}
-				if (iter >= 0)	// i.e. did not match against the path.
-					continue;
-				if (!isAttributePath)
-					return path;
-				step = path.OrderedSteps [path.OrderedSteps.Length - 1];
-				if (step.IsAnyName || step.NsName != null) {
-					try {
-						while (reader.MoveToNextAttribute ()) {
-							if (reader.NamespaceURI == XmlSchema.InstanceNamespace)
-								continue;
-							if (step.IsAnyName || reader.NamespaceURI == step.NsName) {
-								this.FillAttributeFieldValue (reader);
-							}
-						}
-					} finally {
-						reader.MoveToElement ();
-					}
-					if (this.Identity != null)
-						return path;
-					else
-						continue;
-				}
-				if (reader.MoveToAttribute (step.Name, step.Namespace)) {
-					this.FillAttributeFieldValue (reader);
-					reader.MoveToElement ();
-					return path;
-				}
-				else
-					continue;
-			}
-			return null;
-		}
-
-		private void FillAttributeFieldValue (XsdValidatingReader reader)
-		{
-			if (this.FieldFound)
-				throw new XmlSchemaException ("The key value was was already found."
-					+ (this.FieldHasLineInfo ?
-						String.Format (CultureInfo.InvariantCulture, " At line {0}, position {1}.", FieldLineNumber, FieldLinePosition) :
-						""),
-					reader, reader.BaseURI, entry.KeySequence.SourceSchemaIdentity, null);
-			XmlSchemaDatatype dt = reader.SchemaType as XmlSchemaDatatype;
-			XmlSchemaSimpleType st = reader.SchemaType as XmlSchemaSimpleType;
-			if (dt == null && st != null)
-				dt = st.Datatype;
-			object identity = XmlSchemaUtil.ReadTypedValue (reader, reader.SchemaType, reader.ParserContext.NamespaceManager, null);
-			if (identity == null)
-				identity = reader.Value;
-			if (!this.SetIdentityField (identity, reader.Depth - 1 == reader.XsiNilDepth , dt as XsdAnySimpleType, reader.Depth, (IXmlLineInfo) reader))
-				throw new XmlSchemaException ("Two or more identical field was found.", 
-					reader, reader.BaseURI, entry.KeySequence.SourceSchemaIdentity, null);
+		}
+
+		// It might throw Exception including other than XmlSchemaException (ReadTypedValue).
+		internal XsdIdentityPath FieldMatches (ArrayList qnameStack, XsdValidatingReader reader)
+		{
+			for (int i = 0; i < field.Paths.Length; i++) {
+				XsdIdentityPath path = field.Paths [i];
+				if (FieldFound && (reader.Depth > this.FieldFoundDepth && this.FieldFoundPath == path))
+					continue;
+
+				// Only "." hits.
+				if (path.OrderedSteps.Length == 0) {
+					if (reader.Depth == entry.StartDepth)
+						return path;
+					else
+						continue;
+				}
+				// It does not hit as yet (too shallow to hit).
+				if (reader.Depth - entry.StartDepth < path.OrderedSteps.Length - 1)
+					continue;
+
+				bool isAttributePath = false;
+				int iter = path.OrderedSteps.Length;
+				if (path.OrderedSteps [iter-1].IsAttribute) {
+					isAttributePath = true;
+					iter--;
+				}
+				if (path.Descendants && reader.Depth < entry.StartDepth + iter)
+					continue;
+				else if (!path.Descendants && reader.Depth != entry.StartDepth + iter)
+					continue;
+
+				iter--;
+
+				XsdIdentityStep step;
+				for (; iter >= 0; iter--) {
+					step = path.OrderedSteps [iter];
+					if (step.IsAnyName)
+						continue;
+					XmlQualifiedName qname = (XmlQualifiedName) qnameStack [entry.StartDepth + iter + 1];
+					if (step.NsName != null && qname.Namespace == step.NsName)
+						continue;
+					if ((step.Name == "*" || step.Name == qname.Name) &&
+						step.Namespace == qname.Namespace)
+						continue;
+					else
+						break;
+				}
+				if (iter >= 0)	// i.e. did not match against the path.
+					continue;
+				if (!isAttributePath)
+					return path;
+				step = path.OrderedSteps [path.OrderedSteps.Length - 1];
+				if (step.IsAnyName || step.NsName != null) {
+					try {
+						while (reader.MoveToNextAttribute ()) {
+							if (reader.NamespaceURI == XmlSchema.InstanceNamespace)
+								continue;
+							if (step.IsAnyName || reader.NamespaceURI == step.NsName) {
+								this.FillAttributeFieldValue (reader);
+							}
+						}
+					} finally {
+						reader.MoveToElement ();
+					}
+					if (this.Identity != null)
+						return path;
+					else
+						continue;
+				}
+				if (reader.MoveToAttribute (step.Name, step.Namespace)) {
+					this.FillAttributeFieldValue (reader);
+					reader.MoveToElement ();
+					return path;
+				}
+				else
+					continue;
+			}
+			return null;
+		}
+
+		private void FillAttributeFieldValue (XsdValidatingReader reader)
+		{
+			if (this.FieldFound)
+				throw new XmlSchemaException ("The key value was was already found."
+					+ (this.FieldHasLineInfo ?
+						String.Format (CultureInfo.InvariantCulture, " At line {0}, position {1}.", FieldLineNumber, FieldLinePosition) :
+						""),
+					reader, reader.BaseURI, entry.KeySequence.SourceSchemaIdentity, null);
+			XmlSchemaDatatype dt = reader.SchemaType as XmlSchemaDatatype;
+			XmlSchemaSimpleType st = reader.SchemaType as XmlSchemaSimpleType;
+			if (dt == null && st != null)
+				dt = st.Datatype;
+			object identity = XmlSchemaUtil.ReadTypedValue (reader, reader.SchemaType, reader.ParserContext.NamespaceManager, null);
+			if (identity == null)
+				identity = reader.Value;
+			if (!this.SetIdentityField (identity, reader.Depth - 1 == reader.XsiNilDepth , dt as XsdAnySimpleType, reader.Depth, (IXmlLineInfo) reader))
+				throw new XmlSchemaException ("Two or more identical field was found.", 
+					reader, reader.BaseURI, entry.KeySequence.SourceSchemaIdentity, null);
 			// HACK: This is not logical. Attributes never be cosuming,
 			// so I used it as a temporary mark to sign it is *just* validated now.
-			this.Consuming = true;
-			this.FieldFound = true;
-		}
-	}
-
-	internal class XsdKeyEntryFieldCollection : IList
-	{
-		ArrayList al = new ArrayList ();
-
-		#region IList
-		public bool IsReadOnly {
-			get { return false; }
-		}
-
-		object IList.this [int i] {
-			get { return al [i]; }
-			set { al [i] = value; }
-		}
-
-		public XsdKeyEntryField this [int i] {
-			get { return (XsdKeyEntryField) al [i]; }
-			set { al [i] = value; }
-		}
-
-		public void RemoveAt (int i)
-		{
-			al.RemoveAt (i);
-		}
-
-		public void Insert (int i, object value)
-		{
-			al.Insert (i, value);
-		}
-
-		public void Remove (object value)
-		{
-			al.Remove (value);
-		}
-
-		public bool Contains (object value)
-		{
-			return al.Contains (value);
-		}
-
-		public void Clear ()
-		{
-			al.Clear ();
-		}
-
-		public int IndexOf (object value)
-		{
-			return al.IndexOf (value);
-		}
-
-		public int Add (object value)
-		{
-			return al.Add (value);
-		}
-
-		public bool IsFixedSize {
-			get { return false; }
-		}
-
-		#endregion
-
-		#region ICollection
-
-		public bool IsSynchronized {
-			get { return al.IsSynchronized; }
-		}
-
-		public int Count {
-			get { return al.Count; }
-		}
-
-		public void CopyTo(Array array, int i)
-		{
-			al.CopyTo (array, i);
-		}
-
-		public object SyncRoot {
-			get { return al.SyncRoot; }
-		}
-
-		#endregion
-
-		#region IEnumerable
-
-		public IEnumerator GetEnumerator ()
-		{
-			return ((IEnumerable) al).GetEnumerator ();
-		}
-
-		#endregion
-
-	}
-
-	// Created per field/key pair, created per selector-matched element.
-	internal class XsdKeyEntry
-	{
-		public int StartDepth;
-
-//		public bool ConsumptionTargetIsKey;
-
-		public int SelectorLineNumber;
-		public int SelectorLinePosition;
-		public bool SelectorHasLineInfo;
-
-		public XsdKeyEntryFieldCollection KeyFields;
-
-		public bool KeyRefFound;
-//		public int KeyRefSelectorLineNumber;
-//		public int KeyRefSelectorLinePosition;
-//		public bool KeyRefSelectorHasLineInfo;
-
-		public XsdKeyTable KeySequence;
-		private bool keyFound = false;
-
-		public XsdKeyEntry (
-			XsdKeyTable keyseq, int depth, IXmlLineInfo li)
-		{
-			Init (keyseq, depth, li);
-		}
-
-		public bool KeyFound {
-			get {
-				if (keyFound)
-					return true;
-				for (int i = 0; i < KeyFields.Count; i++) {
-					XsdKeyEntryField kf = KeyFields [i];
-					if (kf.FieldFound) {
-						keyFound = true;
-						return true;
-					}
-				}
-				return false;
-			}
-		}
-
-		private void Init (XsdKeyTable keyseq, int depth, IXmlLineInfo li)
-		{
-			KeySequence = keyseq;
-			KeyFields = new XsdKeyEntryFieldCollection ();
-			for (int i = 0; i < keyseq.Selector.Fields.Length; i++)
-				KeyFields.Add (new XsdKeyEntryField (this, keyseq.Selector.Fields [i]));
-			StartDepth = depth;
-			if (li != null) {
-				if (li.HasLineInfo ()) {
-					this.SelectorHasLineInfo = true;
-					this.SelectorLineNumber = li.LineNumber;
-					this.SelectorLinePosition = li.LinePosition;
-				}
-			}
-		}
-
-		public bool CompareIdentity (XsdKeyEntry other)
-		{
-			for (int i = 0; i < KeyFields.Count; i++) {
-				XsdKeyEntryField f = this.KeyFields [i];
-				XsdKeyEntryField of = other.KeyFields [i];
-				if (f.IsXsiNil && !of.IsXsiNil || !f.IsXsiNil && of.IsXsiNil)
-					return false;
+			this.Consuming = true;
+			this.FieldFound = true;
+		}
+	}
+
+	internal class XsdKeyEntryFieldCollection : IList
+	{
+		ArrayList al = new ArrayList ();
+
+		#region IList
+		public bool IsReadOnly {
+			get { return false; }
+		}
+
+		object IList.this [int i] {
+			get { return al [i]; }
+			set { al [i] = value; }
+		}
+
+		public XsdKeyEntryField this [int i] {
+			get { return (XsdKeyEntryField) al [i]; }
+			set { al [i] = value; }
+		}
+
+		public void RemoveAt (int i)
+		{
+			al.RemoveAt (i);
+		}
+
+		public void Insert (int i, object value)
+		{
+			al.Insert (i, value);
+		}
+
+		public void Remove (object value)
+		{
+			al.Remove (value);
+		}
+
+		public bool Contains (object value)
+		{
+			return al.Contains (value);
+		}
+
+		public void Clear ()
+		{
+			al.Clear ();
+		}
+
+		public int IndexOf (object value)
+		{
+			return al.IndexOf (value);
+		}
+
+		public int Add (object value)
+		{
+			return al.Add (value);
+		}
+
+		public bool IsFixedSize {
+			get { return false; }
+		}
+
+		#endregion
+
+		#region ICollection
+
+		public bool IsSynchronized {
+			get { return al.IsSynchronized; }
+		}
+
+		public int Count {
+			get { return al.Count; }
+		}
+
+		public void CopyTo(Array array, int i)
+		{
+			al.CopyTo (array, i);
+		}
+
+		public object SyncRoot {
+			get { return al.SyncRoot; }
+		}
+
+		#endregion
+
+		#region IEnumerable
+
+		public IEnumerator GetEnumerator ()
+		{
+			return ((IEnumerable) al).GetEnumerator ();
+		}
+
+		#endregion
+
+	}
+
+	// Created per field/key pair, created per selector-matched element.
+	internal class XsdKeyEntry
+	{
+		public int StartDepth;
+
+//		public bool ConsumptionTargetIsKey;
+
+		public int SelectorLineNumber;
+		public int SelectorLinePosition;
+		public bool SelectorHasLineInfo;
+
+		public XsdKeyEntryFieldCollection KeyFields;
+
+		public bool KeyRefFound;
+//		public int KeyRefSelectorLineNumber;
+//		public int KeyRefSelectorLinePosition;
+//		public bool KeyRefSelectorHasLineInfo;
+
+		public XsdKeyTable KeySequence;
+		private bool keyFound = false;
+
+		public XsdKeyEntry (
+			XsdKeyTable keyseq, int depth, IXmlLineInfo li)
+		{
+			Init (keyseq, depth, li);
+		}
+
+		public bool KeyFound {
+			get {
+				if (keyFound)
+					return true;
+				for (int i = 0; i < KeyFields.Count; i++) {
+					XsdKeyEntryField kf = KeyFields [i];
+					if (kf.FieldFound) {
+						keyFound = true;
+						return true;
+					}
+				}
+				return false;
+			}
+		}
+
+		private void Init (XsdKeyTable keyseq, int depth, IXmlLineInfo li)
+		{
+			KeySequence = keyseq;
+			KeyFields = new XsdKeyEntryFieldCollection ();
+			for (int i = 0; i < keyseq.Selector.Fields.Length; i++)
+				KeyFields.Add (new XsdKeyEntryField (this, keyseq.Selector.Fields [i]));
+			StartDepth = depth;
+			if (li != null) {
+				if (li.HasLineInfo ()) {
+					this.SelectorHasLineInfo = true;
+					this.SelectorLineNumber = li.LineNumber;
+					this.SelectorLinePosition = li.LinePosition;
+				}
+			}
+		}
+
+		public bool CompareIdentity (XsdKeyEntry other)
+		{
+			for (int i = 0; i < KeyFields.Count; i++) {
+				XsdKeyEntryField f = this.KeyFields [i];
+				XsdKeyEntryField of = other.KeyFields [i];
+				if (f.IsXsiNil && !of.IsXsiNil || !f.IsXsiNil && of.IsXsiNil)
+					return false;
 				if (!XmlSchemaUtil.IsSchemaDatatypeEquals (
 					of.FieldType, of.Identity, f.FieldType, f.Identity))
 					return false;	// does not match
 			}
 			return true;	// matches
-		}
-
-		// In this method, attributes are ignored.
-		// It might throw Exception including non-XmlSchemaException.
-		public void FieldMatches (ArrayList qnameStack, XsdValidatingReader reader)
-		{
-			for (int i = 0; i < KeyFields.Count; i++) {
-				XsdKeyEntryField keyField = KeyFields [i];
-				XsdIdentityPath path = keyField.FieldMatches (qnameStack, reader);
+		}
+
+		// In this method, attributes are ignored.
+		// It might throw Exception including non-XmlSchemaException.
+		public void FieldMatches (ArrayList qnameStack, XsdValidatingReader reader)
+		{
+			for (int i = 0; i < KeyFields.Count; i++) {
+				XsdKeyEntryField keyField = KeyFields [i];
+				XsdIdentityPath path = keyField.FieldMatches (qnameStack, reader);
 				if (path != null) {
 					if (keyField.FieldFound) {
 						// HACK: This is not logical by nature. Attributes never be cosuming,
@@ -383,29 +383,29 @@ namespace Mono.Xml.Schema
 							keyField.Consuming = false;
 					}
 					if (!keyField.Consumed) {
-						if (reader.XsiNilDepth == reader.Depth && !keyField.SetIdentityField (Guid.Empty, true, XsdAnySimpleType.Instance, reader.Depth, (IXmlLineInfo) reader))
-							throw new XmlSchemaException ("Two or more identical field was found.", reader, reader.BaseURI, KeySequence.SourceSchemaIdentity, null);
-						else {
-							XmlSchemaComplexType ct = reader.SchemaType as XmlSchemaComplexType;
-							if (ct != null && 
-								(ct.ContentType == XmlSchemaContentType.Empty || ct.ContentType == XmlSchemaContentType.ElementOnly) && 
-								reader.SchemaType != XmlSchemaComplexType.AnyType)
-								throw new XmlSchemaException ("Specified schema type is complex type, which is not allowed for identity constraints.", reader, reader.BaseURI, KeySequence.SourceSchemaIdentity, null);
-							keyField.FieldFound = true;
-							keyField.FieldFoundPath = path;
-							keyField.FieldFoundDepth = reader.Depth;
-							keyField.Consuming = true;
-							IXmlLineInfo li = reader as IXmlLineInfo;
-							if (li != null && li.HasLineInfo ()) {
-								keyField.FieldHasLineInfo = true;
-								keyField.FieldLineNumber = li.LineNumber;
-								keyField.FieldLinePosition = li.LinePosition;
-							}
+						if (reader.XsiNilDepth == reader.Depth && !keyField.SetIdentityField (Guid.Empty, true, XsdAnySimpleType.Instance, reader.Depth, (IXmlLineInfo) reader))
+							throw new XmlSchemaException ("Two or more identical field was found.", reader, reader.BaseURI, KeySequence.SourceSchemaIdentity, null);
+						else {
+							XmlSchemaComplexType ct = reader.SchemaType as XmlSchemaComplexType;
+							if (ct != null && 
+								(ct.ContentType == XmlSchemaContentType.Empty || ct.ContentType == XmlSchemaContentType.ElementOnly) && 
+								reader.SchemaType != XmlSchemaComplexType.AnyType)
+								throw new XmlSchemaException ("Specified schema type is complex type, which is not allowed for identity constraints.", reader, reader.BaseURI, KeySequence.SourceSchemaIdentity, null);
+							keyField.FieldFound = true;
+							keyField.FieldFoundPath = path;
+							keyField.FieldFoundDepth = reader.Depth;
+							keyField.Consuming = true;
+							IXmlLineInfo li = reader as IXmlLineInfo;
+							if (li != null && li.HasLineInfo ()) {
+								keyField.FieldHasLineInfo = true;
+								keyField.FieldLineNumber = li.LineNumber;
+								keyField.FieldLinePosition = li.LinePosition;
+							}
 							reader.CurrentKeyFieldConsumers.Add (keyField);
 						}
 					}
 				}
-			}
-		}
-	}
-}
+			}
+		}
+	}
+}

mcs/class/System.XML/Mono.Xml.Schema/XsdKeyTable.cs

@@ -27,123 +27,123 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-using System;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Xml;
-using System.Xml.Schema;
-
-namespace Mono.Xml.Schema
-{
-	internal class XsdKeyEntryCollection : CollectionBase
-	{
-		public void Add (XsdKeyEntry entry)
-		{
-			List.Add (entry);
-		}
-
-		public XsdKeyEntry this [int i] {
-			get { return (XsdKeyEntry) List [i]; }
-			set { List [i] = value; }
-		}
-	}
-
-	// Created per constraining element.
-	internal class XsdKeyTable
-	{
-		// FIXME: no need after #70419
-		public readonly bool alwaysTrue = true;
-
-		private XsdIdentitySelector selector;
-		private XmlSchemaIdentityConstraint source;
-		private XmlQualifiedName qname;
-		private XmlQualifiedName refKeyName;
-
-		public XsdKeyEntryCollection Entries =
-			new XsdKeyEntryCollection ();
-		public XsdKeyEntryCollection FinishedEntries =
-			new XsdKeyEntryCollection ();
-
-		public int StartDepth;
-		public XsdKeyTable ReferencedKey;
-
-		public XsdKeyTable (XmlSchemaIdentityConstraint source, XmlReader reader)
-		{
-			Reset (source, reader);
-		}
-
-		public XmlQualifiedName QualifiedName {
-			get { return qname; }
-		}
-
-		public XmlQualifiedName RefKeyName {
-			get { return refKeyName; }
-		}
-
-		public XmlSchemaIdentityConstraint SourceSchemaIdentity {
-			get { return source; }
-		}
-
-		public XsdIdentitySelector Selector {
-			get { return selector; }
-		}
-
-		public void Reset (XmlSchemaIdentityConstraint source, XmlReader reader)
-		{
-			this.source = source;
-			this.selector = source.CompiledSelector;
-			this.qname = source.QualifiedName;
-			XmlSchemaKeyref kr = source as XmlSchemaKeyref;
-			if (kr != null)
-				this.refKeyName = kr.Refer;
-			StartDepth = 0;
-		}
-
-		// In this method, attributes are ignored.
-		public XsdIdentityPath SelectorMatches (ArrayList qnameStack, XmlReader reader)
-		{
-			for (int i = 0; i < Selector.Paths.Length; i++) {
-				XsdIdentityPath path = Selector.Paths [i];
-				// Only "." hits.
-				if (reader.Depth == this.StartDepth) {
-					if (path.OrderedSteps.Length == 0)
-						return path;
-					else
-						continue;
-				}
-				// It does not hit as yet (too shallow to hit).
-				if (reader.Depth - this.StartDepth < path.OrderedSteps.Length - 1)
-					continue;
-
-				int iter = path.OrderedSteps.Length;
-				if (path.OrderedSteps [iter-1].IsAttribute)
-					iter--;
-
-				if (path.Descendants && reader.Depth < this.StartDepth + iter)
-					continue;
-				else if (!path.Descendants && reader.Depth != this.StartDepth + iter)
-					continue;
-
-				iter--;
-
-				XsdIdentityStep step;
-				for (int x = 0; 0 <= iter; x++, iter--) {
-					step = path.OrderedSteps [iter];
-					if (step.IsAnyName)
-						continue;
-					XmlQualifiedName qname = (XmlQualifiedName) qnameStack [qnameStack.Count - x - 1];
-					if (step.NsName != null && qname.Namespace == step.NsName)
-						continue;
-					if (step.Name == qname.Name && step.Namespace == qname.Namespace)
-						continue;
-					if (alwaysTrue)
-						break;
-				}
-				if (iter >= 0)	// i.e. did not match against the path.
-					continue;
-				return path;
-			}
-			return null;
-		}
-	}
-}
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Xml;
+using System.Xml.Schema;
+
+namespace Mono.Xml.Schema
+{
+	internal class XsdKeyEntryCollection : CollectionBase
+	{
+		public void Add (XsdKeyEntry entry)
+		{
+			List.Add (entry);
+		}
+
+		public XsdKeyEntry this [int i] {
+			get { return (XsdKeyEntry) List [i]; }
+			set { List [i] = value; }
+		}
+	}
+
+	// Created per constraining element.
+	internal class XsdKeyTable
+	{
+		// FIXME: no need after #70419
+		public readonly bool alwaysTrue = true;
+
+		private XsdIdentitySelector selector;
+		private XmlSchemaIdentityConstraint source;
+		private XmlQualifiedName qname;
+		private XmlQualifiedName refKeyName;
+
+		public XsdKeyEntryCollection Entries =
+			new XsdKeyEntryCollection ();
+		public XsdKeyEntryCollection FinishedEntries =
+			new XsdKeyEntryCollection ();
+
+		public int StartDepth;
+		public XsdKeyTable ReferencedKey;
+
+		public XsdKeyTable (XmlSchemaIdentityConstraint source, XmlReader reader)
+		{
+			Reset (source, reader);
+		}
+
+		public XmlQualifiedName QualifiedName {
+			get { return qname; }
+		}
+
+		public XmlQualifiedName RefKeyName {
+			get { return refKeyName; }
+		}
+
+		public XmlSchemaIdentityConstraint SourceSchemaIdentity {
+			get { return source; }
+		}
+
+		public XsdIdentitySelector Selector {
+			get { return selector; }
+		}
+
+		public void Reset (XmlSchemaIdentityConstraint source, XmlReader reader)
+		{
+			this.source = source;
+			this.selector = source.CompiledSelector;
+			this.qname = source.QualifiedName;
+			XmlSchemaKeyref kr = source as XmlSchemaKeyref;
+			if (kr != null)
+				this.refKeyName = kr.Refer;
+			StartDepth = 0;
+		}
+
+		// In this method, attributes are ignored.
+		public XsdIdentityPath SelectorMatches (ArrayList qnameStack, XmlReader reader)
+		{
+			for (int i = 0; i < Selector.Paths.Length; i++) {
+				XsdIdentityPath path = Selector.Paths [i];
+				// Only "." hits.
+				if (reader.Depth == this.StartDepth) {
+					if (path.OrderedSteps.Length == 0)
+						return path;
+					else
+						continue;
+				}
+				// It does not hit as yet (too shallow to hit).
+				if (reader.Depth - this.StartDepth < path.OrderedSteps.Length - 1)
+					continue;
+
+				int iter = path.OrderedSteps.Length;
+				if (path.OrderedSteps [iter-1].IsAttribute)
+					iter--;
+
+				if (path.Descendants && reader.Depth < this.StartDepth + iter)
+					continue;
+				else if (!path.Descendants && reader.Depth != this.StartDepth + iter)
+					continue;
+
+				iter--;
+
+				XsdIdentityStep step;
+				for (int x = 0; 0 <= iter; x++, iter--) {
+					step = path.OrderedSteps [iter];
+					if (step.IsAnyName)
+						continue;
+					XmlQualifiedName qname = (XmlQualifiedName) qnameStack [qnameStack.Count - x - 1];
+					if (step.NsName != null && qname.Namespace == step.NsName)
+						continue;
+					if (step.Name == qname.Name && step.Namespace == qname.Namespace)
+						continue;
+					if (alwaysTrue)
+						break;
+				}
+				if (iter >= 0)	// i.e. did not match against the path.
+					continue;
+				return path;
+			}
+			return null;
+		}
+	}
+}