2004-03-24 Gonzalo Paniagua Javier <gonzalo@ximian.com>

* parser.cs: fixed group numbering. svn path=/trunk/mcs/; revision=24551
baulig · Mar 24, 2004 · b55ee14 · b55ee14
1 parent b24f237
commit b55ee14
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 6 deletions.
diff --git a/mcs/class/System/System.Text.RegularExpressions/ChangeLog b/mcs/class/System/System.Text.RegularExpressions/ChangeLog
@@ -1,6 +1,11 @@
+2004-03-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* parser.cs: fixed group numbering.
+
 2004-03-22  Jackson Harper  <jackson@ximian.com>
 
-	* parser.cs: Use the group number as the name in mapping. Patch by Gert Driesen.
+	* parser.cs: Use the group number as the name in mapping. Patch by
+	Gert Driesen.
 	* regex.cs: Fix off by one error. Patch by Gert Driesen.
 
 2004-03-17  Francois Beauchemin <beauche@softhome.net>

diff --git a/mcs/class/System/System.Text.RegularExpressions/parser.cs b/mcs/class/System/System.Text.RegularExpressions/parser.cs
@@ -128,15 +128,20 @@ public RegularExpression ParseRegularExpression (string pattern, RegexOptions op
 
 		public IDictionary GetMapping () {
 			Hashtable mapping = new Hashtable ();
+			Hashtable numbers = new Hashtable ();
 			int end = caps.Count;
 			mapping.Add ("0", 0);
-			for (int i = 0; i < end;) {
+			for (int i = 0; i < end; i++) {
 				CapturingGroup group = (CapturingGroup) caps [i];
-				i++;
-				if (group.Name != null && !mapping.Contains (group.Name))
+				if (group.Name != null && !mapping.Contains (group.Name)) {
 					mapping.Add (group.Name, group.Number);
-				else
-					mapping.Add (group.Number.ToString (), group.Number);
+					numbers.Add (group.Number, group.Number);
+				}
+			}
+
+			for (int i = 1; i < end; i++) {
+				if (numbers [i] == null)
+					mapping.Add (i.ToString (), i);
 			}
 
 			return mapping;