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

* check whether symtablestack.top is a javaclass/interface rather than

Browse Source 
pd.struct to determine whether a directive is allowed or not, because
    pd.struct is also set for nested routines (also has to be changed for
    objcclass)

git-svn-id: branches/jvmbackend@18608 -
This commit is contained in:
Jonas Maebe 2011-08-20 08:14:45 +00:00
parent 4f52639871
commit 0f15664ffa
1 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
compiler/pdecsub.pas
View File

@ -2652,6 +2652,16 @@ const
(symtablestack.top.symtabletype=recordsymtable) then
exit;
{ check if method and directive not for java class }
if not(pd_javaclass in proc_direcdata[p].pd_flags) and
is_javaclass(tdef(symtablestack.top.defowner)) then
exit;
{ check if method and directive not for java interface }
if not(pd_intfjava in proc_direcdata[p].pd_flags) and
is_javainterface(tdef(symtablestack.top.defowner)) then
exit;
{ Conflicts between directives ? }
if (pd.proctypeoption in proc_direcdata[p].mutexclpotype) or
(pd.proccalloption in proc_direcdata[p].mutexclpocall) or
@ -2716,17 +2726,6 @@ const
{ check if method and directive not for record/class helper }
if is_objectpascal_helper(tprocdef(pd).struct) and
(pd_nothelper in proc_direcdata[p].pd_flags) then
{ check if method and directive not for java class }
if is_javaclass(tprocdef(pd).struct) and
not(pd_javaclass in proc_direcdata[p].pd_flags) then
exit;
{ check if method and directive not for java interface }
if is_javainterface(tprocdef(pd).struct) and
not(pd_intfjava in proc_direcdata[p].pd_flags) then
exit;
end;
{ consume directive, and turn flag on }