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

* fixed getting pointer to nested dynarray types

Browse Source
This commit is contained in:
Jonas Maebe 2004-11-07 18:31:50 +00:00
parent 405fb30652
commit 3f30fb7bb6
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rtl/inc/dynarr.inc
View File

@ -86,7 +86,7 @@ procedure fpc_dynarray_clear_internal(p : pointer;ti : pointer);
{$endif FPC_ALIGNSRTTI} {$endif FPC_ALIGNSRTTI}
elesize:=psizeint(ti)^; elesize:=psizeint(ti)^;
eletype:=pdynarraytypeinfo(pointer(ti)+sizeof(sizeint)); eletype:=pdynarraytypeinfo(pointer(pdynarraytypeinfo(pointer(ti)+sizeof(sizeint)))^);
{ finalize all data } { finalize all data }
int_finalizearray(p+sizeof(tdynarray),eletype,pdynarray(p)^.high+1, int_finalizearray(p+sizeof(tdynarray),eletype,pdynarray(p)^.high+1,
@ -187,7 +187,7 @@ procedure fpc_dynarray_setlength(var p : pointer;pti : pointer;
{$endif FPC_ALIGNSRTTI} {$endif FPC_ALIGNSRTTI}
elesize:=psizeint(ti)^; elesize:=psizeint(ti)^;
eletype:=pdynarraytypeinfo(pointer(ti)+sizeof(sizeint)); eletype:=pdynarraytypeinfo(pointer(pdynarraytypeinfo(pointer(ti)+sizeof(sizeint)))^);
{ determine new memory size } { determine new memory size }
{ dims[dimcount-1] because the dimensions are in reverse order! (JM) } { dims[dimcount-1] because the dimensions are in reverse order! (JM) }
@ -325,7 +325,7 @@ procedure fpc_dynarray_copy(var pdest : pointer;psrc : pointer;ti : pointer;
{$endif FPC_ALIGNSRTTI} {$endif FPC_ALIGNSRTTI}
elesize:=psizeint(ti)^; elesize:=psizeint(ti)^;
eletype:=pdynarraytypeinfo(pointer(ti)+sizeof(sizeint)); eletype:=pdynarraytypeinfo(pointer(pdynarraytypeinfo(pointer(ti)+sizeof(sizeint)))^);
{ -1, -1 (highidx=lowidx-1-1=-3) is used to copy the whole array like a:=copy(b);, so { -1, -1 (highidx=lowidx-1-1=-3) is used to copy the whole array like a:=copy(b);, so
update the lowidx and highidx with the values from psrc } update the lowidx and highidx with the values from psrc }
@ -355,7 +355,10 @@ procedure fpc_dynarray_copy(var pdest : pointer;psrc : pointer;ti : pointer;
{ {
$Log$ $Log$
Revision 1.33 2004-11-07 18:02:47 jonas Revision 1.34 2004-11-07 18:31:50 jonas
* fixed getting pointer to nested dynarray types
Revision 1.33 2004/11/07 18:02:47 jonas
* fixed pointer arithmetic errors * fixed pointer arithmetic errors
Revision 1.32 2004/11/06 15:29:19 florian Revision 1.32 2004/11/06 15:29:19 florian