paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-08 17:48:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Patch by Rika to have a char specific TStringHelper.replace. Probably faster with low number of char matches. closes #39707

Browse Source 
* also raise rangeerror for startindex<0 in previous committed join() patch.
This commit is contained in:
marcoonthegit 2022-08-20 16:16:33 +02:00
parent d6e8375e64
commit 9ad1995c6d
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
rtl/objpas/sysutils/syshelp.inc
View File

@ -386,7 +386,7 @@ begin
CountLim:=VLen-StartIndex;
if ACount>CountLim then
ACount:=CountLim;
If (ACount<0) or (StartIndex>VLen) then
If (ACount<0) or (StartIndex>VLen) or (StartIndex<0) then
raise ERangeError.Create(SRangeError);
if ACount=1 then
exit(Values[StartIndex]);
@ -1114,8 +1114,38 @@ end;
function TStringHelper.Replace(OldChar: Char; NewChar: Char;
ReplaceFlags: TReplaceFlags): string;
var
Sp,Se,Rp : PChar;
Ofs : SizeInt;
begin
Result:=StringReplace(Self,OldChar,NewChar,ReplaceFlags);
if rfIgnoreCase in ReplaceFlags then
exit(StringReplace(Self,OldChar,NewChar,ReplaceFlags));
Sp:=PChar(Pointer(Self));
Se:=Sp+System.Length(Self);
Ofs:=IndexChar(Sp^,Se-Sp,OldChar);
if Ofs<0 then
exit(Self);
SetLength(Result,Se-Sp);
Rp:=PChar(Pointer(Result));
repeat
Move(Sp^,Rp^,Ofs*sizeof(Char));
Sp:=Sp+Ofs+1;
Rp[Ofs]:=NewChar;
Rp:=Rp+Ofs+1;
if not (rfReplaceAll in ReplaceFlags) then
break;
{ This loop can be removed entirely, but greatly speeds up replacing streaks of characters. }
while (Sp<Se) and (Sp^=OldChar) do
begin
Rp^:=NewChar;
Sp:=Sp+1;
Rp:=Rp+1;
end;
Ofs:=IndexChar(Sp^,Se-Sp,OldChar);
until Ofs<0;
Move(Sp^,Rp^,(Se-Sp)*sizeof(Char));
end;