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

* fixed get_iso_range_type() for non-integer orddefs (belongs with r37934)

Browse Source 
git-svn-id: trunk@37938 -
This commit is contained in:
Jonas Maebe 2018-01-09 19:03:36 +00:00
parent 7c3702d3b0
commit 4014f900cb
1 changed files with 34 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
compiler/defutil.pas
View File

@ -1128,11 +1128,40 @@ implementation
case def.typ of
orddef:
begin
if (torddef(def).low>=torddef(sinttype).low) and
(torddef(def).high<=torddef(sinttype).high) then
result:=sinttype
else
range_to_type(torddef(def).low,torddef(def).high,result);
if is_integer(def) then
begin
if (torddef(def).low>=torddef(sinttype).low) and
(torddef(def).high<=torddef(sinttype).high) then
result:=sinttype
else
range_to_type(torddef(def).low,torddef(def).high,result);
end
else case torddef(def).ordtype of
pasbool8:
result:=pasbool8type;
pasbool16:
result:=pasbool16type;
pasbool32:
result:=pasbool32type;
pasbool64:
result:=pasbool64type;
bool8bit:
result:=bool8type;
bool16bit:
result:=bool16type;
bool32bit:
result:=bool32type;
bool64bit:
result:=bool64type;
uchar:
result:=cansichartype;
uwidechar:
result:=cwidechartype;
scurrency:
result:=s64currencytype;
else
internalerror(2018010901);
end;
end;
enumdef:
begin