Changeset 109

Timestamp:

Apr 25, 2007, 10:25:56 AM (18 years ago)

Author:

RBRi

Message:

updates for AnsiString usage

Location:

trunk/NewView

Files:

• CmdLineParameterUnit.pas (modified) (10 diffs)
• unittests/CmdLineParameterUnitTests.pas (modified) (2 diffs)

trunk/NewView/CmdLineParameterUnit.pas

@@ -36 +36 @@
      TCmdLineParameters = class
      private
-       commandLine : String;
+       commandLine : AnsiString;
        showUsageFlag : boolean;
        searchFlag : boolean;
@@ -46 +46 @@
        windowPosition: TWindowPosition;
        ownerWindow : integer;
-       windowTitle : string;
-       parsedFileNames : string;
-       parsedRawFileNames : string;
-       fileNames : string;
-       parsedSearchText : string;
-       searchText : string;
+       windowTitle : AnsiString;
+       parsedFileNames : AnsiString;
+       parsedRawFileNames : AnsiString;
+       fileNames : AnsiString;
+       parsedSearchText : AnsiString;
+       searchText : AnsiString;
        debugEnabled : boolean;
 
        FUNCTION handleSwitchWithValue(const aSwitchString : String; const aSwitch : String; var aValue : String) : Boolean;
        PROCEDURE parseSwitch(aSwitchString : String);
-       PROPERTY getParsedFileNames : string read parsedFileNames;
-       PROPERTY getParsedSearchText : string read parsedSearchText;
+       PROPERTY getParsedFileNames : AnsiString read parsedFileNames;
+       PROPERTY getParsedSearchText : AnsiString read parsedSearchText;
 
      public
@@ -71 +71 @@
        PROPERTY getWindowPosition : TWindowPosition read windowPosition;
        PROPERTY getOwnerWindow : integer read ownerWindow;
-       PROPERTY getWindowTitle : string read windowTitle;
-       PROPERTY getFileNames : string read fileNames;
-       PROPERTY getSearchText : string read searchText;
+       PROPERTY getWindowTitle : AnsiString read windowTitle;
+       PROPERTY getFileNames : AnsiString read fileNames;
+       PROPERTY getSearchText : AnsiString read searchText;
 
        PROCEDURE writeDetailsTo(aStrings : TStrings);
        PROCEDURE logDetails;
-       PROCEDURE parseCmdLine(aCmdLineString : String);
+       PROCEDURE parseCmdLine(aCmdLineString : AnsiString);
        FUNCTION getOwnHelpFileName: String;
   end;
@@ -83 +83 @@
   // returns a string containing the whole
   // command line parametes
-  FUNCTION nativeOS2GetCmdLineParameter : String;
+  // this as function has a problem with returning an AnsiString
+  // ! you have to provide an AnsiString (normaly an empty one)
+  PROCEDURE nativeOS2GetCmdLineParameter(aResult : AnsiString);
 
 
@@ -162 +164 @@
 
 
-  Procedure TCmdLineParameters.parseCmdLine(aCmdLineString : String);
+  Procedure TCmdLineParameters.parseCmdLine(aCmdLineString : AnsiString);
   var
     tmpState : (WHITESPACE, QUOTE, SWITCH, FILENAME, TEXT);
@@ -168 +170 @@
     tmpQuoted : boolean;
     tmpCurrentChar : char;
-    tmpWhitespace : String;
-    tmpQuote : String;
-    tmpSwitch : String;
-    tmpOwnHelpFileName : String;
+    tmpWhitespace : AnsiString;
+    tmpQuote : AnsiString;
+    tmpSwitch : AnsiString;
+    tmpOwnHelpFileName : AnsiString;
     tmpEnvDebug : String;
   begin
@@ -411 +413 @@
 
     // remove blanks
-    fileNames := StrTrim(getParsedFileNames);
-    searchText := StrTrim(getParsedSearchText);
+    fileNames := AnsiStrTrim(getParsedFileNames);
+    searchText := AnsiStrTrim(getParsedSearchText);
 
     if getGlobalSearchFlag
