Changeset 105

Timestamp:

Apr 5, 2007, 8:34:33 PM (18 years ago)

Author:

RBRi

Message:

%more stringutils refactoring

Location:

trunk/NewView

Files:

• FileDialogForm.pas (modified) (8 diffs)
• NavigatePointUnit.pas (modified) (3 diffs)
• StringUtilsUnit.pas (modified) (5 diffs)
• unittests/StringUtilsUnitTests.pas (modified) (6 diffs)

trunk/NewView/FileDialogForm.pas

@@ -123 +123 @@
   PmWin,
   SysUtils,
-  ACLStringUtility,
   FileUtilsUnit,
   ACLDialogs,
@@ -131 +130 @@
   SettingsUnit,
   HelpFile,
+  StringUtilsUnit,
   DebugUnit;
 
@@ -286 +286 @@
   filename: string;
   ShowList: boolean;
-  NameAndTitle: string;
+  tmpNameAndTitle: string;
 Begin
   CompletionsListBox.Items.Clear;
@@ -295 +295 @@
     for i := 0 to FileListBox.Items.Count - 1 do
     begin
-      NameAndTitle := FileListBox.Items[ i ];
-      Filename := ExtractNextValue( NameAndTitle, #9 );
-
-      if StrStarts( search, filename ) then
+      tmpNameAndTitle := FileListBox.Items[ i ];
+      Filename := StrLeftUntil(tmpNameAndTitle, [StrTAB]);
+
+      if StrStartsWithIgnoringCase(filename, search) then
         CompletionsListBox.Items.Add( filename );
     end;
@@ -306 +306 @@
   if CompletionsListBox.Items.Count = 1 then
   begin
-    if not StringsSame( CompletionsListBox.Items[ 0 ], search ) then
+    if not StrEqualIgnoringCase(CompletionsListBox.Items[0], search) then
       ShowList := true;
   end
@@ -436 +436 @@
     begin
       NameAndTitle := FileListBox.Items[ FileIndex ];
-      FileNames.Add( ExtractNextValue( NameAndTitle, #9 ) );
+      FileNames.Add(StrLeftUntil(NameAndTitle, [StrTAB]));
     end;
   end;
@@ -471 +471 @@
     begin
       DoErrorDlg( InvalidFilterErrorTitle,
-                  StrDoubleQuote( FileNameText )
+                  StrInDoubleQuotes(FileNameText)
                   + InvalidFilterError
-                  + EndLine
+                  + StrCRLF
                   + '  \ / :' );
       exit;
@@ -611 +611 @@
                                + Filename );
 
-    FileListBox.Items.Add( Filename
-                           + #9
-                           + Title );
+    FileListBox.Items.Add(Filename + StrTAB + Title );
   end;
   FileListBox.Items.EndUpdate;

trunk/NewView/NavigatePointUnit.pas

@@ -48 +48 @@
   SysUtils,
   ACLUtility,
-  ACLStringUtility;
+  StringUtilsUnit,
+  DebugUnit;
 
 procedure SaveWindowList( Var F: TextFile;
@@ -167 +168 @@
 constructor TSavedHelpWindow.Load( Var F: TextFile );
 var
-  s: string;
+  tmpString : string;
   TopicIndex: integer;
+  tmpParts : TStringList;
 begin
   inherited Create;
@@ -174 +176 @@
   Rect:= THelpWindowRect.Create;
 
-  ReadLn( F, S );
+  ReadLn( F, tmpString);
+  tmpParts := TStringList.Create;
+  StrExtractStrings(tmpParts, tmpString, [','], #0);
 
-  TopicIndex   := StrToInt( ExtractNextValue( S, ',' ) );
+  TopicIndex   := StrToInt(tmpParts[0]);
   Topic := HelpFile.Topics[ TopicIndex ];
-  Group        := StrToInt( ExtractNextValue( S, ',' ) );
-  Rect.Left    := StrToInt( ExtractNextValue( S, ',' ) );
-  Rect.Bottom  := StrToInt( ExtractNextValue( S, ',' ) );
-  Rect.Width   := StrToInt( ExtractNextValue( S, ',' ) );
-  Rect.Height  := StrToInt( ExtractNextValue( S, ',' ) );
-  TopCharIndex := StrToInt( ExtractNextValue( S, ',' ) );
+  Group        := StrToInt(tmpParts[1]);
+  Rect.Left    := StrToInt(tmpParts[2]);
+  Rect.Bottom  := StrToInt(tmpParts[3]);
+  Rect.Width   := StrToInt(tmpParts[4]);
+  Rect.Height  := StrToInt(tmpParts[5]);
+  TopCharIndex := StrToInt(tmpParts[6]);
+
+  tmpParts.Destroy;
 
   LoadWindowList( F, ChildWindows, HelpFile );

trunk/NewView/StringUtilsUnit.pas

@@ -13 +13 @@
 
 const
+  StrTAB = chr(9);
   StrCR = chr(13);
   StrLF = chr(10);
@@ -76 +77 @@
   Function StrLeftUntil(const aReceiver: String; const aSetOfChars: TSetOfChars) : String;
 
-  // returns true if the String starts with the provides one
+  // returns true if the String starts with the provided one
   // this is case SENSITIVE
   Function StrStartsWith(const aReceiver: String; const aStartString: String): Boolean;
 
-  // returns true if the String starts with the provides one
+  // returns true if the String starts with the provided one
   // this is case INsensitive
   Function StrStartsWithIgnoringCase(const aReceiver: String; const aStartString: String): Boolean;
@@ -88 +89 @@
   Function StrEndsWith(const aReceiver: String; const anEndString: String): Boolean;
 
-  // returns true if the String ends with the provides one
+  // returns true if the String ends with the provided one
   // this is case INsensitive
   Function StrEndsWithIgnoringCase(const aReceiver: String; const anEndString: String): Boolean;
+
+  // returns true if the Strings are the same
+  // this is case INsensitive
+  Function StrEqualIgnoringCase(const aReceiver: String; const aSecondString: String): Boolean;
 
   // the IntToStr generates wrong results
@@ -106 +111 @@
 
   uses
+    SysUtils,
     DebugUnit;
 
@@ -502 +508 @@
 
 
+  Function StrEqualIgnoringCase(const aReceiver: String; const aSecondString: String): Boolean;
+  begin
+    Result := CompareText(aReceiver, aSecondString) = 0;
+  end;
+
+
   Function LongWordToStr(const aLongWord: LongWord) : String;
   Var

trunk/NewView/unittests/StringUtilsUnitTests.pas

@@ -410 +410 @@
   END;
 
+  PROCEDURE testStrExtractStrings_DelimiterSameAsEscapeChar;
+  VAR
+    tmpResult : TStringList;
+  BEGIN
+    tmpResult := TStringList.Create;
+    StrExtractStrings(tmpResult, 'a;b;;cd;;;', [';'], ';');
+
+    assertEqualsInt('testStrExtractStrings_EscapedEscapeChar', 3, tmpResult.count);
+    assertEqualsString('testStrExtractStrings_EscapedEscapeChar', 'a', tmpResult[0]);
+    assertEqualsString('testStrExtractStrings_EscapedEscapeChar', 'b;cd;', tmpResult[1]);
+    assertEqualsString('testStrExtractStrings_EscapedEscapeChar', '', tmpResult[2]);
+
+    tmpResult.Destroy;
+  END;
 
   // ------------------------------------------------------
@@ -1267 +1281 @@
 
 
+  // ----------------------------------------------------------
+
+
+  PROCEDURE testStrEqualIgnoringCase_BothEmpty;
+  VAR
+    tmpResult : Boolean;
+  BEGIN
+    tmpResult := StrEqualIgnoringCase('', '');
+
+    assertTrue('testStrEqualIgnoringCase_BothEmpty', tmpResult);
+  END;
+
+
+  PROCEDURE testStrEqualIgnoringCase_FirstEmpty;
+  VAR
+    tmpResult : Boolean;
+  BEGIN
+    tmpResult := StrEqualIgnoringCase('', 'xy');
+
+    assertFalse('testStrEqualIgnoringCase_FirstEmpty', tmpResult);
+  END;
+
+  PROCEDURE testStrEqualIgnoringCase_SecondEmpty;
+  VAR
+    tmpResult : Boolean;
+  BEGIN
+    tmpResult := StrEqualIgnoringCase('xy', '');
+
+    assertFalse('testStrEqualIgnoringCase_SecondEmpty', tmpResult);
+  END;
+
+  PROCEDURE testStrEqualIgnoringCase_DifferentLength;
+  VAR
+    tmpResult : Boolean;
+  BEGIN
+    tmpResult := StrEqualIgnoringCase('xy', 'xyz');
+
+    assertFalse('testStrEqualIgnoringCase_DifferentLength', tmpResult);
+  END;
+
+  PROCEDURE testStrEqualIgnoringCase_DifferentCase;
+  VAR
+    tmpResult : Boolean;
+  BEGIN
+    tmpResult := StrEqualIgnoringCase('xYz', 'xyz');
+
+    assertTrue('testStrEqualIgnoringCase_DifferentCase', tmpResult);
+  END;
+
+  PROCEDURE testStrEqualIgnoringCase;
+  VAR
+    tmpResult : Boolean;
+  BEGIN
+    tmpResult := StrEqualIgnoringCase('XYz', 'XYz');
+
+    assertTrue('testStrEqualIgnoringCase', tmpResult);
+  END;
+
+  // ----------------------------------------------------------
+
+
   PROCEDURE testLongWordToStr_Zero;
   VAR
@@ -1296 +1371 @@
 
 
+  // ----------------------------------------------------------
+
 
   PROCEDURE testBoolToStr_true;
@@ -1315 +1392 @@
     assertEqualsString('testBoolToStr_false', 'False', tmpResult);
   END;
+
 
   // ----------------------------------------------------------
@@ -1375 +1453 @@
     result.add(@testStrExtractStrings_EscapedDelimiter);
     result.add(@testStrExtractStrings_EscapedEscapeChar);
+    result.add(@testStrExtractStrings_DelimiterSameAsEscapeChar);
 
     result.add(@testStrExtractStringsIgnoreEmpty_EmptyReceiver);
@@ -1467 +1546 @@
     result.add(@testStrEndsWithIgnoringCase_StringMatchCaseInSensitive);
 
+    result.add(@testStrEqualIgnoringCase_BothEmpty);
+    result.add(@testStrEqualIgnoringCase_FirstEmpty);
+    result.add(@testStrEqualIgnoringCase_SecondEmpty);
+    result.add(@testStrEqualIgnoringCase_DifferentLength);
+    result.add(@testStrEqualIgnoringCase_DifferentCase);
+    result.add(@testStrEqualIgnoringCase);
+
     result.add(@testLongWordToStr_Zero);
     result.add(@testLongWordToStr_Four);