Changeset 118

Timestamp:

Apr 26, 2007, 1:54:34 PM (18 years ago)

Author:

RBRi

Message:

substringFrom added

Location:

trunk/NewView

Files:

• StringUtilsUnit.pas (modified) (5 diffs)
• unittests/StringUtilsUnitTests.pas (modified) (2 diffs)

trunk/NewView/StringUtilsUnit.pas

@@ -39 +39 @@
   // prefices all occurences of one of the chars in aStringWithChars with anEscape char
   // if the escapeChar itself is found, then it is doubled
-  Function StrEscapeAllCharsBy(Const aReceiver: String; const aSetOfChars: TSetOfChars; const anEscapeChar: char): String;
+  Function StrEscapeAllCharsBy(const aReceiver: String; const aSetOfChars: TSetOfChars; const anEscapeChar: char): String;
 
   // Extract all fields in a String given a set of delimiter characters and
@@ -46 +46 @@
   //     StrExtractStrings('1x2x3\x4', 'x', '\') ->
   //     returns 4 strings: '1', '', '2' and '3x4'
-  Procedure StrExtractStrings(Var aResult : TStrings; 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);
+  Procedure StrExtractStringsIgnoreEmpty(Var aResult : TStrings; const aReceiver: String; const aSetOfChars: TSetOfChars; const anEscapeChar: char);
 
   // removes all occurences of char from aSetOfChars from the beginning
@@ -74 +74 @@
   // Returns a copy of the string including all characters until one from aSetOfChars found
   Function StrLeftUntil(const aReceiver: String; const aSetOfChars: TSetOfChars) : String;
+
+  // Returns a copy of the string starting at aPos
+  Function StrSubstringFrom(const aReceiver: String; const aPos : Integer) : String;
 
   // returns true if the String starts with the provided one
@@ -113 +116 @@
   // case insensitive
   Function CaseInsensitivePos(const aPart: String; const aString: String ): longint;
+
 
   // --------------------
@@ -448 +452 @@
 
 
+  Function StrSubstringFrom(const aReceiver: String; const aPos : Integer) : String;
+  Begin
+    Result := copy(aReceiver, aPos, length(aReceiver) - aPos + 1);
+  end;
+
+
   Function StrStartsWith(const aReceiver: String; const aStartString: String) : Boolean;
   Var

trunk/NewView/unittests/StringUtilsUnitTests.pas

@@ -950 +950 @@
 
     assertEqualsString('testStrLeftUntil', 'abcx', tmpResult);
+  END;
+
+
+  // -------------------------------------------------------------------
+
+
+  PROCEDURE testStrSubstringFrom_Empty;
+  VAR
+    tmpResult : String;
+  BEGIN
+    tmpResult := StrSubstringFrom('', 1);
+
+    assertEqualsString('testStrSubstringFrom_Empty', '', tmpResult);
+  END;
+
+
+  PROCEDURE testStrSubstringFrom_EmptyZeroPos;
+  VAR
+    tmpResult : String;
+  BEGIN
+    tmpResult := StrSubstringFrom('', 0);
+
+    assertEqualsString('testStrSubstringFrom_EmptyZeroPos', '', tmpResult);
+  END;
+
+
+  PROCEDURE testStrSubstringFrom_EmptyNegativePos;
+  VAR
+    tmpResult : String;
+  BEGIN
+    tmpResult := StrSubstringFrom('', -4);
+
+    assertEqualsString('testStrSubstringFrom_EmptyNegativePos', '', tmpResult);
+  END;
+
+
+  PROCEDURE testStrSubstringFrom_FullCopy;
+  VAR
+    tmpResult : String;
+  BEGIN
+    tmpResult := StrSubstringFrom('abcd', 1);
+
+    assertEqualsString('testStrSubstringFrom_FullCopy', 'abcd', tmpResult);
+  END;
+
+
+  PROCEDURE testStrSubstringFrom_ZeroPos;
+  VAR
+    tmpResult : String;
+  BEGIN
+    tmpResult := StrSubstringFrom('abcd', 0);
+
+    assertEqualsString('testStrSubstringFrom_ZeroPos', 'abcd', tmpResult);
+  END;
+
+
+  PROCEDURE testStrSubstringFrom_NegativePos;
+  VAR
+    tmpResult : String;
+  BEGIN
+    tmpResult := StrSubstringFrom('abcd', -4);
+
+    assertEqualsString('testStrSubstringFrom_NegativePos', 'abcd', tmpResult);
+  END;
+
+
+  PROCEDURE testStrSubstringFrom_ToBigPos;
+  VAR
+    tmpResult : String;
+  BEGIN
+    tmpResult := StrSubstringFrom('abcd', 11);
+
+    assertEqualsString('testStrSubstringFrom_ToBigPos', '', tmpResult);
+  END;
+
+
+  PROCEDURE testStrSubstringFrom;
+  VAR
+    tmpResult : String;
+  BEGIN
+    tmpResult := StrSubstringFrom('abcd', 2);
+
+    assertEqualsString('testStrSubstringFrom', 'bcd', tmpResult);
   END;
 
@@ -2210 +2293 @@
     result.add(@testStrLeftUntil_UnusedDelimiter);
     result.add(@testStrLeftUntil);
+
+    result.add(@testStrSubstringFrom_Empty);
+    result.add(@testStrSubstringFrom_EmptyZeroPos);
+    result.add(@testStrSubstringFrom_EmptyNegativePos);
+    result.add(@testStrSubstringFrom_FullCopy);
+    result.add(@testStrSubstringFrom_ZeroPos);
+    result.add(@testStrSubstringFrom_NegativePos);
+    result.add(@testStrSubstringFrom_ToBigPos);
+    result.add(@testStrSubstringFrom);
 
     result.add(@testStrStartsWith_BothEmpty);