From 3df7d8afe5855d804261ffc76a25ae3094ff6318 Mon Sep 17 00:00:00 2001 From: juha Date: Mon, 22 Apr 2019 09:00:32 +0000 Subject: [PATCH] LCL, LazUtils: Move string manipulation functions from LCLProc to LazStringUtils. git-svn-id: trunk@61038 - --- .../debuggerintf/dbgintfdebuggerbase.pp | 2 +- .../lazdebuggergdbmi/cmdlinedebugger.pp | 11 +- components/lazdebuggergdbmi/debugutils.pp | 6 +- components/lazdebuggergdbmi/gdbmidebugger.pp | 9 +- .../gdbmidebuginstructions.pp | 6 +- .../lazdebuggergdbmi/gdbmimiscclasses.pp | 6 +- .../lazdebuggergdbmi/gdbmiserverdebugger.pas | 6 +- components/lazdebuggergdbmi/gdbtypeinfo.pp | 2 - .../lazdebuggergdbmi/sshgdbmidebugger.pas | 15 +- .../lazdebuggerlldb/lldbdebugger.pas | 10 +- .../lazdebuggerlldb/lldbhelper.pas | 4 +- .../lazdebuggerlldb/lldbinstructions.pas | 11 +- .../lazdebugtestbase/testdbgconfig.pas | 3 +- .../lazdebugtestbase/testdbgcontrolform.pas | 6 +- components/lazutils/lazstringutils.pas | 198 ++++++++++++++++++ components/todolist/tododlg.pas | 12 +- components/todolist/todolist.pas | 4 +- debugger/debugger.pp | 3 +- debugger/frames/debugger_general_options.pas | 4 +- ide/initialsetupdlgs.pas | 25 ++- lcl/lclproc.pas | 198 ------------------ tools/apiwizz/apiwizard.pp | 7 +- 22 files changed, 305 insertions(+), 243 deletions(-) diff --git a/components/debuggerintf/dbgintfdebuggerbase.pp b/components/debuggerintf/dbgintfdebuggerbase.pp index 606fd0c0c0..4482368643 100644 --- a/components/debuggerintf/dbgintfdebuggerbase.pp +++ b/components/debuggerintf/dbgintfdebuggerbase.pp @@ -48,7 +48,7 @@ uses // LCL LCLProc, // LazUtils - LazClasses, LazLoggerBase, LazFileUtils, Maps, LazMethodList, + LazClasses, LazLoggerBase, LazFileUtils, LazStringUtils, Maps, LazMethodList, // DebuggerIntf DbgIntfBaseTypes, DbgIntfMiscClasses, DbgIntfPseudoTerminal; diff --git a/components/lazdebuggergdbmi/cmdlinedebugger.pp b/components/lazdebuggergdbmi/cmdlinedebugger.pp index 3b71790d71..6921084e2f 100644 --- a/components/lazdebuggergdbmi/cmdlinedebugger.pp +++ b/components/lazdebuggergdbmi/cmdlinedebugger.pp @@ -39,8 +39,15 @@ unit CmdLineDebugger; interface uses - Classes, Types, process, FileUtil, LCLProc, LazLoggerBase, UTF8Process, - DbgIntfDebuggerBase, Forms, DebugUtils; + Classes, Types, process, + // LCL + Forms, + // LazUtils + LazLoggerBase, UTF8Process, + // DebuggerIntf + DbgIntfDebuggerBase, + // LazDebuggerGdbmi + DebugUtils; type diff --git a/components/lazdebuggergdbmi/debugutils.pp b/components/lazdebuggergdbmi/debugutils.pp index bbcd60d083..05b042ed1f 100644 --- a/components/lazdebuggergdbmi/debugutils.pp +++ b/components/lazdebuggergdbmi/debugutils.pp @@ -35,7 +35,11 @@ unit DebugUtils; interface uses - DbgIntfBaseTypes, Classes, LCLProc, LazUTF8; + Classes, + // LazUtils + LazLoggerBase, LazUTF8, + // DebuggerIntf + DbgIntfBaseTypes; type diff --git a/components/lazdebuggergdbmi/gdbmidebugger.pp b/components/lazdebuggergdbmi/gdbmidebugger.pp index 9de6b108ea..bb7df376b3 100644 --- a/components/lazdebuggergdbmi/gdbmidebugger.pp +++ b/components/lazdebuggergdbmi/gdbmidebugger.pp @@ -57,16 +57,17 @@ uses Classes, SysUtils, strutils, math, fgl, Variants, // LCL Controls, Dialogs, Forms, - LCLProc, // LazUtils - FileUtil, LazUTF8, LazClasses, LazLoggerBase, Maps, + FileUtil, LazUTF8, LazClasses, LazLoggerBase, LazStringUtils, Maps, // IdeIntf BaseIDEIntf, {$IFDEF Darwin} LazFileUtils, {$ENDIF} - DebugUtils, GDBTypeInfo, GDBMIDebugInstructions, GDBMIMiscClasses, - DbgIntfBaseTypes, DbgIntfDebuggerBase, DbgIntfPseudoTerminal, GdbmiStringConstants; + // DebuggerIntf + DbgIntfBaseTypes, DbgIntfDebuggerBase, DbgIntfPseudoTerminal, + // LazDebuggerGdbmi + DebugUtils, GDBTypeInfo, GDBMIDebugInstructions, GDBMIMiscClasses, GdbmiStringConstants; type TGDBMIProgramInfo = record diff --git a/components/lazdebuggergdbmi/gdbmidebuginstructions.pp b/components/lazdebuggergdbmi/gdbmidebuginstructions.pp index 30237911dc..7adcc4162e 100644 --- a/components/lazdebuggergdbmi/gdbmidebuginstructions.pp +++ b/components/lazdebuggergdbmi/gdbmidebuginstructions.pp @@ -5,7 +5,11 @@ unit GDBMIDebugInstructions; interface uses - Classes, SysUtils, math, CmdLineDebugger, GDBMIMiscClasses, LazLoggerBase, LazClasses; + Classes, SysUtils, math, + // LazUtils + LazLoggerBase, LazClasses, + // LazDebuggerGdbmi + CmdLineDebugger, GDBMIMiscClasses; type diff --git a/components/lazdebuggergdbmi/gdbmimiscclasses.pp b/components/lazdebuggergdbmi/gdbmimiscclasses.pp index 7af9fd901e..b3d26a9021 100644 --- a/components/lazdebuggergdbmi/gdbmimiscclasses.pp +++ b/components/lazdebuggergdbmi/gdbmimiscclasses.pp @@ -31,7 +31,11 @@ unit GDBMIMiscClasses; interface uses - Classes, SysUtils, DebugUtils, DbgIntfDebuggerBase; + Classes, SysUtils, + // DebuggerIntf + DbgIntfDebuggerBase, + // LazDebuggerGdbmi + DebugUtils; type diff --git a/components/lazdebuggergdbmi/gdbmiserverdebugger.pas b/components/lazdebuggergdbmi/gdbmiserverdebugger.pas index 42e85ea48c..2e0c29d030 100644 --- a/components/lazdebuggergdbmi/gdbmiserverdebugger.pas +++ b/components/lazdebuggergdbmi/gdbmiserverdebugger.pas @@ -31,7 +31,11 @@ unit GDBMIServerDebugger; interface uses - Classes, sysutils, GDBMIDebugger, GDBMIMiscClasses, DbgIntfDebuggerBase; + Classes, sysutils, + // DebuggerIntf + DbgIntfDebuggerBase, + // LazDebuggerGdbmi + GDBMIDebugger, GDBMIMiscClasses; type diff --git a/components/lazdebuggergdbmi/gdbtypeinfo.pp b/components/lazdebuggergdbmi/gdbtypeinfo.pp index 1700862b72..2cc1c85e51 100644 --- a/components/lazdebuggergdbmi/gdbtypeinfo.pp +++ b/components/lazdebuggergdbmi/gdbtypeinfo.pp @@ -35,8 +35,6 @@ interface uses Classes, SysUtils, math, - // LCL - LclProc, // LazUtils LazLoggerBase, LazStringUtils, // DebuggerIntf diff --git a/components/lazdebuggergdbmi/sshgdbmidebugger.pas b/components/lazdebuggergdbmi/sshgdbmidebugger.pas index 27f5bdfdef..9bfc35c194 100644 --- a/components/lazdebuggergdbmi/sshgdbmidebugger.pas +++ b/components/lazdebuggergdbmi/sshgdbmidebugger.pas @@ -37,9 +37,18 @@ unit SSHGDBMIDebugger; interface uses - Classes, SysUtils, Dialogs, Controls, GDBMIDebugger, PropEdits, - DbgIntfDebuggerBase, Graphics, LCLProc, GdbmiStringConstants; - + Classes, SysUtils, + // LCL + Dialogs, Controls, Graphics, + // LazUtils + LazStringUtils, + // IdeIntf + PropEdits, + // DebuggerIntf + DbgIntfDebuggerBase, + // LazDebuggerGdbmi + GDBMIDebugger, GdbmiStringConstants; + type { TSSHGDBMIDebugger } diff --git a/components/lazdebuggers/lazdebuggerlldb/lldbdebugger.pas b/components/lazdebuggers/lazdebuggerlldb/lldbdebugger.pas index b27988bb2f..84d1d67b88 100644 --- a/components/lazdebuggers/lazdebuggerlldb/lldbdebugger.pas +++ b/components/lazdebuggers/lazdebuggerlldb/lldbdebugger.pas @@ -22,8 +22,14 @@ unit LldbDebugger; interface uses - Classes, SysUtils, math, DbgIntfDebuggerBase, DbgIntfBaseTypes, LazLoggerBase, - LazClasses, LazFileUtils, Maps, LCLProc, strutils, DebugProcess, + Classes, SysUtils, strutils, math, + // LazUtils + LazClasses, LazFileUtils, LazLoggerBase, LazStringUtils, Maps, + // DebuggerIntf + DbgIntfDebuggerBase, DbgIntfBaseTypes, + // CmdLineDebuggerBase + DebugProcess, + // LazDebuggerLldb LldbInstructions, LldbHelper; type diff --git a/components/lazdebuggers/lazdebuggerlldb/lldbhelper.pas b/components/lazdebuggers/lazdebuggerlldb/lldbhelper.pas index 935c98dc41..1a780fc621 100644 --- a/components/lazdebuggers/lazdebuggerlldb/lldbhelper.pas +++ b/components/lazdebuggers/lazdebuggerlldb/lldbhelper.pas @@ -18,7 +18,9 @@ unit LldbHelper; interface uses - Classes, SysUtils, math, DbgIntfBaseTypes, strutils; + Classes, SysUtils, strutils, math, + // DebuggerIntf + DbgIntfBaseTypes; function LastPos(ASearch, AString: string): Integer; diff --git a/components/lazdebuggers/lazdebuggerlldb/lldbinstructions.pas b/components/lazdebuggers/lazdebuggerlldb/lldbinstructions.pas index d658b38d92..d0ec28ffab 100644 --- a/components/lazdebuggers/lazdebuggerlldb/lldbinstructions.pas +++ b/components/lazdebuggers/lazdebuggerlldb/lldbinstructions.pas @@ -18,8 +18,15 @@ unit LldbInstructions; interface uses - SysUtils, math, Classes, LazLoggerBase, DbgIntfDebuggerBase, DbgIntfBaseTypes, - strutils, DebugInstructions, LldbHelper; + SysUtils, Classes, strutils, + // LazUtils + LazLoggerBase, + // DebuggerIntf + DbgIntfDebuggerBase, DbgIntfBaseTypes, + // CmdLineDebuggerBase + DebugInstructions, + // LazDebuggerLldb + LldbHelper; type diff --git a/components/lazdebuggers/lazdebugtestbase/testdbgconfig.pas b/components/lazdebuggers/lazdebugtestbase/testdbgconfig.pas index 8cdbd686b4..f73171214c 100644 --- a/components/lazdebuggers/lazdebugtestbase/testdbgconfig.pas +++ b/components/lazdebuggers/lazdebugtestbase/testdbgconfig.pas @@ -21,7 +21,8 @@ unit TestDbgConfig; interface uses - Classes, SysUtils, LCLProc; + Classes, SysUtils, + LazStringUtils; var AppDir, ConfDir: String; diff --git a/components/lazdebuggers/lazdebugtestbase/testdbgcontrolform.pas b/components/lazdebuggers/lazdebugtestbase/testdbgcontrolform.pas index 46cf04cad2..4479d5aa3a 100644 --- a/components/lazdebuggers/lazdebugtestbase/testdbgcontrolform.pas +++ b/components/lazdebuggers/lazdebugtestbase/testdbgcontrolform.pas @@ -5,9 +5,11 @@ unit TestDbgControlForm; interface uses + // LCL Interfaces, Classes, SysUtils, Forms, Controls, Graphics, Dialogs, ExtCtrls, StdCtrls, - EditBtn, ComCtrls, CheckLst, TestDbgControl, TestDbgConfig, - TTestDbgExecuteables; + EditBtn, ComCtrls, CheckLst, + // LazDebugTestBase + TestDbgControl, TestDbgConfig, TTestDbgExecuteables; type diff --git a/components/lazutils/lazstringutils.pas b/components/lazutils/lazstringutils.pas index d4775d01cf..948d5073ad 100644 --- a/components/lazutils/lazstringutils.pas +++ b/components/lazutils/lazstringutils.pas @@ -81,6 +81,17 @@ function FindNextDelimitedItem(const List: string; Delimiter: char; var Position: integer; FindItem: string): string; function MergeWithDelimiter(const a, b: string; Delimiter: char): string; +// String manipulation +function StripLN(const ALine: String): String; +function GetPart(const ASkipTo, AnEnd: String; var ASource: String; + const AnIgnoreCase: Boolean = False; const AnUpdateSource: Boolean = True): String; overload; +function GetPart(const ASkipTo, AnEnd: array of String; var ASource: String; + const AnIgnoreCase: Boolean = False; const AnUpdateSource: Boolean = True): String; overload; +function TextToSingleLine(const AText: string): string; +function SwapCase(Const S: String): String; +// case..of utility +function StringCase(const AString: String; const ACase: array of String {; const AIgnoreCase = False, APartial = false: Boolean}): Integer; overload; +function StringCase(const AString: String; const ACase: array of String; const AIgnoreCase, APartial: Boolean): Integer; overload; implementation @@ -1036,5 +1047,192 @@ begin Result:=b; end; +function StripLN(const ALine: String): String; +var + idx: Integer; +begin + Result := ALine; + idx := Pos(#10, Result); + if idx = 0 + then begin + idx := Pos(#13, Result); + if idx = 0 then Exit; + end + else begin + if (idx > 1) + and (Result[idx - 1] = #13) + then Dec(idx); + end; + SetLength(Result, idx - 1); +end; + +function GetPart(const ASkipTo, AnEnd: String; var ASource: String; + const AnIgnoreCase, AnUpdateSource: Boolean): String; +begin + Result := GetPart([ASkipTo], [AnEnd], ASource, AnIgnoreCase, AnUpdateSource); +end; + +function GetPart(const ASkipTo, AnEnd: array of String; var ASource: String; + const AnIgnoreCase: Boolean = False; const AnUpdateSource: Boolean = True): String; +var + n, i, idx: Integer; + S, Source, Match: String; + HasEscape: Boolean; +begin + Source := ASource; + + if High(ASkipTo) >= 0 + then begin + idx := 0; + Match := ''; + HasEscape := False; + if AnIgnoreCase + then S := UpperCase(Source) + else S := Source; + for n := Low(ASkipTo) to High(ASkipTo) do + begin + if ASkipTo[n] = '' + then begin + HasEscape := True; + Continue; + end; + if AnIgnoreCase + then i := Pos(UpperCase(ASkipTo[n]), S) + else i := Pos(ASkipTo[n], S); + if i > idx + then begin + idx := i; + Match := ASkipTo[n]; + end; + end; + if (idx = 0) and not HasEscape + then begin + Result := ''; + Exit; + end; + if idx > 0 + then Delete(Source, 1, idx + Length(Match) - 1); + end; + + if AnIgnoreCase + then S := UpperCase(Source) + else S := Source; + idx := MaxInt; + for n := Low(AnEnd) to High(AnEnd) do + begin + if AnEnd[n] = '' then Continue; + if AnIgnoreCase + then i := Pos(UpperCase(AnEnd[n]), S) + else i := Pos(AnEnd[n], S); + if (i > 0) and (i < idx) then idx := i; + end; + + if idx = MaxInt + then begin + Result := Source; + Source := ''; + end + else begin + Result := Copy(Source, 1, idx - 1); + Delete(Source, 1, idx - 1); + end; + + if AnUpdateSource + then ASource := Source; +end; + +{ + Ensures the covenient look of multiline string + when displaying it in the single line + * Replaces CR and LF with spaces + * Removes duplicate spaces +} +function TextToSingleLine(const AText: string): string; +var + str: string; + i, wstart, wlen: Integer; +begin + str := Trim(AText); + wstart := 0; + wlen := 0; + i := 1; + while i < Length(str) - 1 do + begin + if (str[i] in [' ', #13, #10]) then + begin + if (wstart = 0) then + begin + wstart := i; + wlen := 1; + end else + Inc(wlen); + end else + begin + if wstart > 0 then + begin + str[wstart] := ' '; + Delete(str, wstart+1, wlen-1); + Dec(i, wlen-1); + wstart := 0; + end; + end; + Inc(i); + end; + Result := str; +end; + +function SwapCase(Const S: String): String; +// Inverts the character case. Like LowerCase and UpperCase combined. +var + i : Integer; + P : PChar; +begin + Result := S; + if not assigned(pointer(result)) then exit; + UniqueString(Result); + P:=Pchar(pointer(Result)); + for i := 1 to Length(Result) do begin + if (P^ in ['a'..'z']) then + P^ := char(byte(p^) - 32) + else if (P^ in ['A'..'Z']) then + P^ := char(byte(p^) + 32); + Inc(P); + end; +end; + +function StringCase(const AString: String; const ACase: array of String {; const AIgnoreCase = False, APartial = false: Boolean}): Integer; +begin + Result := StringCase(AString, ACase, False, False); +end; + +function StringCase(const AString: String; const ACase: array of String; const AIgnoreCase, APartial: Boolean): Integer; +var + Search, S: String; +begin + if High(ACase) = -1 + then begin + Result := -1; + Exit; + end; + + if AIgnoreCase + then Search := UpperCase(AString) + else Search := AString; + + for Result := Low(ACase) to High(ACase) do + begin + if AIgnoreCase + then S := UpperCase(ACase[Result]) + else S := ACase[Result]; + + if Search = S then Exit; + if not APartial then Continue; + if Length(Search) >= Length(S) then Continue; + if StrLComp(PChar(Search), PChar(S), Length(Search)) = 0 then Exit; + end; + + Result := -1; +end; + end. diff --git a/components/todolist/tododlg.pas b/components/todolist/tododlg.pas index 3746618c97..11e98f06cc 100644 --- a/components/todolist/tododlg.pas +++ b/components/todolist/tododlg.pas @@ -29,10 +29,14 @@ unit ToDoDlg; interface uses - Classes, SysUtils, Forms, Controls, Graphics, Dialogs, StdCtrls, - ExtCtrls, Buttons, ButtonPanel, Menus, Spin, - TodoList, ToDoListStrConsts, IDECommands, LCLType, - MenuIntf, PackageIntf, SrcEditorIntf, IDEWindowIntf, LazIDEIntf; + Classes, SysUtils, + // LCL + LCLType, Forms, Controls, Graphics, Dialogs, StdCtrls, ExtCtrls, + Buttons, ButtonPanel, Menus, Spin, + // IdeIntf + IDECommands, MenuIntf, PackageIntf, SrcEditorIntf, IDEWindowIntf, LazIDEIntf, + // TodoList + TodoList, ToDoListStrConsts; type diff --git a/components/todolist/todolist.pas b/components/todolist/todolist.pas index 1987f0511c..f9ece943c3 100644 --- a/components/todolist/todolist.pas +++ b/components/todolist/todolist.pas @@ -62,10 +62,10 @@ uses // FCL, RTL Classes, SysUtils, Math, StrUtils, Laz_AVL_Tree, // LCL - LCLProc, LCLType, LclIntf, Forms, Controls, StdCtrls, Dialogs, ComCtrls, + LCLType, LclIntf, Forms, Controls, StdCtrls, Dialogs, ComCtrls, ActnList, XMLPropStorage, // LazUtils - LazUTF8Classes, LazFileUtils, LazFileCache, LazLoggerBase, + LazUTF8Classes, LazFileUtils, LazStringUtils, LazFileCache, LazLoggerBase, LazTracer, // Codetools CodeCache, CodeToolManager, BasicCodeTools, FileProcs, // IDEIntf diff --git a/debugger/debugger.pp b/debugger/debugger.pp index 5923506669..12caceaea6 100644 --- a/debugger/debugger.pp +++ b/debugger/debugger.pp @@ -42,7 +42,8 @@ uses // LCL LCLProc, // LazUtils - Laz2_XMLCfg, LazFileUtils, LazLoggerBase, LazConfigStorage, LazClasses, Maps, + Laz2_XMLCfg, LazFileUtils, LazStringUtils, LazLoggerBase, LazConfigStorage, + LazClasses, Maps, // DebuggerIntf DbgIntfBaseTypes, DbgIntfMiscClasses, DbgIntfDebuggerBase; diff --git a/debugger/frames/debugger_general_options.pas b/debugger/frames/debugger_general_options.pas index 13d2c98808..4fe421a3c3 100644 --- a/debugger/frames/debugger_general_options.pas +++ b/debugger/frames/debugger_general_options.pas @@ -27,9 +27,9 @@ interface uses Classes, SysUtils, TypInfo, // LCL - Forms, Controls, StdCtrls, ExtCtrls, Buttons, Dialogs, LCLProc, + Forms, Controls, StdCtrls, ExtCtrls, Buttons, Dialogs, // LazUtils - FileUtil, LazFileUtils, LazFileCache, + FileUtil, LazFileUtils, LazStringUtils, LazFileCache, // DebuggerIntf DbgIntfDebuggerBase, // IdeIntf diff --git a/ide/initialsetupdlgs.pas b/ide/initialsetupdlgs.pas index c7ea9d936e..5eeea4bd91 100644 --- a/ide/initialsetupdlgs.pas +++ b/ide/initialsetupdlgs.pas @@ -40,19 +40,24 @@ unit InitialSetupDlgs; interface uses - // RTL + FCL + LCL - Classes, SysUtils, - Forms, Controls, Buttons, Dialogs, Graphics, ComCtrls, ExtCtrls, StdCtrls, LCLProc, - pkgglobals, process, - fpmkunit, + // RTL + FCL + Classes, SysUtils, pkgglobals, process, fpmkunit, + // LCL + Forms, Controls, Buttons, Dialogs, Graphics, ComCtrls, ExtCtrls, StdCtrls, // CodeTools FileProcs, CodeToolManager, DefineTemplates, // LazUtils - FileUtil, LazUTF8, LazUTF8Classes, LazFileUtils, LazFileCache, LazLoggerBase, - // Other - MacroDefIntf, GDBMIDebugger, DbgIntfDebuggerBase, IDEDialogs, - TransferMacros, LazarusIDEStrConsts, LazConf, EnvironmentOpts, IDEImagesIntf, - AboutFrm, IDETranslations, BaseBuildManager, InitialSetupProc, FppkgHelper, + FileUtil, LazUTF8, LazUTF8Classes, LazFileUtils, LazStringUtils, LazFileCache, + LazLoggerBase, + // IdeIntf + MacroDefIntf, IDEDialogs, IDEImagesIntf, + // DebuggerIntf + DbgIntfDebuggerBase, + // LazDebuggerGdbmi + GDBMIDebugger, + // IDE + TransferMacros, LazarusIDEStrConsts, LazConf, EnvironmentOpts, + AboutFrm, IDETranslations, BaseBuildManager, InitialSetupProc, {$IF FPC_FULLVERSION>30100} GenerateFppkgConfigurationDlg, {$ENDIF} diff --git a/lcl/lclproc.pas b/lcl/lclproc.pas index 994ad35700..e32cf3e33d 100644 --- a/lcl/lclproc.pas +++ b/lcl/lclproc.pas @@ -285,18 +285,7 @@ procedure DbgSaveData(FileName: String; AData: PChar; ADataSize: PtrUInt); procedure DbgAppendToFile(FileName, S: String); procedure DbgAppendToFileWithoutLn(FileName, S: String); -// some string manipulation functions -function StripLN(const ALine: String): String; -function GetPart(const ASkipTo, AnEnd: String; var ASource: String; - const AnIgnoreCase: Boolean = False; const AnUpdateSource: Boolean = True): String; overload; -function GetPart(const ASkipTo, AnEnd: array of String; var ASource: String; - const AnIgnoreCase: Boolean = False; const AnUpdateSource: Boolean = True): String; overload; -function TextToSingleLine(const AText: string): string; -function SwapCase(Const S: String): String; - // case..of utility functions -function StringCase(const AString: String; const ACase: array of String {; const AIgnoreCase = False, APartial = false: Boolean}): Integer; overload; -function StringCase(const AString: String; const ACase: array of String; const AIgnoreCase, APartial: Boolean): Integer; overload; function ClassCase(const AClass: TClass; const ACase: array of TClass {; const ADescendant: Boolean = True}): Integer; overload; function ClassCase(const AClass: TClass; const ACase: array of TClass; const ADecendant: Boolean): Integer; overload; @@ -2322,193 +2311,6 @@ begin CloseFile(F); end; -function StripLN(const ALine: String): String; -var - idx: Integer; -begin - Result := ALine; - idx := Pos(#10, Result); - if idx = 0 - then begin - idx := Pos(#13, Result); - if idx = 0 then Exit; - end - else begin - if (idx > 1) - and (Result[idx - 1] = #13) - then Dec(idx); - end; - SetLength(Result, idx - 1); -end; - -function GetPart(const ASkipTo, AnEnd: String; var ASource: String; - const AnIgnoreCase, AnUpdateSource: Boolean): String; -begin - Result := GetPart([ASkipTo], [AnEnd], ASource, AnIgnoreCase, AnUpdateSource); -end; - -function GetPart(const ASkipTo, AnEnd: array of String; var ASource: String; - const AnIgnoreCase: Boolean = False; const AnUpdateSource: Boolean = True): String; -var - n, i, idx: Integer; - S, Source, Match: String; - HasEscape: Boolean; -begin - Source := ASource; - - if High(ASkipTo) >= 0 - then begin - idx := 0; - Match := ''; - HasEscape := False; - if AnIgnoreCase - then S := UpperCase(Source) - else S := Source; - for n := Low(ASkipTo) to High(ASkipTo) do - begin - if ASkipTo[n] = '' - then begin - HasEscape := True; - Continue; - end; - if AnIgnoreCase - then i := Pos(UpperCase(ASkipTo[n]), S) - else i := Pos(ASkipTo[n], S); - if i > idx - then begin - idx := i; - Match := ASkipTo[n]; - end; - end; - if (idx = 0) and not HasEscape - then begin - Result := ''; - Exit; - end; - if idx > 0 - then Delete(Source, 1, idx + Length(Match) - 1); - end; - - if AnIgnoreCase - then S := UpperCase(Source) - else S := Source; - idx := MaxInt; - for n := Low(AnEnd) to High(AnEnd) do - begin - if AnEnd[n] = '' then Continue; - if AnIgnoreCase - then i := Pos(UpperCase(AnEnd[n]), S) - else i := Pos(AnEnd[n], S); - if (i > 0) and (i < idx) then idx := i; - end; - - if idx = MaxInt - then begin - Result := Source; - Source := ''; - end - else begin - Result := Copy(Source, 1, idx - 1); - Delete(Source, 1, idx - 1); - end; - - if AnUpdateSource - then ASource := Source; -end; - -{ - Ensures the covenient look of multiline string - when displaying it in the single line - * Replaces CR and LF with spaces - * Removes duplicate spaces -} -function TextToSingleLine(const AText: string): string; -var - str: string; - i, wstart, wlen: Integer; -begin - str := Trim(AText); - wstart := 0; - wlen := 0; - i := 1; - while i < Length(str) - 1 do - begin - if (str[i] in [' ', #13, #10]) then - begin - if (wstart = 0) then - begin - wstart := i; - wlen := 1; - end else - Inc(wlen); - end else - begin - if wstart > 0 then - begin - str[wstart] := ' '; - Delete(str, wstart+1, wlen-1); - Dec(i, wlen-1); - wstart := 0; - end; - end; - Inc(i); - end; - Result := str; -end; - -function SwapCase(Const S: String): String; -// Inverts the character case. Like LowerCase and UpperCase combined. -var - i : Integer; - P : PChar; -begin - Result := S; - if not assigned(pointer(result)) then exit; - UniqueString(Result); - P:=Pchar(pointer(Result)); - for i := 1 to Length(Result) do begin - if (P^ in ['a'..'z']) then - P^ := char(byte(p^) - 32) - else if (P^ in ['A'..'Z']) then - P^ := char(byte(p^) + 32); - Inc(P); - end; -end; - -function StringCase(const AString: String; const ACase: array of String {; const AIgnoreCase = False, APartial = false: Boolean}): Integer; -begin - Result := StringCase(AString, ACase, False, False); -end; - -function StringCase(const AString: String; const ACase: array of String; const AIgnoreCase, APartial: Boolean): Integer; -var - Search, S: String; -begin - if High(ACase) = -1 - then begin - Result := -1; - Exit; - end; - - if AIgnoreCase - then Search := UpperCase(AString) - else Search := AString; - - for Result := Low(ACase) to High(ACase) do - begin - if AIgnoreCase - then S := UpperCase(ACase[Result]) - else S := ACase[Result]; - - if Search = S then Exit; - if not APartial then Continue; - if Length(Search) >= Length(S) then Continue; - if StrLComp(PChar(Search), PChar(S), Length(Search)) = 0 then Exit; - end; - - Result := -1; -end; - function ClassCase(const AClass: TClass; const ACase: array of TClass {; const ADecendant: Boolean = True}): Integer; begin Result := ClassCase(AClass, ACase, True); diff --git a/tools/apiwizz/apiwizard.pp b/tools/apiwizz/apiwizard.pp index 61af8956c0..c66c7a91b1 100644 --- a/tools/apiwizz/apiwizard.pp +++ b/tools/apiwizz/apiwizard.pp @@ -31,8 +31,11 @@ unit APIWizard; interface uses - Classes, SysUtils, Forms, Controls, Dialogs, StdCtrls, ExtCtrls, LCLproc, ComCtrls, - LazFileUtils, LazUTF8, LazUTF8Classes; + Classes, SysUtils, + // LCL + Forms, Controls, Dialogs, StdCtrls, ExtCtrls, LCLproc, ComCtrls, + // LazUtils + LazFileUtils, LazStringUtils, LazUTF8, LazUTF8Classes; type