paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-04-16 23:21:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed handling of wrong invocations of slice + improved error reporting

Browse Source 
git-svn-id: trunk@2614 -
This commit is contained in:
Jonas Maebe 2006-02-16 20:27:31 +00:00
parent 84bd9d80f5
commit a15505521c
5 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -5796,6 +5796,8 @@ tests/test/units/system/tround.pp svneol=native#text/plain
tests/test/units/system/tseg.pp svneol=native#text/plain
tests/test/units/system/tsetstr.pp svneol=native#text/plain
tests/test/units/system/tsetstr2.pp svneol=native#text/plain
tests/test/units/system/tslice1.pp svneol=native#text/plain
tests/test/units/system/tslice2.pp svneol=native#text/plain
tests/test/units/system/tstring.pp svneol=native#text/plain
tests/test/units/system/ttrig.pas svneol=native#text/plain
tests/test/units/system/ttrunc.pp svneol=native#text/plain

22
compiler/ncal.pas
View File

@ -703,7 +703,7 @@ type
(tloadnode(left).is_addr_param_load)
)
) then
make_not_regable(left);
make_not_regable(left,false);
if do_count then
begin
@ -2218,9 +2218,12 @@ type
)
) then
begin
{ in theory, this is always regable, but ncgcall can't }
{ handle it yet in all situations (JM) }
tempnode := ctempcreatenode.create(para.parasym.vartype,para.parasym.vartype.def.size,tt_persistent,tparavarsym(para.parasym).varregable <> vr_none);
{ make sure records which could be written to are not }
{ kept in a register }
tempnode := ctempcreatenode.create(para.parasym.vartype,para.parasym.vartype.def.size,tt_persistent,
(tparavarsym(para.parasym).varregable <> vr_none) and
((para.parasym.vartype.def.deftype <> recorddef) or
not(para.parasym.varspez in [vs_var,vs_out])));
addstatement(createstatement,tempnode);
{ assign the value of the parameter to the temp, except in case of the function result }
{ (in that case, para.left is a block containing the creation of a new temp, while we }
@ -2254,7 +2257,16 @@ type
caddrnode.create_internal(para.left)));
para.left := ctypeconvnode.create_internal(cderefnode.create(ctemprefnode.create(tempnode)),para.left.resulttype);
addstatement(deletestatement,ctempdeletenode.create(tempnode));
end;
end
{ the regvar status of vs_var/vs_out paras is never changed, }
{ so in case the are records turn of regvarability of the }
{ para (because we can't write to regvar records yet) }
else if (para.parasym.vartype.def.deftype = recorddef) and
(para.parasym.varspez in [vs_var,vs_out]) then
if (para.left.nodetype = blockn) then
make_not_regable(laststatement(tblocknode(para.left)),true)
else
make_not_regable(para.left,true);
end;
para := tcallparanode(para.right);
end;

10
compiler/ninl.pas
View File

@ -1745,9 +1745,13 @@ implementation
in_slice_x:
begin
result:=nil;
resulttype:=tcallparanode(tcallparanode(left).left).resulttype;
if not(resulttype.def.deftype=arraydef) then
CGMessage(type_e_mismatch);
resulttype:=tcallparanode(left).left.resulttype;
if (resulttype.def.deftype <> arraydef) then
CGMessagePos(left.fileinfo,type_e_mismatch);
if not(is_integer(tcallparanode(tcallparanode(left).right).left.resulttype.def)) then
CGMessagePos1(tcallparanode(left).right.fileinfo,
type_e_integer_expr_expected,
tcallparanode(tcallparanode(left).right).left.resulttype.def.typename);
end;
in_low_x,

9
tests/test/units/system/tslice1.pp Normal file
View File

@ -0,0 +1,9 @@
{ %fail }
procedure t(arr: array of integer);
begin
t(slice(arr));
end;
begin
end.

9
tests/test/units/system/tslice2.pp Normal file
View File

@ -0,0 +1,9 @@
{ %fail }
procedure t(arr: array of integer);
begin
t(slice(arr,'k'));
end;
begin
end.