New test.

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

diff --git a/mcs/class/System/System.Text.RegularExpressions/Group.cs b/mcs/class/System/System.Text.RegularExpressions/Group.cs
index d400a314982e65ac87ebbd2032ddf1651e86aae4..d0642f30e64f3d60eb9bc171c3d71f08fd349dab 100644 (file)
--- a/mcs/class/System/System.Text.RegularExpressions/Group.cs
+++ b/mcs/class/System/System.Text.RegularExpressions/Group.cs
@@ -5,7 +5,7 @@
 //
 // author:     Dan Lewis (dlewis@gmx.co.uk)
 //             (c) 2002
-
+// 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
@@ -27,16 +27,21 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-
 namespace System.Text.RegularExpressions {
 
        [Serializable]
        public class Group : Capture {
-               public static Group Synchronized (Group inner) {
-                       return inner;   // is this enough?
+
+               [MonoTODO ("not thread-safe")]
+               public static Group Synchronized (Group inner)
+               {
+                       if (inner == null)
+                               throw new ArgumentNullException ("inner");
+                       return inner;
                }
 
+               internal static Group Fail = new Group ();
+
                public CaptureCollection Captures {
                        get { return captures; }
                }
@@ -46,27 +51,17 @@ namespace System.Text.RegularExpressions {
                }
 
                // internal
-
-               internal Group (string text, int[] caps) : base (text) {
-                       this.captures = new CaptureCollection ();
-
-                       if (caps == null || caps.Length == 0) {
-                               this.success = false;
-                               return;
-                       }
-
-                       this.success = true;
-                       this.index = caps[0];
-                       this.length = caps[1];
-                       captures.Add (this);
-                       for (int i = 2; i < caps.Length; i += 2)
-                               captures.Add (new Capture (text, caps[i], caps[i + 1]));
-                       captures.Reverse ();
+               internal Group (string text, int index, int length, int n_caps) : base (text, index, length)
+               {
+                       success = true;
+                       captures = new CaptureCollection (n_caps);
+                       captures.SetValue (this, n_caps - 1);
                }
                
-               internal Group (): base ("")
+               internal Group () : base ("")
                {
-                       captures = new CaptureCollection ();
+                       success = false;
+                       captures = new CaptureCollection (0);
                }
 
                private bool success;