2004-11-08 Ben Maurer <bmaurer@ximian.com>

* replace.cs, parser.cs: Use stringbuilder for allocation sanity. svn path=/trunk/mcs/; revision=35869
mono · Nov 9, 2004 · e2a91c4 · e2a91c4
1 parent 17a1919
commit e2a91c4
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/mcs/class/System/System.Text.RegularExpressions/ChangeLog b/mcs/class/System/System.Text.RegularExpressions/ChangeLog
@@ -1,3 +1,7 @@
+2004-11-08  Ben Maurer  <bmaurer@ximian.com>
+
+	* replace.cs, parser.cs: Use stringbuilder for allocation sanity.
+
 2004-10-21 Joerg Rosenkranz <joergr@voelcker.com>
 
     * regex.cs: Fixed a bug introduced with the last patch which

diff --git a/mcs/class/System/System.Text.RegularExpressions/parser.cs b/mcs/class/System/System.Text.RegularExpressions/parser.cs
@@ -1048,7 +1048,7 @@ class Parser {
 			this.pattern = pattern;
 			this.ptr = 0;
 
-			string result = "";
+			StringBuilder result = new StringBuilder (pattern.Length);
 			while (ptr < pattern.Length) {
 				int c = pattern[ptr ++];
 				if (c == '\\') {
@@ -1060,10 +1060,10 @@ class Parser {
 							c = '\b';
 					}
 				}
-				result += (char)c;
+				result.Append (c);
 			}
 
-			return result;
+			return result.ToString ();
 		}
 
 		private void ResolveReferences () {

diff --git a/mcs/class/System/System.Text.RegularExpressions/replace.cs b/mcs/class/System/System.Text.RegularExpressions/replace.cs
@@ -59,7 +59,7 @@ class ReplacementEvaluator {
 
 		private void Compile (string replacement) {
 			replacement = Parser.Unescape (replacement);
-			string literal = "";
+			StringBuilder literal = new StringBuilder ();
 
 			int ptr = 0;
 			char c;
@@ -75,18 +75,18 @@ class ReplacementEvaluator {
 				}
 
 				if (term != null) {
-					term.Literal = literal;
+					term.Literal = literal.ToString ();
 					terms.Add (term);
 
 					term = null;
-					literal = "";
+					literal.Length = 0;
 				}
 				else
-					literal += c;
+					literal.Append (c);
 			}
 
 			if (term == null && literal.Length > 0) {
-				terms.Add (new Term (literal));
+				terms.Add (new Term (literal.ToString ()));
 			}
 		}