paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-13 18:24:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

- remove unused trimbspace

Browse Source 
+ added ansistring variants for some helpers

git-svn-id: trunk@47260 -
This commit is contained in:
florian 2020-10-30 22:10:56 +00:00
parent f45bcd615e
commit 3d049a3309
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
compiler/cutils.pas
View File

@ -92,10 +92,11 @@ interface
function lower(const s : ansistring) : ansistring; function lower(const s : ansistring) : ansistring;
function rpos(const needle: char; const haystack: shortstring): longint; overload; function rpos(const needle: char; const haystack: shortstring): longint; overload;
function rpos(const needle: shortstring; const haystack: shortstring): longint; overload; function rpos(const needle: shortstring; const haystack: shortstring): longint; overload;
function trimbspace(const s:string):string;
function trimspace(const s:string):string; function trimspace(const s:string):string;
function trimspace(const s:AnsiString):AnsiString;
function space (b : longint): string; function space (b : longint): string;
function PadSpace(const s:string;len:longint):string; function PadSpace(const s:string;len:longint):string;
function PadSpace(const s:AnsiString;len:longint):AnsiString;
function GetToken(var s:string;endchar:char):string; function GetToken(var s:string;endchar:char):string;
procedure uppervar(var s : string); procedure uppervar(var s : string);
function realtostr(e:extended):string;{$ifdef USEINLINE}inline;{$endif} function realtostr(e:extended):string;{$ifdef USEINLINE}inline;{$endif}
@ -769,23 +770,24 @@ implementation
end; end;
function trimbspace(const s:string):string; function trimspace(const s:string):string;
{ {
return s with all leading spaces and tabs removed return s with all leading and ending spaces and tabs removed
} }
var var
i,j : longint; i,j : longint;
begin begin
j:=1;
i:=length(s); i:=length(s);
while (i>0) and (s[i] in [#9,' ']) do
dec(i);
j:=1;
while (j<i) and (s[j] in [#9,' ']) do while (j<i) and (s[j] in [#9,' ']) do
inc(j); inc(j);
trimbspace:=Copy(s,j,i-j+1); trimspace:=Copy(s,j,i-j+1);
end; end;
function trimspace(const s:AnsiString):AnsiString;
function trimspace(const s:string):string;
{ {
return s with all leading and ending spaces and tabs removed return s with all leading and ending spaces and tabs removed
} }
@ -825,6 +827,18 @@ implementation
end; end;
function PadSpace(const s:AnsiString;len:longint):AnsiString;
{
return s with spaces add to the end
}
begin
if length(s)<len then
PadSpace:=s+Space(len-length(s))
else
PadSpace:=s;
end;
function GetToken(var s:string;endchar:char):string; function GetToken(var s:string;endchar:char):string;
var var
i : longint; i : longint;