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

* Patch from Mattias Gaertner: when an if-statement has an else always use {} for the BTrue

Browse Source 
git-svn-id: trunk@35651 -
This commit is contained in:
michael 2017-03-24 12:09:38 +00:00
parent 9d6ff959f4
commit 510352e121
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1015,7 +1015,7 @@ end;
procedure TJSWriter.WriteIfStatement(El: TJSIfStatement);
var
BTrueEmpty, C: Boolean;
HasBTrue, C, HasBFalse, BTrueNeedBrackets: Boolean;
begin
C:=woCompact in Options;
Write('if (');
@ -1025,12 +1025,34 @@ begin
Write(')');
If Not C then
Write(' ');
BTrueEmpty:=IsEmptyStatement(El.BTrue);
if not BTrueEmpty then
WriteJS(El.BTrue);
if not IsEmptyStatement(El.BFalse) then
HasBTrue:=not IsEmptyStatement(El.BTrue);
HasBFalse:=not IsEmptyStatement(El.BFalse);
if HasBTrue then
begin
if BTrueEmpty then
// Note: the 'else' needs {} in front
BTrueNeedBrackets:=HasBFalse and not (El.BTrue is TJSStatementList)
and not (El.BTrue is TJSEmptyBlockStatement);
if BTrueNeedBrackets then
if C then
Write('{')
else
begin
Writeln('{');
Indent;
end;
WriteJS(El.BTrue);
if BTrueNeedBrackets then
if C then
Write('}')
else
begin
Undent;
Writeln('}');
end;
end;
if HasBFalse then
begin
if not HasBTrue then
begin
if C then
Write('{}')