Browse Source

* Fix some warnings

git-svn-id: trunk@30830 -
michael 10 years ago
parent
commit
331f4eaff3
1 changed files with 15 additions and 13 deletions
  1. 15 13
      packages/googleapi/src/googlediscoverytopas.pp

+ 15 - 13
packages/googleapi/src/googlediscoverytopas.pp

@@ -490,8 +490,16 @@ begin
 end;
 end;
 
 
 function TTypeDefs.Find(ATypename: String): TTypeDef;
 function TTypeDefs.Find(ATypename: String): TTypeDef;
-begin
 
 
+Var
+  I : Integer;
+
+begin
+  I:=IndexOf(ATypeName);
+  if (I=-1) then
+    Result:=Nil
+  else
+    Result:=GetD(I);
 end;
 end;
 
 
 function TTypeDefs.AddTypeDef(ADataType: TDataType; APascalName: String;
 function TTypeDefs.AddTypeDef(ADataType: TDataType; APascalName: String;
@@ -639,7 +647,7 @@ end;
 procedure TDiscoveryJSONToPas.CollectType(S: TSchema; NamePrefix: String; IsTopLevel : Boolean);
 procedure TDiscoveryJSONToPas.CollectType(S: TSchema; NamePrefix: String; IsTopLevel : Boolean);
 
 
 Var
 Var
-  CN,TCN,AE : String;
+  AE : String;
   Dt : TDataType;
   Dt : TDataType;
   BaseArrayElement : Boolean;
   BaseArrayElement : Boolean;
 
 
@@ -790,12 +798,12 @@ begin
   else if Result='number' then
   else if Result='number' then
     begin
     begin
     if (AFormat='double') then
     if (AFormat='double') then
-       Result:='double'
-     else
-       Result:='integer'
+      Result:='double'
+    else
+      Result:='integer'
     end
     end
   else if Result='string' then
   else if Result='string' then
-   if Aformat='date-time' then
+    if Aformat='date-time' then
       Result:='TDatetime'
       Result:='TDatetime'
     else if Aformat='date' then
     else if Aformat='date' then
       Result:='TDate'
       Result:='TDate'
@@ -1030,7 +1038,6 @@ procedure TDiscoveryJSONToPas.CreateInterface;
   end;
   end;
 
 
 Var
 Var
-  I : Integer;
   S : TTypeDef;
   S : TTypeDef;
   R : TSchema;
   R : TSchema;
 
 
@@ -1057,7 +1064,6 @@ end;
 procedure TDiscoveryJSONToPas.CreateImplementation;
 procedure TDiscoveryJSONToPas.CreateImplementation;
 
 
 Var
 Var
-  I : Integer;
   R : TSchema;
   R : TSchema;
   S : TTypeDef;
   S : TTypeDef;
 begin
 begin
@@ -1538,11 +1544,9 @@ procedure TDiscoveryJSONToPas.CreateAPIClassImplementation;
   end;
   end;
 
 
 Var
 Var
-  CN,SCN : String;
+  CN : String;
   S : TSchema;
   S : TSchema;
   I : Integer;
   I : Integer;
-  L : TStrings;
-  TD : TTypeDef;
 
 
 begin
 begin
   CN:=GetAPIClassName;
   CN:=GetAPIClassName;
@@ -1653,8 +1657,6 @@ end;
 
 
 procedure TDiscoveryJSONToPas.Execute;
 procedure TDiscoveryJSONToPas.Execute;
 
 
-Var
-  L : TStringList;
 begin
 begin
   Source.Clear;
   Source.Clear;
   Addln('unit '+outputunitname+';');
   Addln('unit '+outputunitname+';');