paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-11-03 08:09:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Changed String.Split to conform to behaviour in Delphi Rio (bug ID 35669)

Browse Source 
git-svn-id: trunk@42168 -
This commit is contained in:
michael 2019-06-03 06:27:37 +00:00
parent eab079c7bd
commit de30f7852d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1097,34 +1097,34 @@ end;
function TStringHelper.Split(const Separators: array of Char): TStringArray;
begin
Result:=SPlit(Separators,#0,#0,Length,TStringSplitOptions.None);
Result:=Split(Separators,#0,#0,Length+1,TStringSplitOptions.None);
end;
function TStringHelper.Split(const Separators: array of Char; ACount: SizeInt
): TStringArray;
begin
Result:=SPlit(Separators,#0,#0,ACount,TStringSplitOptions.None);
Result:=Split(Separators,#0,#0,ACount,TStringSplitOptions.None);
end;
function TStringHelper.Split(const Separators: array of Char;
Options: TStringSplitOptions): TStringArray;
begin
Result:=SPlit(Separators,Length,Options);
Result:=Split(Separators,Length+1,Options);
end;
function TStringHelper.Split(const Separators: array of Char; ACount: SizeInt;
Options: TStringSplitOptions): TStringArray;
begin
Result:=SPlit(Separators,#0,#0,ACount,Options);
Result:=Split(Separators,#0,#0,ACount,Options);
end;
function TStringHelper.Split(const Separators: array of string): TStringArray;
begin
Result:=Split(Separators,Length);
Result:=Split(Separators,Length+1);
end;
@ -1138,7 +1138,7 @@ end;
function TStringHelper.Split(const Separators: array of string;
Options: TStringSplitOptions): TStringArray;
begin
Result:=Split(Separators,Length,Options);
Result:=Split(Separators,Length+1,Options);
end;
@ -1166,7 +1166,7 @@ end;
function TStringHelper.Split(const Separators: array of Char; AQuoteStart,
AQuoteEnd: Char; Options: TStringSplitOptions): TStringArray;
begin
Result:=Split(Separators,AQuoteStart,AQuoteEnd,Length,Options);
Result:=Split(Separators,AQuoteStart,AQuoteEnd,Length+1,Options);
end;
@ -1211,7 +1211,7 @@ begin
While (Sep<>-1) and ((ACount=0) or (Len<ACount)) do
begin
T:=SubString(LastSep,Sep-LastSep);
// Writeln('Examining >',T,'< at pos,',LastSep,' till pos ',Sep);
// Writeln('Examining >',T,'< at pos ',LastSep,', till pos ',Sep);
If (T<>'') or (not (TStringSplitOptions.ExcludeEmpty=Options)) then
begin
MaybeGrow(Len);
@ -1221,7 +1221,7 @@ begin
LastSep:=Sep+1;
Sep:=NextSep(LastSep);
end;
if (LastSep<Length) and ((ACount=0) or (Len<ACount)) then
if (LastSep<=Length) and ((ACount=0) or (Len<ACount)) then
begin
T:=SubString(LastSep);
// Writeln('Examining >',T,'< at pos,',LastSep,' till pos ',Sep);
@ -1243,14 +1243,14 @@ end;
function TStringHelper.Split(const Separators: array of string; AQuoteStart,
AQuoteEnd: Char): TStringArray;
begin
Result:=SPlit(Separators,AQuoteStart,AQuoteEnd,Length,TStringSplitOptions.None);
Result:=SPlit(Separators,AQuoteStart,AQuoteEnd,Length+1,TStringSplitOptions.None);
end;
function TStringHelper.Split(const Separators: array of string; AQuoteStart,
AQuoteEnd: Char; Options: TStringSplitOptions): TStringArray;
begin
Result:=SPlit(Separators,AQuoteStart,AQuoteEnd,Length,Options);
Result:=SPlit(Separators,AQuoteStart,AQuoteEnd,Length+1,Options);
end;
@ -1304,7 +1304,7 @@ begin
LastSep:=Sep+System.Length(Separators[Match]);
Sep:=NextSep(LastSep,Match);
end;
if (LastSep<Length) and ((ACount=0) or (Len<ACount)) then
if (LastSep<=Length) and ((ACount=0) or (Len<ACount)) then
begin
T:=SubString(LastSep);
// Writeln('Examining >',T,'< at pos,',LastSep,' till pos ',Sep);