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

* removed po_function and instead check proctypeoption (more

Browse Source 
comprehensive too)

git-svn-id: trunk@5693 -
This commit is contained in:
Jonas Maebe 2006-12-23 21:04:30 +00:00
parent a63ed25f74
commit 9d28af4269
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
compiler/pdecsub.pas
View File

@ -918,7 +918,6 @@ implementation
{ pd=nil when it is a interface mapping } { pd=nil when it is a interface mapping }
if assigned(pd) then if assigned(pd) then
begin begin
include(pd.procoptions,po_function);
if try_to_consume(_COLON) then if try_to_consume(_COLON) then
begin begin
inc(testcurobject); inc(testcurobject);
@ -2522,11 +2521,12 @@ const
{ Check procedure options, Delphi requires that class is { Check procedure options, Delphi requires that class is
repeated in the implementation for class methods } repeated in the implementation for class methods }
if (m_fpc in current_settings.modeswitches) then if (m_fpc in current_settings.modeswitches) then
po_comp:=[po_classmethod,po_varargs,po_methodpointer,po_interrupt,po_function] po_comp:=[po_classmethod,po_varargs,po_methodpointer,po_interrupt]
else else
po_comp:=[po_classmethod,po_methodpointer,po_function]; po_comp:=[po_classmethod,po_methodpointer];
if ((po_comp * fwpd.procoptions)<>(po_comp * currpd.procoptions)) then if ((po_comp * fwpd.procoptions)<>(po_comp * currpd.procoptions)) or
(fwpd.proctypeoption <> currpd.proctypeoption) then
begin begin
MessagePos1(currpd.fileinfo,parser_e_header_dont_match_forward, MessagePos1(currpd.fileinfo,parser_e_header_dont_match_forward,
fwpd.fullprocname(false)); fwpd.fullprocname(false));

4
compiler/symconst.pas
View File

@ -271,9 +271,7 @@ type
{ importing } { importing }
po_has_importdll, po_has_importdll,
po_has_importname, po_has_importname,
po_kylixlocal, po_kylixlocal
{ this is a function and not a procedure -- needed for tbf/tb0175 }
po_function
); );
tprocoptions=set of tprocoption; tprocoptions=set of tprocoption;