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

* convert booleans to the actual array index type (mantis #15364)

Browse Source 
git-svn-id: trunk@14445 -
This commit is contained in:
Jonas Maebe 2009-12-17 13:53:09 +00:00
parent 5f10ff067f
commit 10cfba3b28
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -10139,6 +10139,7 @@ tests/webtbs/tw15293.pp svneol=native#text/plain
tests/webtbs/tw15293a.pp svneol=native#text/plain tests/webtbs/tw15293a.pp svneol=native#text/plain
tests/webtbs/tw15304.pp svneol=native#text/plain tests/webtbs/tw15304.pp svneol=native#text/plain
tests/webtbs/tw1532.pp svneol=native#text/plain tests/webtbs/tw1532.pp svneol=native#text/plain
tests/webtbs/tw15364.pp svneol=native#text/plain
tests/webtbs/tw1539.pp svneol=native#text/plain tests/webtbs/tw1539.pp svneol=native#text/plain
tests/webtbs/tw1567.pp svneol=native#text/plain tests/webtbs/tw1567.pp svneol=native#text/plain
tests/webtbs/tw1573.pp svneol=native#text/plain tests/webtbs/tw1573.pp svneol=native#text/plain

7
compiler/nmem.pas
View File

@ -733,9 +733,9 @@ implementation
exit; exit;
{ maybe type conversion for the index value, but { maybe type conversion for the index value, but
do not convert enums,booleans,char do not convert enums, char (why not? (JM))
and do not convert range nodes } and do not convert range nodes }
if (right.nodetype<>rangen) and (is_integer(right.resultdef) or (left.resultdef.typ<>arraydef)) then if (right.nodetype<>rangen) and (is_integer(right.resultdef) or is_boolean(right.resultdef) or (left.resultdef.typ<>arraydef)) then
case left.resultdef.typ of case left.resultdef.typ of
arraydef: arraydef:
if ado_isvariant in Tarraydef(left.resultdef).arrayoptions then if ado_isvariant in Tarraydef(left.resultdef).arrayoptions then
@ -748,6 +748,9 @@ implementation
{Arrays without a high bound (dynamic arrays, open arrays) are zero based, {Arrays without a high bound (dynamic arrays, open arrays) are zero based,
convert indexes into these arrays to aword.} convert indexes into these arrays to aword.}
inserttypeconv(right,uinttype) inserttypeconv(right,uinttype)
{ convert between pasbool and cbool if necessary }
else if is_boolean(right.resultdef) then
inserttypeconv(right,tarraydef(left.resultdef).rangedef)
else else
{Convert array indexes to low_bound..high_bound.} {Convert array indexes to low_bound..high_bound.}
inserttypeconv(right,Torddef.create(Torddef(sinttype).ordtype, inserttypeconv(right,Torddef.create(Torddef(sinttype).ordtype,

16
tests/webtbs/tw15364.pp Normal file
View File

@ -0,0 +1,16 @@
program test;
uses sysutils;
var
a : array [Boolean,Boolean] of string;
b : wordbool;
begin
a[False,True] := 'True';
a[False,False] := 'False';
a[True,True] := 'True';
a[True,False] := 'False';
b := True;
if a[false,b]<>'True' then
halt(1);
end.