paweld/pas2js
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/pas2js.git synced 2025-04-05 15:57:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

fcl-js: fixed writing multi add

Browse Source
This commit is contained in:
mattias 2021-03-24 19:50:31 +00:00
parent c30c3d7fba
commit f8c8b1f0a2
2 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/packages/fcl-js/src/jswriter.pp
View File

@ -1430,7 +1430,6 @@ begin
or (ElC=TJSMultiplicativeExpressionMul)) then
begin
// handle left handed multi add without stack
FSkipRoundBrackets:=true;
SetLength(Binaries{%H-},8);
BinariesCnt:=0;
while Left is TJSBinaryExpression do
@ -1443,6 +1442,7 @@ begin
inc(BinariesCnt);
Left:=SubBin.A;
end;
WriteJS(Left);
Writer.CurElement:=El;

33
compiler/packages/pastojs/tests/tcmodules.pas
View File

@ -401,6 +401,7 @@ type
Procedure TestLoHiDelphiMode;
Procedure TestAssignments;
Procedure TestArithmeticOperators1;
Procedure TestMultiAdd;
Procedure TestLogicalOperators;
Procedure TestBitwiseOperators;
Procedure TestBitwiseOperatorsLongword;
@ -3261,6 +3262,38 @@ begin
]));
end;
procedure TTestModule.TestMultiAdd;
begin
StartProgram(false);
Add([
'function TryEncodeDate(Year, Month, Day: Word): Boolean;',
'var Date: double;',
'begin',
' Result:=(Year>0) and (Year<10000) and',
' (Month >= 1) and (Month<=12) and',
' (Day>0) and (Day<=31);',
' Date := (146097*Year) SHR 2 + (1461*Year) SHR 2 + (153*LongWord(Month)+2) DIV 5 + LongWord(Day);',
'end;',
'var s: string;',
'begin',
' s:=''a''+''b''+''c''+''d'';']);
ConvertProgram;
CheckSource('TestMultiAdd',
LinesToStr([ // statements
'this.TryEncodeDate = function (Year, Month, Day) {',
' var Result = false;',
' var date = 0.0;',
' Result = (Year > 0) && (Year < 10000) && (Month >= 1) && (Month <= 12) && (Day > 0) && (Day <= 31);',
' date = ((146097 * Year) >>> 2) + ((1461 * Year) >>> 2) + rtl.trunc(((153 * Month) + 2) / 5) + Day;',
' return Result;',
'};',
'this.s = "";',
'']),
LinesToStr([ // this.$main
'$mod.s = "a" + "b" + "c" + "d";',
'']));
end;
procedure TTestModule.TestLogicalOperators;
begin
StartProgram(false);