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

compiler: fix nested type typecast (issue #0016222)

Browse Source 
git-svn-id: trunk@15122 -
This commit is contained in:
paul 2010-04-09 17:10:52 +00:00
parent e721a623eb
commit c62c487b24
3 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -10346,6 +10346,7 @@ tests/webtbs/tw16163.pp svneol=native#text/plain
tests/webtbs/tw1617.pp svneol=native#text/plain
tests/webtbs/tw16188.pp svneol=native#text/plain
tests/webtbs/tw1622.pp svneol=native#text/plain
tests/webtbs/tw16222.pp svneol=native#text/pascal
tests/webtbs/tw1623.pp svneol=native#text/plain
tests/webtbs/tw1634.pp svneol=native#text/plain
tests/webtbs/tw1658.pp svneol=native#text/plain

17
compiler/pexpr.pas
View File

@ -1276,10 +1276,19 @@ implementation
typesym:
begin
p1.free;
p1:=ctypenode.create(ttypesym(sym).typedef);
if (is_class(ttypesym(sym).typedef) or is_objcclass(ttypesym(sym).typedef)) and
not(block_type in [bt_type,bt_const_type,bt_var_type]) then
p1:=cloadvmtaddrnode.create(p1);
if try_to_consume(_LKLAMMER) then
begin
p1:=comp_expr(true);
consume(_RKLAMMER);
p1:=ctypeconvnode.create_explicit(p1,ttypesym(sym).typedef);
end
else
begin
p1:=ctypenode.create(ttypesym(sym).typedef);
if (is_class(ttypesym(sym).typedef) or is_objcclass(ttypesym(sym).typedef)) and
not(block_type in [bt_type,bt_const_type,bt_var_type]) then
p1:=cloadvmtaddrnode.create(p1);
end;
end;
constsym:
begin

22
tests/webtbs/tw16222.pp Normal file
View File

@ -0,0 +1,22 @@
{ %norun }
program tw16222;
{$ifdef fpc}
{$mode delphi}
{$endif}
type
TOuterClass = class
public
type
TInnerClass = class
end;
end;
function fn(P: Pointer): TOuterClass.TInnerClass;
begin
Result := TOuterClass.TInnerClass(P);
end;
begin
end.