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

Merged revisions 1468 via svnmerge from

Browse Source 
http://peter@svn.freepascal.org/svn/fpc/trunk

r1468 (peter)
  * implicitly convert constant string to stringdef if it is indexed

git-svn-id: branches/fixes_2_0@1506 -
This commit is contained in:
peter 2005-10-19 08:34:04 +00:00
parent 8cc0596138
commit a209a6ef29
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
compiler/nmem.pas
View File

@ -229,14 +229,16 @@ implementation
function tloadparentfpnode.det_resulttype:tnode;
{$ifdef dummy}
var
currpi : tprocinfo;
hsym : tparavarsym;
{$endif dummy}
begin
result:=nil;
resulttype:=voidpointertype;
{
currently parentfps are never loaded in registers (FK)
{$ifdef dummy}
{ currently parentfps are never loaded in registers (FK) }
if (current_procinfo.procdef.parast.symtablelevel<>parentpd.parast.symtablelevel) then
begin
@ -253,7 +255,7 @@ implementation
hsym.varregable:=vr_none;
end;
end;
}
{$endif dummy}
end;
@ -638,6 +640,18 @@ implementation
result:=nil;
resulttypepass(left);
resulttypepass(right);
{ implicitly convert stringconstant to stringdef,
see tbs/tb0476.pp for a test }
if (left.nodetype=stringconstn) and
(tstringconstnode(left).st_type=st_conststring) then
begin
if tstringconstnode(left).len>255 then
inserttypeconv(left,cansistringtype)
else
inserttypeconv(left,cshortstringtype);
end;
{ In p[1] p is always valid, it is not possible to
declared a shortstring or normal array that has
undefined number of elements. Dynamic array and