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

pastojs: fixed arraySetLength shrink

Browse Source 
git-svn-id: trunk@46272 -
This commit is contained in:
Mattias Gaertner 2020-08-05 19:53:11 +00:00
parent ec10ee8218
commit 68a3e33cac
1 changed files with 38 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -916,44 +916,51 @@ var rtl = {
srclen = 0; srclen = 0;
oldlen = a.length; oldlen = a.length;
} }
a.length = stack[depth].dim; lastlen = stack[depth].dim;
a.length = lastlen;
if (depth>0){ if (depth>0){
item.a[item.i]=a; item.a[item.i]=a;
item.i++; item.i++;
if ((lastlen===0) && (item.i<item.a.length)) continue;
} }
if (depth<dimmax){ if (lastlen>0){
item = stack[depth]; if (depth<dimmax){
item.a = a; item = stack[depth];
item.i = 0; item.a = a;
item.src = src; item.i = 0;
depth++; item.src = src;
} else { depth++;
if (rtl.isArray(defaultvalue)){ continue;
// array of dyn array
for (var i=0; i<srclen; i++) a[i]=src[i];
for (var i=oldlen; i<lastlen; i++) a[i]=[];
} else if (rtl.isObject(defaultvalue)) {
if (rtl.isTRecord(defaultvalue)){
// array of record
for (var i=0; i<srclen; i++) a[i]=defaultvalue.$clone(src[i]);
for (var i=oldlen; i<lastlen; i++) a[i]=defaultvalue.$new();
} else {
// array of set
for (var i=0; i<srclen; i++) a[i]=rtl.refSet(src[i]);
for (var i=oldlen; i<lastlen; i++) a[i]={};
}
} else { } else {
for (var i=0; i<srclen; i++) a[i]=src[i]; if (srclen>lastlen) srclen=lastlen;
for (var i=oldlen; i<lastlen; i++) a[i]=defaultvalue; if (rtl.isArray(defaultvalue)){
} // array of dyn array
while ((depth>0) && (stack[depth-1].i>=stack[depth-1].dim)){ for (var i=0; i<srclen; i++) a[i]=src[i];
depth--; for (var i=oldlen; i<lastlen; i++) a[i]=[];
}; } else if (rtl.isObject(defaultvalue)) {
if (depth===0){ if (rtl.isTRecord(defaultvalue)){
if (dimmax===0) return a; // array of record
return stack[0].a; for (var i=0; i<srclen; i++) a[i]=defaultvalue.$clone(src[i]);
for (var i=oldlen; i<lastlen; i++) a[i]=defaultvalue.$new();
} else {
// array of set
for (var i=0; i<srclen; i++) a[i]=rtl.refSet(src[i]);
for (var i=oldlen; i<lastlen; i++) a[i]={};
}
} else {
for (var i=0; i<srclen; i++) a[i]=src[i];
for (var i=oldlen; i<lastlen; i++) a[i]=defaultvalue;
}
} }
} }
// backtrack
while ((depth>0) && (stack[depth-1].i>=stack[depth-1].dim)){
depth--;
};
if (depth===0){
if (dimmax===0) return a;
return stack[0].a;
}
}while (true); }while (true);
}, },