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

* Merging revisions r43414 from trunk:

Browse Source 
------------------------------------------------------------------------
    r43414 | michael | 2019-11-08 09:36:31 +0100 (Fri, 08 Nov 2019) | 1 line
    
    * Reduce use of Length(aValue) in setdelimitedtext
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43742 -
This commit is contained in:
michael 2019-12-23 13:37:46 +00:00
parent c99c6a45c2
commit 32b9d91358
1 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
rtl/objpas/classes/stringl.inc
View File

@ -503,8 +503,11 @@ end;
Procedure TStrings.SetDelimitedText(const AValue: string);
var i,j: SizeInt;
aNotFirst:boolean;
var
len,i,j: SizeInt;
aNotFirst:boolean;
begin
CheckSpecialChars;
BeginUpdate;
@ -520,21 +523,23 @@ begin
}
try
Clear;
len:=length(AValue);
If StrictDelimiter then
begin
while i<=length(AValue) do begin
while i<=Len do begin
// skip delimiter
if aNotFirst and (i<=length(AValue)) and (AValue[i]=FDelimiter) then inc(i);
if aNotFirst and (i<=len) and (AValue[i]=FDelimiter) then
inc(i);
// read next string
if i<=length(AValue) then begin
if i<=len then begin
if AValue[i]=FQuoteChar then begin
// next string is quoted
j:=i+1;
while (j<=length(AValue)) and
while (j<=len) and
( (AValue[j]<>FQuoteChar) or
( (j+1<=length(AValue)) and (AValue[j+1]=FQuoteChar) ) ) do begin
if (j<=length(AValue)) and (AValue[j]=FQuoteChar) then inc(j,2)
( (j+1<=len) and (AValue[j+1]=FQuoteChar) ) ) do begin
if (j<=len) and (AValue[j]=FQuoteChar) then inc(j,2)
else inc(j);
end;
// j is position of closing quote
@ -544,7 +549,7 @@ begin
end else begin
// next string is not quoted; read until delimiter
j:=i;
while (j<=length(AValue)) and
while (j<=len) and
(AValue[j]<>FDelimiter) do inc(j);
Add( Copy(AValue,i,j-i));
i:=j;
@ -558,22 +563,22 @@ begin
end
else
begin
while i<=length(AValue) do begin
while i<=len do begin
// skip delimiter
if aNotFirst and (i<=length(AValue)) and (AValue[i]=FDelimiter) then inc(i);
if aNotFirst and (i<=len) and (AValue[i]=FDelimiter) then inc(i);
// skip spaces
while (i<=length(AValue)) and (Ord(AValue[i])<=Ord(' ')) do inc(i);
while (i<=len) and (Ord(AValue[i])<=Ord(' ')) do inc(i);
// read next string
if i<=length(AValue) then begin
if i<=len then begin
if AValue[i]=FQuoteChar then begin
// next string is quoted
j:=i+1;
while (j<=length(AValue)) and
while (j<=len) and
( (AValue[j]<>FQuoteChar) or
( (j+1<=length(AValue)) and (AValue[j+1]=FQuoteChar) ) ) do begin
if (j<=length(AValue)) and (AValue[j]=FQuoteChar) then inc(j,2)
( (j+1<=len) and (AValue[j+1]=FQuoteChar) ) ) do begin
if (j<=len) and (AValue[j]=FQuoteChar) then inc(j,2)
else inc(j);
end;
// j is position of closing quote
@ -583,7 +588,7 @@ begin
end else begin
// next string is not quoted; read until control character/space/delimiter
j:=i;
while (j<=length(AValue)) and
while (j<=len) and
(Ord(AValue[j])>Ord(' ')) and
(AValue[j]<>FDelimiter) do inc(j);
Add( Copy(AValue,i,j-i));
@ -594,7 +599,7 @@ begin
end;
// skip spaces
while (i<=length(AValue)) and (Ord(AValue[i])<=Ord(' ')) do inc(i);
while (i<=len) and (Ord(AValue[i])<=Ord(' ')) do inc(i);
aNotFirst:=true;
end;