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

* Simplifications and slight enhancements, as suggested by AlexeyT (bug ID 33981)

Browse Source 
git-svn-id: trunk@39450 -
This commit is contained in:
michael 2018-07-14 08:26:46 +00:00
parent f6867cbd63
commit b417ab799d
1 changed files with 16 additions and 13 deletions

29
packages/fcl-base/src/inifiles.pp
View File

@ -282,9 +282,7 @@ end;
function IsComment(const AString: string): boolean;
begin
Result := False;
if AString > '' then
Result := (Copy(AString, 1, 1) = Comment);
Result:=(Length(aString)>0) and (Copy(AString, 1, 1) = Comment);
end;
{ TStringHash }
@ -1005,7 +1003,7 @@ const
Utf8Bom = #$EF#$BB#$BF; { Die einzelnen BOM Typen }
var
i,j: integer;
i,j,sLen: integer;
sLine, sIdent, sValue: string;
oSection: TIniFileSection;
@ -1041,14 +1039,19 @@ begin
FSectionList.Clear;
if EscapeLineFeeds then
RemoveBackslashes;
if (AStrings.Count > 0) and (copy(AStrings.Strings[0],1,Length(Utf8Bom)) = Utf8Bom) then
begin
FBOM := Utf8Bom;
AStrings.Strings[0] := copy(AStrings.Strings[0],Length(Utf8Bom)+1,Length(AStrings.Strings[0]));
end;
if (AStrings.Count > 0) then
begin
sLine:=AStrings[0];
if (copy(sLine,1,Length(Utf8Bom)) = Utf8Bom) then
begin
FBOM := Utf8Bom;
AStrings[0]:=copy(sLine,Length(Utf8Bom)+1,Length(SLine));
end;
end;
for i := 0 to AStrings.Count-1 do begin
sLine := Trim(AStrings[i]);
if sLine > '' then
sLen:=Length(sLine);
if (sLen>0) then
begin
if IsComment(sLine) and (oSection = nil) then
begin
@ -1060,10 +1063,10 @@ begin
end;
continue;
end;
if (Copy(sLine, 1, 1) = Brackets[0]) and (Copy(sLine, length(sLine), 1) = Brackets[1]) then
if (sLine[1]=Brackets[0]) and (sLine[sLen]= Brackets[1]) then
begin
// regular section
oSection := TIniFileSection.Create(Copy(sLine, 2, Length(sLine) - 2));
oSection := TIniFileSection.Create(Copy(sLine, 2, sLen - 2));
FSectionList.Add(oSection);
end
else if oSection <> nil then
@ -1089,7 +1092,7 @@ begin
begin
AddKey:=True;
sIdent:=Trim(Copy(sLine, 1, j - 1));
sValue:=Trim(Copy(sLine, j + 1, Length(sLine) - j));
sValue:=Trim(Copy(sLine, j + 1, sLen - j));
end;
end;
if AddKey then