@@ -438 +440 @@
     then
     begin
-      searchText := StrTrimChars(searchText, ['"']);
+      searchText := AnsiStrTrimChars(searchText, ['"']);
     end;
 
@@ -618 +620 @@
 
 
-  FUNCTION nativeOS2GetCmdLineParameter : STRING;
+  PROCEDURE nativeOS2GetCmdLineParameter(aResult : AnsiString);
   VAR
     tmpPtib : PTIB;       // thread information block
     tmpPpib : PPIB;       // process information block
     tmpCmd  : PCHAR;
-    tmpResult : PCHAR;
+    tmpParams : PCHAR;
+    tmpResult : AnsiString;
 
   BEGIN
@@ -633 +636 @@
     // skip to the next null terminated string
     // these are the parameters
-    tmpResult := tmpCmd + StrLen(tmpCmd) + 1;
-    result := StrPas(tmpResult);
+    tmpParams := tmpCmd + StrLen(tmpCmd) + 1;
+
+    AnsiSetString(aResult, tmpParams, StrLen(tmpParams));
   END;
 END.

trunk/NewView/unittests/CmdLineParameterUnitTests.pas

@@ -1508 +1508 @@
 
 
+  PROCEDURE testParseCmdLine_ReallyLong;
+  VAR
+    tmpCmdLineString : AnsiString;
+    tmpCmdLineParameters : TCmdLineParameters;
+    i : integer;
+  BEGIN
+    tmpCmdLineString := '-s ';
+
+    // long file name
+    tmpCmdLineString := tmpCmdLineString + 'LongFileName';
+    for i := 1 to 30 do
+    begin
+      tmpCmdLineString := tmpCmdLineString + '0123456789';
+    end;
+
+    // long search text
+    tmpCmdLineString := tmpCmdLineString + ' LongSearchText';
+    for i := 1 to 30 do
+    begin
+      tmpCmdLineString := tmpCmdLineString + '0123456789';
+    end;
+
+    tmpCmdLineParameters := TCmdLineParameters.Create;
+    tmpCmdLineParameters.parseCmdLine(tmpCmdLineString);
+
+    assertFalse('testParseCmdLine_ReallyLong->ShowUsageFlag', tmpCmdLineParameters.getShowUsageFlag);
+    assertTrue('testParseCmdLine_ReallyLong->SearchFlag', tmpCmdLineParameters.getSearchFlag);
+    assertFalse('testParseCmdLine_ReallyLong->GlobalSearchFlag', tmpCmdLineParameters.getGlobalSearchFlag);
+    assertEqualsString('testParseCmdLine_ReallyLong', '', tmpCmdLineParameters.getLanguage);
+    assertFalse('testParseCmdLine_ReallyLong', tmpCmdLineParameters.getHelpManagerFlag);
+    assertEqualsInt('testParseCmdLine_ReallyLong', 0, tmpCmdLineParameters.getHelpManagerWindow);
+    assertEqualsInt('testParseCmdLine_ReallyLong', 0, tmpCmdLineParameters.getOwnerWindow);
+    assertEqualsString('testParseCmdLine_ReallyLong', '', tmpCmdLineParameters.getWindowTitle);
+
+    assertEqualsInt('testParseCmdLine_ReallyLong', 312, Length(tmpCmdLineParameters.getFileNames));
+    assertEqualsInt('testParseCmdLine_ReallyLong', 314, Length(tmpCmdLineParameters.getSearchText));
+  END;
+
+
+
+  // ----------------------------------------------------------
+
+
   FUNCTION getCmdLineParameterUnitTests : TList;
   BEGIN
@@ -1593 +1636 @@
     result.add(@testParseCmdLine_SwitchAndFileQuoted);
     result.add(@testParseCmdLine_SwitchAndFileAndTextQuoted);
+
+    result.add(@testParseCmdLine_ReallyLong);
+
   END;