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

pastojs: fixed concat(a) calling arrayRef

Browse Source 
git-svn-id: trunk@46745 -
(cherry picked from commit 6a0ea119e9)
This commit is contained in:
Mattias Gaertner 2020-09-01 22:01:52 +00:00 committed by Florian Klämpfl
parent 6b9509cbb9
commit ec44fd2dd6
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/pastojs/src/fppas2js.pp
View File

@ -13334,7 +13334,7 @@ begin
{$IFDEF VerbosePas2JS} {$IFDEF VerbosePas2JS}
writeln('TPasToJSConverter.ConvertBuiltInConcatArray Count=',length(El.Params)); writeln('TPasToJSConverter.ConvertBuiltInConcatArray Count=',length(El.Params));
{$ENDIF} {$ENDIF}
Result:=ConvertExpression(Param0,AContext); Result:=CreateArrayRef(El,ConvertExpression(Param0,AContext));
end end
else else
begin begin
@ -17619,6 +17619,8 @@ function TPasToJSConverter.CreateArrayRef(El: TPasElement; ArrayExpr: TJSElement
var var
Call: TJSCallExpression; Call: TJSCallExpression;
begin begin
if ArrayExpr is TJSArrayLiteral then
exit(ArrayExpr);
Call:=CreateCallExpression(El); Call:=CreateCallExpression(El);
Call.Expr:=CreateMemberExpression([GetBIName(pbivnRTL),GetBIName(pbifnArray_Reference)]); Call.Expr:=CreateMemberExpression([GetBIName(pbivnRTL),GetBIName(pbifnArray_Reference)]);
Call.AddArg(ArrayExpr); Call.AddArg(ArrayExpr);

8
packages/pastojs/tests/tcmodules.pas
View File

@ -9878,16 +9878,16 @@ begin
'this.ArrJSValue = [];', 'this.ArrJSValue = [];',
'']), '']),
LinesToStr([ // $mod.$main LinesToStr([ // $mod.$main
'$mod.ArrInt = $mod.ArrInt;', '$mod.ArrInt = rtl.arrayRef($mod.ArrInt);',
'$mod.ArrInt = rtl.arrayConcatN($mod.ArrInt, $mod.ArrInt);', '$mod.ArrInt = rtl.arrayConcatN($mod.ArrInt, $mod.ArrInt);',
'$mod.ArrInt = rtl.arrayConcatN($mod.ArrInt, $mod.ArrInt, $mod.ArrInt);', '$mod.ArrInt = rtl.arrayConcatN($mod.ArrInt, $mod.ArrInt, $mod.ArrInt);',
'$mod.ArrRec = $mod.ArrRec;', '$mod.ArrRec = rtl.arrayRef($mod.ArrRec);',
'$mod.ArrRec = rtl.arrayConcat($mod.TRec, $mod.ArrRec, $mod.ArrRec);', '$mod.ArrRec = rtl.arrayConcat($mod.TRec, $mod.ArrRec, $mod.ArrRec);',
'$mod.ArrRec = rtl.arrayConcat($mod.TRec, $mod.ArrRec, $mod.ArrRec, $mod.ArrRec);', '$mod.ArrRec = rtl.arrayConcat($mod.TRec, $mod.ArrRec, $mod.ArrRec, $mod.ArrRec);',
'$mod.ArrSet = $mod.ArrSet;', '$mod.ArrSet = rtl.arrayRef($mod.ArrSet);',
'$mod.ArrSet = rtl.arrayConcat("refSet", $mod.ArrSet, $mod.ArrSet);', '$mod.ArrSet = rtl.arrayConcat("refSet", $mod.ArrSet, $mod.ArrSet);',
'$mod.ArrSet = rtl.arrayConcat("refSet", $mod.ArrSet, $mod.ArrSet, $mod.ArrSet);', '$mod.ArrSet = rtl.arrayConcat("refSet", $mod.ArrSet, $mod.ArrSet, $mod.ArrSet);',
'$mod.ArrJSValue = $mod.ArrJSValue;', '$mod.ArrJSValue = rtl.arrayRef($mod.ArrJSValue);',
'$mod.ArrJSValue = rtl.arrayConcatN($mod.ArrJSValue, $mod.ArrJSValue);', '$mod.ArrJSValue = rtl.arrayConcatN($mod.ArrJSValue, $mod.ArrJSValue);',
'$mod.ArrJSValue = rtl.arrayConcatN($mod.ArrJSValue, $mod.ArrJSValue, $mod.ArrJSValue);', '$mod.ArrJSValue = rtl.arrayConcatN($mod.ArrJSValue, $mod.ArrJSValue, $mod.ArrJSValue);',
'$mod.ArrInt = rtl.arrayConcatN([1], $mod.ArrInt);', '$mod.ArrInt = rtl.arrayConcatN([1], $mod.ArrInt);',

2
utils/pas2js/dist/rtl.js vendored
View File

@ -1004,7 +1004,7 @@ var rtl = {
var src = arguments[i]; var src = arguments[i];
if (src === null) continue; if (src === null) continue;
if (a===null){ if (a===null){
a=src; // Note: concat(a) does not clone a=rtl.arrayRef(src); // Note: concat(a) does not clone
} else { } else {
a=a.concat(src); a=a.concat(src);
} }