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

Fix for Mantis #21457

Browse Source 
* pdecsub.pas, parse_proc_dec & pdecobj.pas, constructor_head: 
    correctly set the return type of the constructor of a class helper to the extended def
* psub.pas, generate_bodyentry_block:
    call the NEWINSTANCE of the extended class for constructors of class helpers

git-svn-id: trunk@21582 -
This commit is contained in:
svenbarth 2012-06-12 09:42:22 +00:00
parent d0df2b247b
commit 7dfaec7a05
5 changed files with 48 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -12601,6 +12601,7 @@ tests/webtbs/tw2129b.pp svneol=native#text/plain
tests/webtbs/tw2131.pp svneol=native#text/plain
tests/webtbs/tw21443.pp svneol=native#text/plain
tests/webtbs/tw2145.pp svneol=native#text/plain
tests/webtbs/tw21457.pp svneol=native#text/pascal
tests/webtbs/tw21472.pp svneol=native#text/pascal
tests/webtbs/tw21550.pp svneol=native#text/pascal
tests/webtbs/tw21551.pp svneol=native#text/plain

10
compiler/pdecobj.pas
View File

@ -133,16 +133,20 @@ implementation
consume(_SEMICOLON);
include(current_structdef.objectoptions,oo_has_constructor);
{ Set return type, class and record constructors return the
created instance, object constructors return boolean }
created instance, helper types return the extended type,
object constructors return boolean }
if is_class(pd.struct) or
is_record(pd.struct) or
is_javaclass(pd.struct) then
pd.returndef:=pd.struct
else
if is_objectpascal_helper(pd.struct) then
pd.returndef:=tobjectdef(pd.struct).extendeddef
else
{$ifdef CPU64bitaddr}
pd.returndef:=bool64type;
pd.returndef:=bool64type;
{$else CPU64bitaddr}
pd.returndef:=bool32type;
pd.returndef:=bool32type;
{$endif CPU64bitaddr}
constr_destr_finish_head(pd,pd.struct);
result:=pd;

7
compiler/pdecsub.pas
View File

@ -1107,10 +1107,13 @@ implementation
is_javaclass(pd.struct) then
pd.returndef:=pd.struct
else
if is_objectpascal_helper(pd.struct) then
pd.returndef:=tobjectdef(pd.struct).extendeddef
else
{$ifdef CPU64bitaddr}
pd.returndef:=bool64type;
pd.returndef:=bool64type;
{$else CPU64bitaddr}
pd.returndef:=bool32type;
pd.returndef:=bool32type;
{$endif CPU64bitaddr}
end
else

13
compiler/psub.pas
View File

@ -404,6 +404,7 @@ implementation
para : tcallparanode;
call : tcallnode;
newstatement : tstatementnode;
def : tabstractrecorddef;
begin
result:=internalstatements(newstatement);
@ -412,9 +413,17 @@ implementation
{ a constructor needs a help procedure }
if (current_procinfo.procdef.proctypeoption=potype_constructor) then
begin
if is_class(current_structdef) then
if is_class(current_structdef) or
(
is_objectpascal_helper(current_structdef) and
is_class(tobjectdef(current_structdef).extendeddef)
) then
begin
srsym:=search_struct_member(current_structdef,'NEWINSTANCE');
if is_objectpascal_helper(current_structdef) then
def:=tabstractrecorddef(tobjectdef(current_structdef).extendeddef)
else
def:=current_structdef;
srsym:=search_struct_member(def,'NEWINSTANCE');
if assigned(srsym) and
(srsym.typ=procsym) then
begin

24
tests/webtbs/tw21457.pp Normal file
View File

@ -0,0 +1,24 @@
unit tw21457;
{$mode objfpc}
interface
uses Classes;
Type
TFileStreamHelper = class helper for TFileStream
public
constructor CreateRetry(const AFileName: string; Mode: Word; Rights: Cardinal);
end;
implementation
{ TFileStreamHelper }
constructor TFileStreamHelper.CreateRetry(const AFileName:string; Mode:Word; Rights: Cardinal);
begin
//TODO
//=> internal error 200305103
end;
end.