* pas2jni: Fixed exclusion.

git-svn-id: trunk@32615 -

utils/pas2jni/def.pas

@@ -499,7 +499,7 @@ begin
     f:=FRefCnt = 0;
   end;
   if f then begin
-    // Update userd mark of children only once
+    // Update used mark of children only once
     FInSetUsed:=True;
     try
       for i:=0 to Count - 1 do

utils/pas2jni/ppuparser.pas

@@ -457,6 +457,15 @@ var
                   Name:='Int';
 
               _ReadDefs(d, it, 'Params');
+
+              for j:=0 to d.Count - 1 do
+                with d[j] do begin
+                  if DefType <> dtParam then
+                    continue;
+                  s:=Name;
+                  Name:=Format('p%d', [j + 1]);
+                  AliasName:=s;
+                end;
               // Check for user exception handler proc
               if AMainUnit and (Parent = CurUnit) and (OnExceptionProc = nil) and (AnsiCompareText(Name, OnExceptionProcName) = 0) then
                 OnExceptionProc:=TProcDef(d);

utils/pas2jni/writer.pas

@@ -79,7 +79,7 @@ type
     function GetClassPrefix(ClassDef: TDef; const AClassName: string = ''): string;
     function IsJavaSimpleType(d: TDef): boolean;
     function IsJavaVarParam(ParamDef: TVarDef): boolean;
-    function GetProcDeclaration(d: TProcDef; const ProcName: string = ''; FullTypeNames: boolean = False): string;
+    function GetProcDeclaration(d: TProcDef; const ProcName: string = ''; FullTypeNames: boolean = False; InternalParaNames: boolean = False): string;
     function GetJavaProcDeclaration(d: TProcDef; const ProcName: string = ''): string;
     function GetJniFuncType(d: TDef): string;
     function GetJavaClassName(cls: TDef; it: TDef): string;
@@ -361,21 +361,24 @@ begin
   if d = nil then
     Result:=SUnsupportedType
   else
-    case d.DefType of
+    if not d.IsUsed and (d.DefType <> dtType) then
-      dtType:
+      Result:='<excluded type> ' + d.Name
-        Result:=JavaType[TTypeDef(d).BasicType];
+    else
-      dtClass, dtProcType, dtSet, dtEnum:
+      case d.DefType of
-        Result:=d.Name;
+        dtType:
-      dtPointer:
+          Result:=JavaType[TTypeDef(d).BasicType];
-        if TPointerDef(d).IsObjPtr then
+        dtClass, dtProcType, dtSet, dtEnum:
-          Result:=d.Name
+          Result:=d.Name;
+        dtPointer:
+          if TPointerDef(d).IsObjPtr then
+            Result:=d.Name
+          else
+            Result:='long';
+        dtJniObject:
+          Result:='Object';
         else
-          Result:='long';
+          Result:=SUnsupportedType;
-      dtJniObject:
+      end;
-        Result:='Object';
-      else
-        Result:=SUnsupportedType;
-    end;
 end;
 
 function TWriter.GetJavaClassPath(d: TDef; const AClassName: string): string;
@@ -730,10 +733,9 @@ begin
 
       for j:=0 to Count - 1 do begin
         vd:=TVarDef(Items[j]);
+        if vd.DefType <> dtParam then
+          continue;
         with vd do begin
-          ss:=Name;
-          Name:=Format('p%d', [j + 1]);
-          AliasName:=ss;
           if (VarType <> nil) and (VarType.DefType = dtJniEnv) then
             continue;
           s:=s + '; ' + Name + ': ';
@@ -756,9 +758,9 @@ begin
         s:=s + ': ' + DefToJniType(ReturnType, err);
       s:=s + '; ' + JniCaliing;
       if err then begin
-        d.SetNotUsed;
         s:='// ' + s;
-        Fjs.WriteLn('// NOT SUPPORTED: ' + GetJavaProcDeclaration(d));
+        Fjs.WriteLn('// NOT PROCESSED: ' + GetJavaProcDeclaration(d));
+        d.SetNotUsed;
       end;
       Fps.WriteLn;
       Fps.WriteLn(s);
