2006-09-11 Gonzalo Paniagua Javier <gonzalo@ximian.com>

[mono.git] / mcs / class / System / System.Text.RegularExpressions / CaptureCollection.cs

diff --git a/mcs/class/System/System.Text.RegularExpressions/CaptureCollection.cs b/mcs/class/System/System.Text.RegularExpressions/CaptureCollection.cs
index 9ded1e864c9c2e6f370ef7d82869b0ca0a4ad7bf..76b390704fcae88759ab0226b273507dba3b959a 100644 (file)
--- a/mcs/class/System/System.Text.RegularExpressions/CaptureCollection.cs
+++ b/mcs/class/System/System.Text.RegularExpressions/CaptureCollection.cs
@@ -6,10 +6,28 @@
 //     Dick Porter (dick@ximian.com)
 //
 // (C) 2002 Dan Lewis
-// (C) 2004 Novell, Inc.
+// Copyright (C) 2005 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// 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;
 
 namespace System.Text.RegularExpressions 
@@ -17,103 +35,51 @@ namespace System.Text.RegularExpressions
        [Serializable]
        public class CaptureCollection: ICollection, IEnumerable
        {
-               private ArrayList list;
+               private Capture [] list;
 
                /* No public constructor */
-               internal CaptureCollection () {
-                       list = new ArrayList ();
+               internal CaptureCollection (int n)
+               {
+                       list = new Capture [n];
                }
 
-               public virtual int Count {
-                       get {
-                               return(list.Count);
-                       }
+               public int Count {
+                       get { return list.Length; }
                }
 
                public bool IsReadOnly {
-                       get {
-                               return(true);
-                       }
+                       get { return true; }
                }
 
-               public virtual bool IsSynchronized {
-                       get {
-                               return(false);
-                       }
+               public bool IsSynchronized {
+                       get { return false; }
                }
 
-               public Capture this[int i] {
+               public Capture this [int i] {
                        get {
-                               if (i < 0 ||
-                                   i > Count) {
+                               if (i < 0 || i >= Count)
                                        throw new ArgumentOutOfRangeException ("Index is out of range");
-                               }
-                               
-                               return((Capture)list[i]);
-                       }
-               }
-
-               public virtual object SyncRoot {
-                       get {
-                               return(list);
-                       }
-               }
-
-               public virtual void CopyTo (Array array, int index) {
-                       foreach (object o in list) {
-                               if (index > array.Length) {
-                                       break;
-                               }
-
-                               array.SetValue (o, index++);
+                               return list [i];
                        }
                }
 
-               public virtual IEnumerator GetEnumerator () {
-                       return(new Enumerator (list));
+               internal void SetValue (Capture cap, int i)
+               {
+                       list [i] = cap;
                }
 
-               internal void Add (object o) {
-                       list.Add (o);
+               public object SyncRoot {
+                       get { return list; }
                }
 
-               internal void Reverse () {
-                       list.Reverse ();
+               public void CopyTo (Array array, int index)
+               {
+                       list.CopyTo (array, index);
                }
 
-               private class Enumerator: IEnumerator {
-                       private IList list;
-                       private int ptr;
-
-                       public Enumerator (IList list) {
-                               this.list = list;
-                               Reset ();
-                       }
-
-                       public object Current {
-                               get {
-                                       if (ptr >= list.Count) {
-                                               throw new InvalidOperationException ();
-                                       }
-
-                                       return(list[ptr]);
-                               }
-                       }
-
-                       public bool MoveNext () {
-                               if (ptr > list.Count) {
-                                       throw new InvalidOperationException ();
-                               }
-
-                               return(++ptr < list.Count);
-                       }
-
-                       public void Reset () {
-                               ptr = -1;
-                       }
+               public IEnumerator GetEnumerator ()
+               {
+                       return list.GetEnumerator ();
                }
        }
 }
-
-               
-