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

Support for quotes inside Values

Browse Source 
git-svn-id: trunk@28925 -
This commit is contained in:
pierre 2014-10-24 23:18:38 +00:00
parent 8e5835a3bd
commit d80154d438
1 changed files with 58 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
ide/wini.pas
View File

@ -123,13 +123,40 @@ end;
function TINIEntry.GetText: string; function TINIEntry.GetText: string;
var S,CoS: string; var S,CoS: string;
delimiter : char;
i : longint;
begin begin
if Text=nil then if Text=nil then
begin begin
CoS:=GetComment; CoS:=GetComment;
S:=GetTag+'='+GetValue; S:=GetTag+'='+GetValue;
if Trim(S)='=' then S:=CoS else if Trim(S)='=' then S:=CoS else
if CoS<>'' then S:=S+' '+CommentChar+' '+CoS; if CoS<>'' then
begin
{ if Value contains CommentChar, we need to add delimiters }
if pos(CommentChar,S)>0 then
begin
delimiter:=#0;
while delimiter < #255 do
begin
if (delimiter in ValidStrDelimiters) and
(pos(delimiter,S)=0) then
break;
delimiter:=succ(delimiter);
end;
if delimiter=#255 then
delimiter:='"';
{ we use \", but we also need to escape \ itself }
for i:=length(s) downto 1 do
if (s[i]=delimiter) then
s:=copy(s,1,i-1)+'\'+delimiter+copy(s,i+1,length(s))
else if (s[i]='\') then
s:=copy(s,1,i-1)+'\\'+copy(s,i+1,length(s));
s:=delimiter+s+delimiter;
end;
S:=S+' '+CommentChar+' '+CoS;
end
end end
else S:=Text^; else S:=Text^;
GetText:=S; GetText:=S;
@ -176,7 +203,8 @@ var S,ValueS: string;
begin begin
S:=GetText; Delimiter:=#0; S:=GetText; Delimiter:=#0;
P:=Pos('=',S); P2:=Pos(CommentChar,S); P:=Pos('=',S); P2:=Pos(CommentChar,S);
if (P2<>0) and (P2<P) then P:=0; if (P2<>0) and (P2<P) then
P:=0;
if P<>0 then if P<>0 then
begin begin
Tag:=NewStr(copy(S,1,P-1)); Tag:=NewStr(copy(S,1,P-1));
@ -186,15 +214,38 @@ begin
while (P2<=length(S)) do while (P2<=length(S)) do
begin begin
C:=S[P2]; C:=S[P2];
if (P2=StartP) and (C in ValidStrDelimiters) then begin Delimiter:=C; InString:=true; end else if (P2=StartP) and (C in ValidStrDelimiters) then
if C=Delimiter then InString:=not InString else begin
if (C=CommentChar) and (InString=false) then Break else Delimiter:=C;
InString:=true;
end
{ if Value is delimited with ' or ", handle escaping }
else if (Delimiter<>#0) and (C='\') and (P2<length(S)) then
begin
inc(P2);
C:=S[P2];
ValueS:=ValueS+C;
end
else if C=Delimiter then
InString:=not InString
else if (C=CommentChar) and (InString=false) then
Break
else
ValueS:=ValueS+C; ValueS:=ValueS+C;
Inc(P2); Inc(P2);
end; end;
Value:=NewStr(Trim(ValueS)); Value:=NewStr(Trim(ValueS));
Comment:=NewStr(copy(S,P2+1,High(S))); Comment:=NewStr(copy(S,P2+1,High(S)));
end else { dispose raw text as special treatment is needed for
write }
if assigned(Comment) and assigned(Text) and
(delimiter<>#0) then
begin
DisposeStr(Text);
Text:=nil;
end;
end
else
begin begin
Tag:=nil; Tag:=nil;
TagHash:=0; TagHash:=0;