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

* fix type determining of array of integer constructors

Browse Source 
git-svn-id: trunk@4736 -
This commit is contained in:
peter 2006-09-26 20:11:15 +00:00
parent 1eeb78379f
commit 75dee03578
3 changed files with 46 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -7340,6 +7340,7 @@ tests/webtbs/tw7372.pp svneol=native#text/plain
tests/webtbs/tw7379.pp svneol=native#text/plain tests/webtbs/tw7379.pp svneol=native#text/plain
tests/webtbs/tw7425.pp svneol=native#text/plain tests/webtbs/tw7425.pp svneol=native#text/plain
tests/webtbs/tw7440.pp svneol=native#text/plain tests/webtbs/tw7440.pp svneol=native#text/plain
tests/webtbs/tw7446.pp svneol=native#text/plain
tests/webtbs/ub1873.pp svneol=native#text/plain tests/webtbs/ub1873.pp svneol=native#text/plain
tests/webtbs/ub1883.pp svneol=native#text/plain tests/webtbs/ub1883.pp svneol=native#text/plain
tests/webtbs/uw0555.pp svneol=native#text/plain tests/webtbs/uw0555.pp svneol=native#text/plain

20
compiler/nld.pas
View File

@ -653,7 +653,7 @@ implementation
ccallparanode.create( ccallparanode.create(
ctypeconvnode.create_internal(right,voidpointertype), ctypeconvnode.create_internal(right,voidpointertype),
ccallparanode.create( ccallparanode.create(
ctypeconvnode.create_internal(left,voidpointertype), ctypeconvnode.create_internal(left,voidpointertype),
nil))); nil)));
result:=ccallnode.createintern('fpc_intf_assign_by_iid',hp); result:=ccallnode.createintern('fpc_intf_assign_by_iid',hp);
@ -896,11 +896,19 @@ implementation
htype:=hp.left.resulttype htype:=hp.left.resulttype
else else
begin begin
if ((nf_novariaallowed in flags) or (not varia)) and if (not varia) and (not equal_defs(htype.def,hp.left.resulttype.def)) then
(not equal_defs(htype.def,hp.left.resulttype.def)) then begin
begin { If both are integers we need to take the type that can hold both
varia:=true; defs }
end; if is_integer(htype.def) and is_integer(hp.left.resulttype.def) then
begin
if is_in_limit(htype.def,hp.left.resulttype.def) then
htype:=hp.left.resulttype;
end
else
if (nf_novariaallowed in flags) then
varia:=true;
end;
end; end;
inc(len); inc(len);
hp:=tarrayconstructornode(hp.right); hp:=tarrayconstructornode(hp.right);

31
tests/webtbs/tw7446.pp Executable file
View File

@ -0,0 +1,31 @@
program openarrayoverload;
{$ifdef FPC}{$mode objfpc}{$h+}{$INTERFACES CORBA}{$endif}
{$ifdef mswindows}{$apptype console}{$endif}
uses
{$ifdef FPC}{$ifdef linux}cthreads,{$endif}{$endif}
sysutils;
type
integerarty = array of integer;
booleanarty = array of boolean;
function o2d(const values: array of integer): integerarty;
overload;
begin
result:= nil;
end;
function o2d(const values: array of boolean): booleanarty;
overload;
begin
result:= nil;
end;
var
ar1: integerarty;
begin
ar1:= o2d([127,2,3]); // OK
ar1:= o2d([128,2,3]);
// openarrayoverload.pas(27,8) Error: Can't determine which overloaded function to call
end.