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

* pas2jni: When excluding a class, also exclude all descendant classes.

Browse Source 
git-svn-id: trunk@29149 -
This commit is contained in:
yury 2014-11-25 21:06:33 +00:00
parent ce96980f39
commit 3ca38ade60
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
utils/pas2jni/ppuparser.pas
View File

@ -308,6 +308,9 @@ var
if jt = 'obj' then begin
if it.Strings['ObjType'] <> 'class' then
continue;
// Exclude class?
if FOnCheckItem(AUnitName + '.' + CurObjName) = crExclude then
continue;
d:=TClassDef.Create(CurDef, dtClass);
end
else
@ -443,6 +446,11 @@ var
dtClass:
with TClassDef(d) do begin
AncestorClass:=TClassDef(_GetRef(it.Get('Ancestor', TJSONObject(nil)), TClassDef));
if (AncestorClass <> nil) and (AncestorClass.DefType = dtNone) then begin
// Ancestor class has been excluded
FreeAndNil(d);
continue;
end;
_ReadDefs(d, it, 'Fields');
end;
dtRecord: