paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-31 20:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

* more procvar directive fixes

Browse Source
This commit is contained in:
peter 2005-02-03 17:11:40 +00:00
parent 16a60238c6
commit ffb7b80888
2 changed files with 42 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compiler/pdecsub.pas
View File

@ -2122,7 +2122,15 @@ const
break;
{ support procedure proc;stdcall export; }
if not(check_proc_directive((pd.deftype=procvardef))) then
consume(_SEMICOLON);
begin
{ support "record p : procedure stdcall end;" and
"var p : procedure stdcall = nil;" }
if (pd_procvar in pdflags) and
(token in [_END,_RKLAMMER,_EQUAL]) then
break
else
consume(_SEMICOLON);
end;
end
else
break;
@ -2441,7 +2449,10 @@ const
end.
{
$Log$
Revision 1.228 2005-02-01 08:46:13 michael
Revision 1.229 2005-02-03 17:11:40 peter
* more procvar directive fixes
Revision 1.228 2005/02/01 08:46:13 michael
* Patch from peter: fix macpas anonymous function procvar
Revision 1.227 2005/01/31 21:27:51 peter

58
compiler/pdecvar.pas
View File

@ -725,6 +725,9 @@ implementation
not(is_object and (idtoken in [_PUBLIC,_PRIVATE,_PUBLISHED,_PROTECTED])) do
begin
sorg:=orgpattern;
semicoloneaten:=false;
hasdefaultvalue:=false;
symdone:=false;
sc.reset;
repeat
case symtablestack.symtabletype of
@ -769,6 +772,7 @@ implementation
end
else
read_type(tt,'',false);
ignore_equal:=false;
{ Process procvar directives }
if (tt.def.deftype=procvardef) and
(tt.def.typesym=nil) and
@ -780,9 +784,8 @@ implementation
newtype.restype.def:=nil;
tt.def.typesym:=nil;
newtype.free;
end
else
semicoloneaten:=false;
end;
{$ifdef powerpc}
{ from gcc/gcc/config/rs6000/rs6000.h:
/* APPLE LOCAL begin Macintosh alignment 2002-1-22 ff */
@ -813,14 +816,12 @@ implementation
is_first_field := false;
end;
{$endif powerpc}
{ types that use init/final are not allowed in variant parts, but
classes are allowed }
if (variantrecordlevel>0) and
(tt.def.needs_inittable and not is_class(tt.def)) then
Message(parser_e_cant_use_inittable_here);
ignore_equal:=false;
hasdefaultvalue:=false;
symdone:=false;
if is_gpc_name then
begin
@ -953,32 +954,28 @@ implementation
begin
{ for a record there doesn't need to be a ; before the END or ) }
if not(token in [_END,_RKLAMMER]) and
{ procedure variables with a calling specifier consume a semicolon }
not(semicoloneaten) then
not(semicoloneaten) then
consume(_SEMICOLON);
end
else
{ Handling of Delphi typed const = initialized vars }
if (token=_EQUAL) and
not(m_tp7 in aktmodeswitches) and
(symtablestack.symtabletype<>parasymtable) then
begin
{ Add calling convention for procvar }
if (tt.def.deftype=procvardef) and
(tt.def.typesym=nil) then
handle_calling_convention(tprocvardef(tt.def));
read_default_value(sc,tt,is_threadvar);
consume(_SEMICOLON);
{ for locals we've created typedconstsym with a different name }
if symtablestack.symtabletype<>localsymtable then
symdone:=true;
hasdefaultvalue:=true;
end
else
begin
{ Handling of Delphi typed const = initialized vars }
if (token=_EQUAL) and
not(m_tp7 in aktmodeswitches) and
(symtablestack.symtabletype<>parasymtable) then
begin
if (tt.def.deftype=procvardef) and
(tt.def.typesym=nil) then
begin
{ Add calling convention for procvar }
handle_calling_convention(tprocvardef(tt.def));
semicoloneaten:=true;
end
else
semicoloneaten:=false;
read_default_value(sc,tt,is_threadvar);
{ for locals we've created typedconstsym with a different name }
if symtablestack.symtabletype<>localsymtable then
symdone:=true;
hasdefaultvalue:=true;
end;
if not(semicoloneaten) then
consume(_SEMICOLON);
end;
@ -1321,7 +1318,10 @@ implementation
end.
{
$Log$
Revision 1.95 2005-02-02 19:03:27 florian
Revision 1.96 2005-02-03 17:11:40 peter
* more procvar directive fixes
Revision 1.95 2005/02/02 19:03:27 florian
* fixed proc. vars with calling specifiers in usual var declarations
Revision 1.94 2005/02/01 23:18:54 florian