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

* pas2jni: Fixed handling of array variables.

Browse Source 
* pas2jni: Fixed Java warning for the PascalInterface class.

git-svn-id: trunk@41391 -
This commit is contained in:
yury 2019-02-20 08:33:17 +00:00
parent de59341cb7
commit 496693d77b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
utils/pas2jni/writer.pas
View File

@ -1143,6 +1143,7 @@ procedure TWriter.WriteVar(d: TVarDef; AParent: TDef);
if (VarType.DefType = dtType) and (TTypeDef(VarType).BasicType in [btByte, btShortInt, btSmallInt]) then
VarType:=FIntegerType;
VarOpt:=[voRead];
IsUsed:=True;
end;
Result:=ad.ElType;
ad:=TArrayDef(Result);
@ -1651,12 +1652,15 @@ begin
for i:=0 to u.Count - 1 do begin
d:=u[i];
if (d.DefType = dtType) and (TTypeDef(d).BasicType = btLongInt) then begin
if (d.DefType = dtType) and (TTypeDef(d).BasicType = btLongInt) and (Copy(d.Name, 1, 1) <> '$') then begin
FIntegerType:=d;
break;
end;
end;
if FIntegerType = nil then
raise Exception.Create('LongInt type has not been found in the System unit.');
if LibAutoLoad then begin
Fjs.WriteLn('static private boolean _JniLibLoaded = false;');
Fjs.WriteLn('public static void InitJni() {');
@ -2041,9 +2045,9 @@ begin
Fjs.WriteLn('private native static long InterfaceCast(long objptr, String objid);');
Fjs.WriteLn;
Fjs.WriteLn('public static class PascalInterface extends PascalObjectEx {');
Fjs.WriteLn('public static abstract class PascalInterface extends PascalObjectEx {');
Fjs.IncI;
Fjs.WriteLn('protected void __Init() { }');
Fjs.WriteLn('abstract protected void __Init();');
Fjs.WriteLn('public void __TypeCast(PascalObject obj, String intfId) {');
Fjs.WriteLn('if (obj != null) {', 1);
Fjs.WriteLn('if (obj instanceof PascalInterface) {', 2);