@@ -841,6 +843,8 @@ begin
           s:=s + '(';
           for j:=0 to Count - 1 do begin
             vd:=TVarDef(Items[j]);
+            if vd.DefType <> dtParam then
+              continue;
             if vd.VarType.DefType = dtJniEnv then
               ss:='_env'
             else
@@ -1230,10 +1234,10 @@ begin
     hclass:=GetClassPrefix(d) + 'Class';
     Fps.WriteLn;
     Fps.WriteLn(Format('type %s = class', [hclass]));
-    Fps.WriteLn(Format('private %s;', [ GetProcDeclaration(d, 'Handler', True)]), 1);
+    Fps.WriteLn(Format('private %s;', [ GetProcDeclaration(d, 'Handler', True, True)]), 1);
     Fps.WriteLn('end;');
     Fps.WriteLn;
-    Fps.WriteLn(GetProcDeclaration(d, Format('%s.Handler', [hclass]), True) + ';');
+    Fps.WriteLn(GetProcDeclaration(d, Format('%s.Handler', [hclass]), True, True) + ';');
 
     Fps.WriteLn('var');
     Fps.IncI;
@@ -1243,6 +1247,8 @@ begin
       Fps.WriteLn(Format('_args: array[0..%d] of jvalue;', [d.Count - 1]));
       for i:=0 to d.Count - 1 do begin
         vd:=TVarDef(d[i]);
+        if vd.DefType <> dtParam then
+          continue;
         with vd do
           if IsJavaVarParam(vd) and IsJavaSimpleType(VarType) then
             Fps.WriteLn(Format('_tmp_%s: P%s;', [Name, DefToJniType(VarType, err)]));
@@ -1261,6 +1267,8 @@ begin
 
     for i:=0 to d.Count - 1 do begin
       vd:=TVarDef(d[i]);
+      if vd.DefType <> dtParam then
+        continue;
       with vd do begin
         if not IsJavaVarParam(vd) then begin
           s:='L';
@@ -1298,6 +1306,8 @@ begin
     // Processing var/out parameters
     for i:=0 to d.Count - 1 do begin
       vd:=TVarDef(d[i]);
+      if vd.DefType <> dtParam then
+        continue;
       with vd do
         if IsJavaVarParam(vd) then
           if IsJavaSimpleType(VarType) then
@@ -1394,33 +1404,24 @@ end;
 
 procedure TWriter.WriteUnit(u: TUnitDef);
 
-  procedure _ExcludeClasses(AAncestorClass: TClassDef);
+  procedure _ProcessExcludedProcParams(d: TDef);
   var
     i: integer;
-    d: TDef;
-    s: string;
-    excl: boolean;
   begin
-    for i:=0 to u.Count - 1 do begin
+    if not d.IsUsed then
-      d:=u[i];
+      exit;
-      if d.DefType = dtClass then begin
+    if d.DefType in [dtProc, dtProcType] then begin
-        s:=u.Name + '.' + d.Name;
+      for i:=0 to d.Count - 1 do
-        if AAncestorClass = nil then begin
+        if d[i].DefType = dtParam then
-          excl:=DoCheckItem(s) = crExclude;
+          with TVarDef(d[i]) do
-          if not excl and (TClassDef(d).AncestorClass <> nil) then
+            if (VarType <> nil) and not VarType.IsUsed then begin
-            with TClassDef(d).AncestorClass do
+              d.SetNotUsed;
-              excl:=DoCheckItem(Parent.Name + '.' + Name) = crExclude;
+              break;
-        end
+            end;
-        else
+    end
-          excl:=TClassDef(d).AncestorClass = AAncestorClass;
+    else
-
+      for i:=0 to d.Count - 1 do
-        if excl then begin
+        _ProcessExcludedProcParams(d[i]);
-          d.SetNotUsed;
-          ExcludeList.Add(s);
-          _ExcludeClasses(TClassDef(d));
-        end;
-      end;
-    end;
   end;
 
 var
@@ -1435,8 +1436,7 @@ begin
   if not u.IsUsed then
     exit;
 
