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

fcl-js: quote quoted object literal names

Browse Source 
git-svn-id: trunk@41024 -
This commit is contained in:
Mattias Gaertner 2019-01-24 12:19:55 +00:00
parent 92b3fc7c78
commit 766f4cfcb0
1 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
packages/fcl-js/src/jswriter.pp
View File

@ -247,6 +247,7 @@ Type
{$ifdef FPC_HAS_CPSTRING}
Function UTF16ToUTF8(const S: UnicodeString): string;
{$endif}
Function QuoteJSString(const S: TJSString; Quote: TJSChar = #0): TJSString;
implementation
@ -271,6 +272,36 @@ begin
// conversion magic
SetCodePage(RawByteString(Result), CP_ACP, False);
end;
function QuoteJSString(const S: TJSString; Quote: TJSChar): TJSString;
var
i, j, Count: Integer;
begin
if Quote=#0 then
begin
if Pos('"',S)>0 then
Quote:=''''
else
Quote:='"';
end;
Result := '' + Quote;
Count := length(S);
i := 0;
j := 0;
while i < Count do
begin
inc(i);
if S[i] = Quote then
begin
Result := Result + copy(S, 1 + j, i - j) + Quote;
j := i;
end;
end;
if i <> j then
Result := Result + copy(S, 1 + j, i - j);
Result := Result + Quote;
end;
{$endif}
{ TBufferWriter }
@ -1023,14 +1054,11 @@ end;
procedure TJSWriter.WriteObjectLiteral(El: TJSObjectLiteral);
Var
i,C : Integer;
QE,WC : Boolean;
S : TJSString;
Prop: TJSObjectLiteralElement;
begin
C:=El.Elements.Count-1;
QE:=(woQuoteElementNames in Options);
@ -1053,7 +1081,14 @@ begin
Writer.CurElement:=Prop.Expr;
S:=Prop.Name;
if QE or not IsValidJSIdentifier(S) then
S:='"'+S+'"';
begin
if (length(S)>1)
and (((S[1]='"') and (S[length(S)]='"'))
or ((S[1]='''') and (S[length(S)]=''''))) then
// already quoted
else
S:=QuoteJSString(s);
end;
Write(S+': ');
Indent;
FSkipRoundBrackets:=true;