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

* allow the varargs directive in combination with stdcall as well, resolves #27299

Browse Source 
git-svn-id: trunk@29496 -
This commit is contained in:
florian 2015-01-17 14:23:38 +00:00
parent 681c1afe6c
commit d25dbec070
4 changed files with 319 additions and 320 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
compiler/msg/errore.msg
View File

@ -977,10 +977,10 @@ parser_w_skipped_fields_after=03177_W_Some fields coming after "$1" were not ini
% You can leave some fields at the end of a type constant record uninitialized % You can leave some fields at the end of a type constant record uninitialized
% (The compiler will initialize them to zero automatically). This may be the cause % (The compiler will initialize them to zero automatically). This may be the cause
% of subtle problems. % of subtle problems.
parser_e_varargs_need_cdecl_and_external=03178_E_VarArgs directive (or '...' in MacPas) without CDecl/CPPDecl/MWPascal and External parser_e_varargs_need_cdecl_and_external=03178_E_VarArgs directive (or '...' in MacPas) without CDecl/CPPDecl/MWPascal/StdCall and External
% The varargs directive (or the ``...'' varargs parameter in MacPas mode) can only be % The varargs directive (or the ``...'' varargs parameter in MacPas mode) can only be
% used with procedures or functions that are declared with \var{external} and one of % used with procedures or functions that are declared with \var{external} and one of
% \var{cdecl}, \var{cppdecl} and \var{mwpascal}. This functionality % \var{cdecl}, \var{cppdecl}, \var{stdcall} and \var{mwpascal}. This functionality
% is only supported to provide a compatible interface to C functions like printf. % is only supported to provide a compatible interface to C functions like printf.
parser_e_self_call_by_value=03179_E_Self must be a normal (call-by-value) parameter parser_e_self_call_by_value=03179_E_Self must be a normal (call-by-value) parameter
% You cannot declare \var{Self} as a const or var parameter, it must always be % You cannot declare \var{Self} as a const or var parameter, it must always be

2
compiler/msgidx.inc
View File

@ -1003,7 +1003,7 @@ const
option_info=11024; option_info=11024;
option_help_pages=11025; option_help_pages=11025;
MsgTxtSize = 74679; MsgTxtSize = 74687;
MsgIdxMax : array[1..20] of longint=( MsgIdxMax : array[1..20] of longint=(
26,99,340,123,95,57,126,29,202,64, 26,99,340,123,95,57,126,29,202,64,

625
compiler/msgtxt.inc
View File

File diff suppressed because it is too large Load Diff

8
compiler/pdecsub.pas
View File

@ -1134,7 +1134,7 @@ implementation
end; end;
single_type(pd.returndef,[stoAllowSpecialization]); single_type(pd.returndef,[stoAllowSpecialization]);
// Issue #24863, commented out for now because it breaks building of RTL and needs extensive // Issue #24863, enabled only for the main progra commented out for now because it breaks building of RTL and needs extensive
// testing and/or RTL patching. // testing and/or RTL patching.
{ {
if ((pd.returndef=cvarianttype) or (pd.returndef=colevarianttype)) and if ((pd.returndef=cvarianttype) or (pd.returndef=colevarianttype)) and
@ -2487,7 +2487,7 @@ const
handler : nil; handler : nil;
pocall : pocall_none; pocall : pocall_none;
pooption : [po_varargs]; pooption : [po_varargs];
mutexclpocall : [pocall_internproc,pocall_stdcall,pocall_register, mutexclpocall : [pocall_internproc,pocall_register,
pocall_far16,pocall_oldfpccall,pocall_mwpascal]; pocall_far16,pocall_oldfpccall,pocall_mwpascal];
mutexclpotype : []; mutexclpotype : [];
mutexclpo : [po_assembler,po_interrupt,po_inline] mutexclpo : [po_assembler,po_interrupt,po_inline]
@ -2920,7 +2920,7 @@ const
{ for objcclasses this is checked later, because the entire { for objcclasses this is checked later, because the entire
class may be external. } class may be external. }
is_objc_class_or_protocol(tprocdef(pd).struct)) and is_objc_class_or_protocol(tprocdef(pd).struct)) and
not(pd.proccalloption in (cdecl_pocalls + [pocall_mwpascal])) then not(pd.proccalloption in (cdecl_pocalls + [pocall_mwpascal,pocall_stdcall])) then
Message(parser_e_varargs_need_cdecl_and_external); Message(parser_e_varargs_need_cdecl_and_external);
end end
else else
@ -2928,7 +2928,7 @@ const
{ both must be defined now } { both must be defined now }
if not((po_external in pd.procoptions) or if not((po_external in pd.procoptions) or
(pd.typ=procvardef)) or (pd.typ=procvardef)) or
not(pd.proccalloption in (cdecl_pocalls + [pocall_mwpascal])) then not(pd.proccalloption in (cdecl_pocalls + [pocall_mwpascal,pocall_stdcall])) then
Message(parser_e_varargs_need_cdecl_and_external); Message(parser_e_varargs_need_cdecl_and_external);
end; end;
end; end;