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

pastojs: static array: multi dim: const init

Browse Source 
git-svn-id: trunk@37994 -
This commit is contained in:
Mattias Gaertner 2018-01-18 14:36:19 +00:00
parent 700b2fdb03
commit 0a30e6ef26
4 changed files with 50 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
packages/fcl-js/src/jstree.pp
View File

@ -211,11 +211,11 @@ Type
TJSArrayLiteralElement = Class(TCollectionItem)
private
FExpr: TJSelement;
FFindex: Integer;
FElementIndex: Integer;
Public
Destructor Destroy; override;
Property Expr : TJSElement Read FExpr Write FExpr;
Property ElementIndex : Integer Read FFindex Write FFIndex;
Property ElementIndex : Integer Read FElementIndex Write FElementIndex;
end;
{ TJSArrayLiteralElements - Elements property of TJSArrayLiteral }
@ -1567,8 +1567,12 @@ begin
end;
procedure TJSArrayLiteral.AddElement(El: TJSElement);
var
ArrEl: TJSArrayLiteralElement;
begin
Elements.AddElement.Expr:=El;
ArrEl:=Elements.AddElement;
ArrEl.ElementIndex:=Elements.Count-1;
ArrEl.Expr:=El;
end;
destructor TJSArrayLiteral.Destroy;

1
packages/fcl-passrc/tests/tcresolver.pas
View File

@ -10517,6 +10517,7 @@ begin
'const',
' a = low(TIntArr)+high(TIntArr);',
' b: array[1..3] of longint = (10,11,12);',
' c: array[boolean] of TIntArr = ((21,22,23),(31,32,33));',
'begin']);
ParseProgram;
CheckResolverUnexpectedHints;

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

@ -7709,26 +7709,20 @@ end;
function TPasToJSConverter.ConvertArrayValues(El: TArrayValues;
AContext: TConvertContext): TJSElement;
Var
R : TJSArrayLiteral;
ArrLit : TJSArrayLiteral;
I : Integer;
rel : TJSArrayLiteralElement;
begin
R:=TJSArrayLiteral(CreateElement(TJSObjectLiteral,El));
ArrLit:=TJSArrayLiteral(CreateElement(TJSArrayLiteral,El));
For I:=0 to Length(El.Values)-1 do
begin
Rel:=R.Elements.AddElement;
Rel.ElementIndex:=i;
Rel.Expr:=ConvertElement(El.Values[i],AContext);
ArrLit.AddElement(ConvertElement(El.Values[i],AContext));
end;
Result:=R;
Result:=ArrLit;
end;
function TPasToJSConverter.ConvertExpression(El: TPasExpr;
AContext: TConvertContext): TJSElement;
begin
{$IFDEF VerbosePas2JS}
writeln('TPasToJSConverter.ConvertExpression El=',GetObjName(El),' Context=',GetObjName(AContext));
@ -7752,6 +7746,8 @@ begin
Result:=ConvertParamsExpression(TParamsExpr(El),AContext)
else if (El.ClassType=TRecordValues) then
Result:=ConvertRecordValues(TRecordValues(El),AContext)
else if (El.ClassType=TArrayValues) then
Result:=ConvertArrayValues(TArrayValues(El),AContext)
else
RaiseNotSupported(El,AContext,20161024191314);
end;

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

@ -5769,51 +5769,49 @@ end;
procedure TTestModule.TestArray_StaticMultiDim;
begin
exit;
StartProgram(false);
Add('type');
Add(' TArrayInt = array[1..3] of longint;');
Add(' TArrayArrayInt = array[5..6] of TArrayInt;');
Add('var');
Add(' Arr: TArrayInt;');
Add(' Arr2: TArrayArrayInt;');
Add(' i: longint;');
Add('begin');
Add(' i:=low(arr);');
Add(' i:=low(arr2);');
Add(' i:=low(arr2[5]);');
Add(' i:=high(arr);');
Add(' i:=high(arr2);');
Add(' i:=high(arr2[6]);');
Add(' arr2[3]:=arr;');
Add(' arr2[4][5]:=i;');
Add(' i:=arr2[6][7];');
Add(' arr2[8,9]:=i;');
Add(' i:=arr2[10,11];');
Add(' SetLength(arr2,14);');
Add(' SetLength(arr2[15],16);');
Add([
'type',
' TArrayInt = array[1..3] of longint;',
' TArrayArrayInt = array[5..6] of TArrayInt;',
'var',
' Arr: TArrayInt;',
' Arr2: TArrayArrayInt;',
' Arr3: array[boolean] of TArrayInt = ((11,12,13),(21,22,23));',
' i: longint;',
'begin',
' i:=low(arr);',
' i:=low(arr2);',
' i:=low(arr2[5]);',
' i:=high(arr);',
' i:=high(arr2);',
' i:=high(arr2[6]);',
' arr2[5]:=arr;',
' arr2[6][2]:=i;',
' i:=arr2[6][3];',
' arr2[6,3]:=i;',
' i:=arr2[5,2];',
'']);
ConvertProgram;
CheckSource('TestArray_StaticMultiDim',
LinesToStr([ // statements
'this.Arr = [];',
'this.Arr2 = [];',
'this.Arr = rtl.arraySetLength(null, 0, 3);',
'this.Arr2 = rtl.arraySetLength(null, 0, 2, 3);',
'this.Arr3 = [[11, 12, 13], [21, 22, 23]];',
'this.i = 0;'
]),
LinesToStr([ // $mod.$main
'$mod.Arr2 = [];',
'if (rtl.length($mod.Arr2) === 0) ;',
'if (rtl.length($mod.Arr2) === 0) ;',
'$mod.i = 0;',
'$mod.i = 0;',
'$mod.i = rtl.length($mod.Arr2) - 1;',
'$mod.i = rtl.length($mod.Arr2[2]) - 1;',
'$mod.Arr2[3] = $mod.Arr;',
'$mod.Arr2[4][5] = $mod.i;',
'$mod.i = $mod.Arr2[6][7];',
'$mod.Arr2[8][9] = $mod.i;',
'$mod.i = $mod.Arr2[10][11];',
'$mod.Arr2 = rtl.arraySetLength($mod.Arr2, [], 14);',
'$mod.Arr2[15] = rtl.arraySetLength($mod.Arr2[15], 0, 16);',
'$mod.i = 1;',
'$mod.i = 5;',
'$mod.i = 1;',
'$mod.i = 3;',
'$mod.i = 6;',
'$mod.i = 3;',
'$mod.Arr2[0] = $mod.Arr;',
'$mod.Arr2[1][1] = $mod.i;',
'$mod.i = $mod.Arr2[1][2];',
'$mod.Arr2[1][2] = $mod.i;',
'$mod.i = $mod.Arr2[0][1];',
'']));
end;