Changeset 82 for trunk/NewView/StringUtilsUnit.pas

Timestamp:

Feb 25, 2007, 4:15:10 PM (18 years ago)

Author:

RBRi

Message:

file util refactoring and many more unit tests

File:

• trunk/NewView/StringUtilsUnit.pas (modified) (9 diffs)

trunk/NewView/StringUtilsUnit.pas

@@ -45 +45 @@
   //     StrExtractStrings('1x2x3\x4', "x", '\') ->
   //     returns 4 strings: "1", "", "2" and "3x4"
-  Procedure StrExtractStrings(Var aResult : TStringList; Const aReceiver: String; const aSetOfChars: TSetOfChars; const anEscapeChar: char);
+  Procedure StrExtractStrings(Var aResult : TStrings; Const aReceiver: String; const aSetOfChars: TSetOfChars; const anEscapeChar: char);
+
+  // same as StrExtractStrings but ignores empty strings
+  Procedure StrExtractStringsIgnoreEmpty(Var aResult : TStrings; Const aReceiver: String; const aSetOfChars: TSetOfChars; const anEscapeChar: char);
+
+  // removes all occurences of char from aSetOfChars from the beginning
+  // of a String.
+  Function StrTrimLeftChars(const aReceiver: String; const aSetOfChars: TSetOfChars): String;
+
+  // removes all occurences of char from aSetOfChars from the end
+  // of a String.
+  Function StrTrimRightChars(const aReceiver: String; const aSetOfChars: TSetOfChars): String;
 
   // removes all occurences of char from aSetOfChars from the beginning
@@ -53 +64 @@
   // removes all blanks from beginning and end
   Function StrTrim(const aReceiver: String): String;
+
+  // Returns the aCount leftmost chars of aString
+  Function StrLeft(const aString : String; const aCount : Integer) : String;
 
   // returns true if the String ends with the provides one
@@ -114 +128 @@
   begin
     result := '';
-    for i := 0 To stringList.count-1 do
+    for i := 0 to stringList.count-1 do
     begin
       if (i > 0) then result := result + '&';
@@ -156 +170 @@
 
 
-  Procedure StrExtractStrings(Var aResult: TStringList; Const aReceiver: String; const aSetOfChars: TSetOfChars; const anEscapeChar: char);
+  Procedure PrivateStrExtractStrings(   Var aResult: TStrings;
+                                        const aReceiver: String;
+                                        const aSetOfChars: TSetOfChars;
+                                        const anEscapeChar: char;
+                                        const anIgnoreEmptyFlag : boolean);
   Var
     i : Integer;
@@ -189 +207 @@
           if (tmpChar IN aSetOfChars) then
           begin
-            aResult.add(tmpPart);
+            if (NOT anIgnoreEmptyFlag) OR ('' <> tmpPart) then
+            begin
+              aResult.add(tmpPart);
+            end;
             tmpPart := '';
             i := i + 1;
@@ -199 +220 @@
           end;
     end;
-    aResult.add(tmpPart);
+
+    if (NOT anIgnoreEmptyFlag) OR ('' <> tmpPart) then
+    begin
+      aResult.add(tmpPart);
+    end;
+  end;
+
+
+  Procedure StrExtractStrings(Var aResult: TStrings; Const aReceiver: String; const aSetOfChars: TSetOfChars; const anEscapeChar: char);
+  Begin
+    PrivateStrExtractStrings(aResult, aReceiver, aSetOfChars, anEscapeChar, false);
+  end;
+
+
+  Procedure StrExtractStringsIgnoreEmpty(Var aResult: TStrings; Const aReceiver: String; const aSetOfChars: TSetOfChars; const anEscapeChar: char);
+  Begin
+    PrivateStrExtractStrings(aResult, aReceiver, aSetOfChars, anEscapeChar, true);
+  end;
+
+
+  Function StrTrimLeftChars(const aReceiver: String; const aSetOfChars: TSetOfChars): String;
+  Var
+    i : Longint;
+  Begin
+    i := 1;
+    // mem optimization
+    if aReceiver[i] in aSetOfChars then
+    begin
+      while i <= Length(aReceiver) do
+      begin
+        if aReceiver[i] in aSetOfChars then
+          inc(i)
+        else
+          break;
+      end;
+      result := Copy(aReceiver, i, Length(aReceiver)-i+1);
+    end
+    else
+    begin
+      result := aReceiver;
+    end;
+  end;
+
+
+  Function StrTrimRightChars(const aReceiver: String; const aSetOfChars: TSetOfChars): String;
+  Var
+    i : Longint;
+  Begin
+    i := Length(aReceiver);
+
+    // mem optimization
+    if aReceiver[i] in aSetOfChars then
+    begin
+      while i > 0 do
+      begin
+        if aReceiver[i] in aSetOfChars then
+          dec(i)
+        else
+          break;
+      end;
+      result := Copy(aReceiver, 1, i);
+    end
+    else
+    begin
+      result := aReceiver;
+    end;
   end;
 
@@ -207 +293 @@
     i : Longint;
     j : Longint;
-  Begin
+    tmpNeedCopy : boolean;
+  Begin
+    tmpNeedCopy := false;
     i := 1;
     while i < Length(aReceiver) do
     begin
       if aReceiver[i] in aSetOfChars then
-        inc(i)
-       else
-         break;
+      begin
+        inc(i);
+        tmpNeedCopy := true;
+      end
+      else
+      begin
+        break;
+      end;
     end;
 
@@ -221 +314 @@
     begin
       if aReceiver[j] in aSetOfChars then
-        dec(j)
+      begin
+        dec(j);
+        tmpNeedCopy := true;
+      end
       else
+      begin
         break;
-    end;
-
-    result := Copy(aReceiver, i, j-i+1);
+      end;
+    end;
+
+    if tmpNeedCopy then
+    begin
+      result := Copy(aReceiver, i, j-i+1);
+    end
+    else
+    begin
+      result := aReceiver;
+    end;
   end;
 
@@ -233 +338 @@
   Begin
     result := StrTrimChars(aReceiver, [' ']);
+  end;
+
+
+  Function StrLeft(const aString : String; const aCount : Integer) : String;
+  Begin
+    if aCount >= Length(aString) then
+      Result := aString
+    else
+      Result := copy(aString, 1, aCount);
   end;