Browse Source

Committing fix for Juli.

2002-07-30  Juli Mallett  <[email protected]>

	* regex.cs: Fixed bug where the expression would not be
	re-evaluated for grouping purposes when factory caches were
	used, resulting in no groups being recognised after one call
	with a given pattern and no change in options.

svn path=/trunk/mcs/; revision=6299
Duncan Mak 23 years ago
parent
commit
bdbbb0be53

+ 7 - 0
mcs/class/System/System.Text.RegularExpressions/ChangeLog

@@ -1,3 +1,10 @@
+2002-07-30  Juli Mallett  <[email protected]>
+
+	* regex.cs: Fixed bug where the expression would not be
+	re-evaluated for grouping purposes when factory caches were
+	used, resulting in no groups being recognised after one call
+	with a given pattern and no change in options.
+
 2002-05-13  Dan Lewis  <[email protected]>
 
 	* regex.cs: Fixed bug in split.

+ 6 - 6
mcs/class/System/System.Text.RegularExpressions/regex.cs

@@ -146,14 +146,14 @@ namespace System.Text.RegularExpressions {
 		
 			this.factory = cache.Lookup (pattern, options);
 
-			if (this.factory == null) {
-				// parse and install group mapping
+			// parse and install group mapping
 
-				Parser psr = new Parser ();
-				RegularExpression re = psr.ParseRegularExpression (pattern, options);
-				this.group_count = re.GroupCount;
-				this.mapping = psr.GetMapping ();
+			Parser psr = new Parser ();
+			RegularExpression re = psr.ParseRegularExpression (pattern, options);
+			this.group_count = re.GroupCount;
+			this.mapping = psr.GetMapping ();
 
+			if (this.factory == null) {
 				// compile
 				
 				ICompiler cmp;

+ 1 - 1
mcs/class/corlib/System.Runtime.Remoting.Channels/IClientFormatterSink.cs

@@ -10,7 +10,7 @@ using System.Runtime.Remoting.Messaging;
 
 namespace System.Runtime.Remoting.Channels {
 
-	public interface IClientFormatterSink :  IMessageSink, IClientChannelSink, IChannelSinkBase
+	public interface IClientFormatterSink : IMessageSink, IClientChannelSink, IChannelSinkBase
 	{
 		
 	}