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

* integer(char) explicit typecast support (tp7,delphi compatible)

Browse Source
This commit is contained in:
peter 2000-08-26 19:40:19 +00:00
parent 8e1a4890a1
commit b3959f29ed
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
compiler/tccnv.pas
View File

@ -828,7 +828,7 @@ implementation
else else
begin begin
if isconvertable(s32bitdef,p^.resulttype,p^.convtyp,ordconstn,false)=0 then if isconvertable(s32bitdef,p^.resulttype,p^.convtyp,ordconstn,false)=0 then
CGMessage(cg_e_illegal_type_conversion); CGMessage2(type_e_incompatible_types,p^.left^.resulttype^.typename,p^.resulttype^.typename);
end; end;
end end
@ -848,7 +848,7 @@ implementation
else else
begin begin
if IsConvertable(p^.left^.resulttype,s32bitdef,p^.convtyp,ordconstn,false)=0 then if IsConvertable(p^.left^.resulttype,s32bitdef,p^.convtyp,ordconstn,false)=0 then
CGMessage(cg_e_illegal_type_conversion); CGMessage2(type_e_incompatible_types,p^.left^.resulttype^.typename,p^.resulttype^.typename);
end; end;
end end
@ -878,10 +878,28 @@ implementation
end end
else else
begin begin
{ this is wrong because it converts to a 4 byte long var !!
if not isconvertable(p^.left^.resulttype,s32bitdef,p^.convtyp,ordconstn nur Dummy ) then }
if IsConvertable(p^.left^.resulttype,u8bitdef,p^.convtyp,ordconstn,false)=0 then if IsConvertable(p^.left^.resulttype,u8bitdef,p^.convtyp,ordconstn,false)=0 then
CGMessage(cg_e_illegal_type_conversion); CGMessage2(type_e_incompatible_types,p^.left^.resulttype^.typename,p^.resulttype^.typename);
end;
end
{ Are we char to ordinal }
else
if is_char(p^.left^.resulttype) and
is_ordinal(p^.resulttype) then
begin
if p^.left^.treetype=ordconstn then
begin
hp:=genordinalconstnode(p^.left^.value,p^.resulttype);
firstpass(hp);
disposetree(p);
p:=hp;
exit;
end
else
begin
if IsConvertable(u8bitdef,p^.resulttype,p^.convtyp,ordconstn,false)=0 then
CGMessage2(type_e_incompatible_types,p^.left^.resulttype^.typename,p^.resulttype^.typename);
end; end;
end end
@ -1024,7 +1042,10 @@ implementation
end. end.
{ {
$Log$ $Log$
Revision 1.5 2000-08-02 07:20:32 jonas Revision 1.6 2000-08-26 19:40:19 peter
* integer(char) explicit typecast support (tp7,delphi compatible)
Revision 1.5 2000/08/02 07:20:32 jonas
- undid my changes from the previous two commits because it was a bug - undid my changes from the previous two commits because it was a bug
in cg386cnv which I've now fixed (previous changes only masked it in in cg386cnv which I've now fixed (previous changes only masked it in
some cases) (merged from fixes branch) some cases) (merged from fixes branch)
@ -1039,4 +1060,4 @@ end.
Revision 1.2 2000/07/13 11:32:51 michael Revision 1.2 2000/07/13 11:32:51 michael
+ removed logs + removed logs
} }