Committing fix for Juli.

2002-07-30  Juli Mallett  <jmallett@FreeBSD.org>

	* 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

diff --git a/mcs/class/System/System.Text.RegularExpressions/ChangeLog b/mcs/class/System/System.Text.RegularExpressions/ChangeLog
index 00ddda201b3796045e0eb4cf21064ec8158fbf95..89303d58eb945157f20015914f80369578743481 100644 (file)
--- a/mcs/class/System/System.Text.RegularExpressions/ChangeLog
+++ b/mcs/class/System/System.Text.RegularExpressions/ChangeLog
@@ -1,3 +1,10 @@
+2002-07-30  Juli Mallett  <jmallett@FreeBSD.org>
+
+       * 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  <dihlewis@yahoo.co.uk>
 
        * regex.cs: Fixed bug in split.

diff --git a/mcs/class/System/System.Text.RegularExpressions/regex.cs b/mcs/class/System/System.Text.RegularExpressions/regex.cs
index 58feea5235d6ab1942b6feb35eb9ed02b1510320..fc542cb87fe46e48d0e16fa95de263a8bb69118f 100644 (file)
--- a/mcs/class/System/System.Text.RegularExpressions/regex.cs
+++ b/mcs/class/System/System.Text.RegularExpressions/regex.cs
@@ -146,14 +146,14 @@ namespace System.Text.RegularExpressions {
                \r
                        this.factory = cache.Lookup (pattern, options);\r
 \r
-                       if (this.factory == null) {\r
-                               // parse and install group mapping\r
+                       // parse and install group mapping\r
 \r
-                               Parser psr = new Parser ();\r
-                               RegularExpression re = psr.ParseRegularExpression (pattern, options);\r
-                               this.group_count = re.GroupCount;\r
-                               this.mapping = psr.GetMapping ();\r
+                       Parser psr = new Parser ();\r
+                       RegularExpression re = psr.ParseRegularExpression (pattern, options);\r
+                       this.group_count = re.GroupCount;\r
+                       this.mapping = psr.GetMapping ();\r
 \r
+                       if (this.factory == null) {\r
                                // compile\r
                                \r
                                ICompiler cmp;\r

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientFormatterSink.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientFormatterSink.cs
index 7628612424464a8e6be6c8127e5f42b9f8efa5df..a43eee1a7b64d20c2bcce50b0db2db89ca459c36 100644 (file)
--- a/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientFormatterSink.cs
+++ b/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
        {
                
        }