paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-12-15 22:30:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

* re-enabled enum -> dispinterface typecasts after r21069, bug noticed by

Browse Source 
Paul

git-svn-id: trunk@21076 -
This commit is contained in:
Jonas Maebe 2012-04-27 09:30:25 +00:00
parent e2243e6f4e
commit 564445da8c
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/defcmp.pas
View File

@ -764,7 +764,7 @@ implementation
begin
{ ugly, but delphi allows it }
if (cdo_explicit in cdoptions) and
is_class_or_interface_or_objc_or_java(def_from) then
is_class_or_interface_or_dispinterface_or_objc_or_java(def_from) then
begin
{ in Java enums /are/ class instances, and hence such
typecasts must not be treated as integer-like

10
compiler/symdef.pas
View File

@ -950,6 +950,7 @@ interface
function is_class_or_interface(def: tdef): boolean;
function is_class_or_interface_or_objc(def: tdef): boolean;
function is_class_or_interface_or_objc_or_java(def: tdef): boolean;
function is_class_or_interface_or_dispinterface_or_objc_or_java(def: tdef): boolean;
function is_class_or_interface_or_object(def: tdef): boolean;
function is_class_or_interface_or_dispinterface(def: tdef): boolean;
function is_implicit_pointer_object_type(def: tdef): boolean;
@ -6605,6 +6606,15 @@ implementation
end;
function is_class_or_interface_or_dispinterface_or_objc_or_java(def: tdef): boolean;
begin
result:=
assigned(def) and
(def.typ=objectdef) and
(tobjectdef(def).objecttype in [odt_class,odt_interfacecom,odt_interfacecorba,odt_dispinterface,odt_objcclass,odt_objcprotocol,odt_javaclass,odt_interfacejava]);
end;
function is_class_or_interface_or_object(def: tdef): boolean;
begin
result:=