Changeset 106

Timestamp:

Apr 11, 2007, 8:41:25 PM (18 years ago)

Author:

RBRi

Message:

more methods

Location:

trunk/NewView

Files:

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

trunk/NewView/StringUtilsUnit.pas

@@ -17 +17 @@
   StrLF = chr(10);
   StrCRLF = StrCR + StrLF;
-  Quote = '''';
-  DoubleQuote = '"';
+  StrSingleQuote = '''';
+  StrDoubleQuote = '"';
 
 
@@ -107 +107 @@
   Function StrInDoubleQuotes(const aString : String) : String;
 
+  // Extract all fields in a String delimited by whitespace (blank or tab).
+  // use double quotes if you need blanks in the strings
+  Procedure StrExtractStringsQuoted(Var aResult: TStrings; const aReceiver: String );
 
 Implementation
@@ -557 +560 @@
   end;
 
+
   Function StrInDoubleQuotes(const aString : String) : String;
   begin
-    Result := DoubleQuote + aString + DoubleQuote;
-  end;
-
-
+    Result := StrDoubleQuote + aString + StrDoubleQuote;
+  end;
+
+
+  Procedure StrExtractStringsQuoted(Var aResult: TStrings; const aReceiver: String );
+  Var
+    tmpState : (WHITESPACE, INSIDE, START_QUOTE, INSIDE_QUOTED, INSIDE_QUOTED_START_QUOTE);
+    tmpCurrentParsePosition : Integer;
+    tmpCurrentChar : Char;
+    tmpPart : String;
+
+  Begin
+    if (length(aReceiver) < 1) then exit;
+
+    tmpState := WHITESPACE;
+    tmpPart := '';
+
+    tmpCurrentParsePosition := 1;
+
+    for tmpCurrentParsePosition:=1 to length(aReceiver) do
+    begin
+      tmpCurrentChar := aReceiver[tmpCurrentParsePosition];
+
+      Case tmpCurrentChar of
+        ' ', StrTAB :
+        begin
+
+          Case tmpState of
+
+            WHITESPACE :
+            begin
+              // nothing
+            end;
+
+            INSIDE :
+            begin
+              aResult.add(tmpPart);
+              tmpPart := '';
+              tmpState := WHITESPACE;
+            end;
+
+            INSIDE_QUOTED :
+            begin
+              tmpPart := tmpPart + tmpCurrentChar;
+            end;
+
+            START_QUOTE :
+            begin
+              tmpPart := tmpPart + tmpCurrentChar;
+              tmpState := INSIDE_QUOTED;
+            end;
+
+            INSIDE_QUOTED_START_QUOTE :
+            begin
+              aResult.add(tmpPart);
+              tmpPart := '';
+              tmpState := WHITESPACE;
+            end;
+          end;
+        end;
+
+        StrDoubleQuote :
+        begin
+
+          Case tmpState of
+
+            WHITESPACE :
+            begin
+              tmpState := START_QUOTE;
+            end;
+
+            INSIDE :
+            begin
+              aResult.add(tmpPart);
+              tmpPart := '';
+              tmpState := START_QUOTE;
+            end;
+
+            INSIDE_QUOTED :
+            begin
+              tmpState := INSIDE_QUOTED_START_QUOTE;
+            end;
+
+            START_QUOTE :
+            begin
+              tmpState := INSIDE_QUOTED_START_QUOTE;
+            end;
+
+            INSIDE_QUOTED_START_QUOTE :
+            begin
+              tmpPart := tmpPart + tmpCurrentChar;
+              tmpState := INSIDE_QUOTED;
+            end;
+          end;
+        end;
+
+        else
+        begin
+          Case tmpState of
+
+            WHITESPACE :
+            begin
+              tmpPart := tmpPart + tmpCurrentChar;
+              tmpState := INSIDE;
+            end;
+
+            INSIDE, INSIDE_QUOTED :
+            begin
+              tmpPart := tmpPart + tmpCurrentChar;
+            end;
+
+            START_QUOTE :
+            begin
+              tmpPart := tmpPart + tmpCurrentChar;
+              tmpState := INSIDE_QUOTED;
+            end;
+
+            INSIDE_QUOTED_START_QUOTE :
+            begin
+              aResult.add(tmpPart);
+              tmpPart := tmpCurrentChar;
+              tmpState := INSIDE;
+            end;
+          end;
+        end;
+
+      end;
+    end;
+
+    Case tmpState of
+      WHITESPACE, START_QUOTE : {nothing to do};
+
+      INSIDE, INSIDE_QUOTED, INSIDE_QUOTED_START_QUOTE :
+      begin
+        aResult.add(tmpPart);
+      end;
+    end;
+  end;
 END.

trunk/NewView/unittests/StringUtilsUnitTests.pas

@@ -1418 +1418 @@
 
   // ----------------------------------------------------------
