2005-01-31 Zoltan Varga <vargaz@freemail.hu>

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

diff --git a/mcs/class/System/System.Text.RegularExpressions/replace.cs b/mcs/class/System/System.Text.RegularExpressions/replace.cs
index 88b99f394bccf2c27a036caecf0ab9437f84455b..cb4685e725fbbafa6bd043a0a25604da01d2e3ea 100644 (file)
--- a/mcs/class/System/System.Text.RegularExpressions/replace.cs
+++ b/mcs/class/System/System.Text.RegularExpressions/replace.cs
@@ -5,6 +5,27 @@
 //\r
 // author:     Dan Lewis (dlewis@gmx.co.uk)\r
 //             (c) 2002\r
+
+//
+// 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.
+//
 \r
 using System;\r
 using System.Text;\r
@@ -38,7 +59,7 @@ namespace System.Text.RegularExpressions {
 \r
                private void Compile (string replacement) {\r
                        replacement = Parser.Unescape (replacement);\r
-                       string literal = "";\r
+                       StringBuilder literal = new StringBuilder ();\r
 \r
                        int ptr = 0;\r
                        char c;\r
@@ -47,27 +68,25 @@ namespace System.Text.RegularExpressions {
                                c = replacement[ptr ++];\r
 \r
                                if (c == '$') {\r
-                                       if (replacement[ptr] == '$') {\r
+                                       if (replacement[ptr] != '$') \r
+                                               term = CompileTerm (replacement, ref ptr);\r
+                                       else\r
                                                ++ ptr;\r
-                                               break;\r
-                                       }\r
-\r
-                                       term = CompileTerm (replacement, ref ptr);\r
                                }\r
 \r
                                if (term != null) {\r
-                                       term.Literal = literal;\r
+                                       term.Literal = literal.ToString ();\r
                                        terms.Add (term);\r
 \r
                                        term = null;\r
-                                       literal = "";\r
+                                       literal.Length = 0;\r
                                }\r
                                else\r
-                                       literal += c;\r
+                                       literal.Append (c);\r
                        }\r
 \r
                        if (term == null && literal.Length > 0) {\r
-                               terms.Add (new Term (literal));\r
+                               terms.Add (new Term (literal.ToString ()));\r
                        }\r
                }\r
 \r