diff --git a/rtl/objpas/sysutils/syshelp.inc b/rtl/objpas/sysutils/syshelp.inc index afdd2dd886..07c29f3813 100644 --- a/rtl/objpas/sysutils/syshelp.inc +++ b/rtl/objpas/sysutils/syshelp.inc @@ -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',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',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',T,'< at pos,',LastSep,' till pos ',Sep);