+
+
+  PROCEDURE testStrExtractStringsQuoted_Empty;
+  VAR
+    tmpResult : TStringList;
+    tmpString : String;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpString := '';
+
+    StrExtractStringsQuoted(tmpResult, tmpString);
+    assertEqualsInt('testStrExtractStringsQuoted_Empty', 0, tmpResult.count);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testStrExtractStringsQuoted_OnlyWhitespace;
+  VAR
+    tmpResult : TStringList;
+    tmpString : String;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpString := ' ' + StrTAB + '    ';
+
+    StrExtractStringsQuoted(tmpResult, tmpString);
+    assertEqualsInt('testStrExtractStringsQuoted_OnlyWhitespace', 0, tmpResult.count);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testStrExtractStringsQuoted_OnlyText;
+  VAR
+    tmpResult : TStringList;
+    tmpString : String;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpString := 'TeXt';
+
+    StrExtractStringsQuoted(tmpResult, tmpString);
+    assertEqualsInt('testStrExtractStringsQuoted_OnlyText', 1, tmpResult.count);
+    assertEqualsString('testStrExtractStringsQuoted_OnlyText', 'TeXt', tmpResult[0]);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testStrExtractStringsQuoted_OnlyText2Parts;
+  VAR
+    tmpResult : TStringList;
+    tmpString : String;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpString := 'TeXt sample';
+
+    StrExtractStringsQuoted(tmpResult, tmpString);
+    assertEqualsInt('testStrExtractStringsQuoted_OnlyText2Parts', 2, tmpResult.count);
+    assertEqualsString('testStrExtractStringsQuoted_OnlyText2Parts', 'TeXt', tmpResult[0]);
+    assertEqualsString('testStrExtractStringsQuoted_OnlyText2Parts', 'sample', tmpResult[1]);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testStrExtractStringsQuoted_TextAndWhitespace2Parts;
+  VAR
+    tmpResult : TStringList;
+    tmpString : String;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpString := '  TeXt   ' + StrTAB + StrTAB + '  sample ' + StrTAB;
+
+    StrExtractStringsQuoted(tmpResult, tmpString);
+    assertEqualsInt('testStrExtractStringsQuoted_TextAndWhitespace2Parts', 2, tmpResult.count);
+    assertEqualsString('testStrExtractStringsQuoted_TextAndWhitespace2Parts', 'TeXt', tmpResult[0]);
+    assertEqualsString('testStrExtractStringsQuoted_TextAndWhitespace2Parts', 'sample', tmpResult[1]);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testStrExtractStringsQuoted_QuotedText1Part;
+  VAR
+    tmpResult : TStringList;
+    tmpString : String;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpString := '"TeXt"';
+
+    StrExtractStringsQuoted(tmpResult, tmpString);
+    assertEqualsInt('testStrExtractStringsQuoted_QuotedText1Part', 1, tmpResult.count);
+    assertEqualsString('testStrExtractStringsQuoted_QuotedText1Part', 'TeXt', tmpResult[0]);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testStrExtractStringsQuoted_QuotedText1PartNoClosingQuotes;
+  VAR
+    tmpResult : TStringList;
+    tmpString : String;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpString := '"TeXt';
+
+    StrExtractStringsQuoted(tmpResult, tmpString);
+    assertEqualsInt('testStrExtractStringsQuoted_QuotedText1PartNoClosingQuotes', 1, tmpResult.count);
+    assertEqualsString('testStrExtractStringsQuoted_QuotedText1PartNoClosingQuotes', 'TeXt', tmpResult[0]);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testStrExtractStringsQuoted_QuotedText1PartNoClosingQuotesWhitewspace;
+  VAR
+    tmpResult : TStringList;
+    tmpString : String;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpString := '"TeX t ';
+
+    StrExtractStringsQuoted(tmpResult, tmpString);
+    assertEqualsInt('testStrExtractStringsQuoted_QuotedText1PartNoClosingQuotesWhitewspace', 1, tmpResult.count);
+    assertEqualsString('testStrExtractStringsQuoted_QuotedText1PartNoClosingQuotesWhitewspace', 'TeX t ', tmpResult[0]);
+
+    tmpResult.Destroy;
+  END;
+
+
+
+
+  PROCEDURE testStrExtractStringsQuoted_QuotedText1PartQuoteInside;
+  VAR
+    tmpResult : TStringList;
+    tmpString : String;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpString := '"TeX"t';
+
+    StrExtractStringsQuoted(tmpResult, tmpString);
+    assertEqualsInt('testStrExtractStringsQuoted_QuotedText1PartQuoteInside', 2, tmpResult.count);
+    assertEqualsString('testStrExtractStringsQuoted_QuotedText1PartQuoteInside', 'TeX', tmpResult[0]);
+    assertEqualsString('testStrExtractStringsQuoted_QuotedText1PartQuoteInside', 't', tmpResult[1]);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testStrExtractStringsQuoted_QuotedText1Part2QuotesInside;
+  VAR
+    tmpResult : TStringList;
+    tmpString : String;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpString := '"TeX""t"';
+
+    StrExtractStringsQuoted(tmpResult, tmpString);
+    assertEqualsInt('testStrExtractStringsQuoted_QuotedText1Part2QuotesInside', 1, tmpResult.count);
+    assertEqualsString('testStrExtractStringsQuoted_QuotedText1Part2QuotesInside', 'TeX"t', tmpResult[0]);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testStrExtractStringsQuoted_QuotedText1Part2Quotes;
+  VAR
+    tmpResult : TStringList;
+    tmpString : String;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpString := '"""Te X""t"""';
+
+    StrExtractStringsQuoted(tmpResult, tmpString);
+    assertEqualsInt('testStrExtractStringsQuoted_QuotedText1Part2Quotes', 1, tmpResult.count);
+    assertEqualsString('testStrExtractStringsQuoted_QuotedText1Part2Quotes', '"Te X"t"', tmpResult[0]);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testStrExtractStringsQuoted_Only1Quote;
+  VAR
+    tmpResult : TStringList;
+    tmpString : String;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpString := '"';
+
+    StrExtractStringsQuoted(tmpResult, tmpString);
+    assertEqualsInt('testStrExtractStringsQuoted_Only1Quote', 0, tmpResult.count);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testStrExtractStringsQuoted_Only1QuoteAndWhitespace;
+  VAR
+    tmpResult : TStringList;
+    tmpString : String;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpString := ' " ';
+
+    StrExtractStringsQuoted(tmpResult, tmpString);
+    assertEqualsInt('testStrExtractStringsQuoted_Only1QuoteAndWhitespace', 1, tmpResult.count);
+    assertEqualsString('testStrExtractStringsQuoted_Only1QuoteAndWhitespace', ' ', tmpResult[0]);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testStrExtractStringsQuoted_QuoteStartsNewPart;
+  VAR
+    tmpResult : TStringList;
+    tmpString : String;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpString := 'ab"c"';
+
+    StrExtractStringsQuoted(tmpResult, tmpString);
+    assertEqualsInt('testStrExtractStringsQuoted_QuoteStartsNewPart', 2, tmpResult.count);
+    assertEqualsString('testStrExtractStringsQuoted_QuoteStartsNewPart', 'ab', tmpResult[0]);
+    assertEqualsString('testStrExtractStringsQuoted_QuoteStartsNewPart', 'c', tmpResult[1]);
+
+    // note this is not compatible with the old behavior but more consistent
+    // tmpIndex  := 1;
+    // GetNextQuotedValue(tmpString, tmpIndex, s, '"');
+    // assertEqualsString('testGetNextQuotedValue', 'ab"c"', s);
+
+    tmpResult.Destroy;
+  END;
+
+
+  PROCEDURE testStrExtractStringsQuoted_ManyParts;
+  VAR
+    tmpResult : TStringList;
+    tmpString : String;
+  BEGIN
+    tmpResult := TStringList.Create;
+    tmpString := 'ab "c" """d" xy z  ""';
+
+    StrExtractStringsQuoted(tmpResult, tmpString);
+    assertEqualsInt('testStrExtractStringsQuoted_ManyParts', 6, tmpResult.count);
+    assertEqualsString('testStrExtractStringsQuoted_ManyParts', 'ab', tmpResult[0]);
+    assertEqualsString('testStrExtractStringsQuoted_ManyParts', 'c', tmpResult[1]);
+    assertEqualsString('testStrExtractStringsQuoted_ManyParts', '"d', tmpResult[2]);
+    assertEqualsString('testStrExtractStringsQuoted_ManyParts', 'xy', tmpResult[3]);
+    assertEqualsString('testStrExtractStringsQuoted_ManyParts', 'z', tmpResult[4]);
+    assertEqualsString('testStrExtractStringsQuoted_ManyParts', '', tmpResult[5]);
+
+    tmpResult.Destroy;
+  END;
+
+
+  // ----------------------------------------------------------
+
 
 
@@ -1562 +1819 @@
     result.add(@testStrInDoubleQuotes_Empty);
     result.add(@testStrInDoubleQuotes);