-  if AnsiCompareText(u.Name, 'system') <> 0 then
+  _ProcessExcludedProcParams(u);
-    _ExcludeClasses(nil);
 
   for i:=0 to High(u.UsedUnits) do
     WriteUnit(u.UsedUnits[i]);
@@ -1905,7 +1905,7 @@ begin
     Result:=VarOpt * [voVar, voOut] <> [];
 end;
 
-function TWriter.GetProcDeclaration(d: TProcDef; const ProcName: string; FullTypeNames: boolean): string;
+function TWriter.GetProcDeclaration(d: TProcDef; const ProcName: string; FullTypeNames: boolean; InternalParaNames: boolean): string;
 var
   s, ss: string;
   j: integer;
@@ -1917,6 +1917,8 @@ begin
       s:='';
     for j:=0 to Count - 1 do
       with TVarDef(Items[j]) do begin
+        if DefType <> dtParam then
+          continue;
         if j > 0 then
           s:=s + '; ';
         if voVar in VarOpt then
@@ -1927,7 +1929,11 @@ begin
         else
         if voConst in VarOpt then
           s:=s + 'const ';
-        s:=s + AliasName + ': ' + GetPasType(VarType, FullTypeNames);
+        if InternalParaNames then
+          s:=s + Name
+        else
+          s:=s + AliasName;
+        s:=s + ': ' + GetPasType(VarType, FullTypeNames);
       end;
 
     if Count > 0 then
@@ -1970,6 +1976,8 @@ begin
     s:='';
     for j:=0 to Count - 1 do begin
       vd:=TVarDef(Items[j]);
+      if vd.DefType <> dtParam then
+        continue;
       with vd do begin
         if (VarType <> nil) and (VarType.DefType = dtJniEnv) then
           continue;
@@ -2094,6 +2102,8 @@ begin
   Result:='(';
   for j:=0 to d.Count - 1 do begin
     vd:=TVarDef(d[j]);
+    if vd.DefType <> dtParam then
+      continue;
     with vd do begin
       if (VarType <> nil) and (VarType.DefType = dtJniEnv) then
         continue;
@@ -2199,6 +2209,36 @@ begin
 end;
 
 procedure TWriter.ProcessUnits;
+
+  procedure _ExcludeClasses(u: TDef; AAncestorClass: TClassDef);
+  var
+    i: integer;
+    d: TDef;
+    s: string;
+    excl: boolean;
+  begin
+    for i:=0 to u.Count - 1 do begin
+      d:=u[i];
+      if d.DefType = dtClass then begin
+        s:=u.Name + '.' + d.Name;
+        if AAncestorClass = nil then begin
+          excl:=DoCheckItem(s) = crExclude;
+          if not excl and (TClassDef(d).AncestorClass <> nil) then
+            with TClassDef(d).AncestorClass do
+              excl:=DoCheckItem(Parent.Name + '.' + Name) = crExclude;
+        end
+        else
+          excl:=TClassDef(d).AncestorClass = AAncestorClass;
+
+        if excl then begin
+          d.SetNotUsed;
+          ExcludeList.Add(s);
+          _ExcludeClasses(u, TClassDef(d));
+        end;
+      end;
+    end;
+  end;
+
 var
   p: TPPUParser;
   i: integer;
@@ -2241,6 +2281,8 @@ begin
     ForceDirectories(FPkgDir);
     Fps:=TTextOutStream.Create(OutPath + LibName + '.pas', fmCreate);
 
+    Fps.WriteLn('// This file was automatically generated by the pas2jni utility.');
+    Fps.WriteLn('// Creation time: ' + DateTimeToStr(Now));
     Fps.WriteLn('library '+ LibName + ';');
     Fps.WriteLn('{$ifdef fpc} {$mode objfpc} {$H+} {$endif}');
 
@@ -2521,6 +2563,12 @@ begin
     Fps.DecI;
     Fps.WriteLn('end;');
 
+    // Preprocess units
+    for i:=0 to p.Units.Count - 1 do begin
+      if AnsiCompareText(p.Units[i].Name, 'system') <> 0 then
+        _ExcludeClasses(p.Units[i], nil);
+    end;
+
     // Write units
     for i:=0 to p.Units.Count - 1 do
       with TUnitDef(p.Units[i]) do begin