+
+    result.add(@testStrExtractStringsQuoted_Empty);
+    result.add(@testStrExtractStringsQuoted_OnlyWhitespace);
+    result.add(@testStrExtractStringsQuoted_OnlyText);
+    result.add(@testStrExtractStringsQuoted_OnlyText2Parts);
+    result.add(@testStrExtractStringsQuoted_TextAndWhitespace2Parts);
+    result.add(@testStrExtractStringsQuoted_QuotedText1Part);
+    result.add(@testStrExtractStringsQuoted_QuotedText1PartNoClosingQuotes);
+    result.add(@testStrExtractStringsQuoted_QuotedText1PartNoClosingQuotesWhitewspace);
+    result.add(@testStrExtractStringsQuoted_QuotedText1PartQuoteInside);
+    result.add(@testStrExtractStringsQuoted_QuotedText1Part2QuotesInside);
+    result.add(@testStrExtractStringsQuoted_QuotedText1Part2Quotes);
+    result.add(@testStrExtractStringsQuoted_Only1Quote);
+    result.add(@testStrExtractStringsQuoted_Only1QuoteAndWhitespace);
+    result.add(@testStrExtractStringsQuoted_QuoteStartsNewPart);
+    result.add(@testStrExtractStringsQuoted_ManyParts);
+
   END;