codetools: added more ctypes

git-svn-id: trunk@14550 -

components/codetools/ccodeparsertool.pas

@@ -176,6 +176,8 @@ type
     function ExtractFunctionName(FuncNode: TCodeTreeNode): string;
     function ExtractFunctionType(FuncNode: TCodeTreeNode;
                                  WithDirectives: boolean = false): string;
+    function ExtractFunctionResultType(FuncNode: TCodeTreeNode;
+                                       WithDirectives: boolean = false): string;
     function ExtractEnumBlockName(EnumBlockNode: TCodeTreeNode): string;
     function ExtractEnumIDName(EnumIDNode: TCodeTreeNode): string;
 
@@ -1214,20 +1216,42 @@ var
   NameNode: TCodeTreeNode;
 begin
   NameNode:=FuncNode.FirstChild;
-  if (NameNode=nil) or (NameNode.Desc<>ccnName) then
+  if (NameNode=nil) or (NameNode.Desc<>ccnName) then begin
-    Result:=''
+    Result:='';
-  else begin
+    exit;
-    Result:=ExtractCode(FuncNode.StartPos,NameNode.StartPos,WithDirectives);
+  end;
-    if (NameNode.NextBrother<>nil)
+  Result:=ExtractCode(FuncNode.StartPos,NameNode.StartPos,WithDirectives);
-    and (NameNode.NextBrother.Desc=ccnFuncParamList) then begin
+  if (NameNode.NextBrother<>nil)
-      // The name is in between.
+  and (NameNode.NextBrother.Desc=ccnFuncParamList) then begin
-      // The type is result type + parameter list
+    // The name is in between.
-      Result:=Result+ExtractCode(NameNode.EndPos,NameNode.NextBrother.EndPos,
+    // The type is result type + parameter list
-                                 WithDirectives);
+    Result:=Result+ExtractCode(NameNode.EndPos,NameNode.NextBrother.EndPos,
-    end else begin
+                               WithDirectives);
-      Result:=Result+ExtractCode(NameNode.EndPos,FuncNode.EndPos,
+  end else begin
-                                 WithDirectives);
+    Result:=Result+ExtractCode(NameNode.EndPos,FuncNode.EndPos,
-    end;
+                               WithDirectives);
+  end;
+end;
+
+function TCCodeParserTool.ExtractFunctionResultType(FuncNode: TCodeTreeNode;
+  WithDirectives: boolean): string;
+var
+  NameNode: TCodeTreeNode;
+begin
+  NameNode:=FuncNode.FirstChild;
+  if (NameNode=nil) or (NameNode.Desc<>ccnName) then begin
+    Result:='';
+    exit;
+  end;
+  Result:=ExtractCode(FuncNode.StartPos,NameNode.StartPos,WithDirectives);
+  if (NameNode.NextBrother<>nil)
+  and (NameNode.NextBrother.Desc=ccnFuncParamList) then begin
+    // The name is in between.
+    Result:=Result+ExtractCode(NameNode.EndPos,NameNode.NextBrother.StartPos,
+                               WithDirectives);
+  end else begin
+    Result:=Result+ExtractCode(NameNode.EndPos,FuncNode.EndPos,
+                               WithDirectives);
   end;
 end;
 

components/codetools/h2pastool.pas

@@ -98,6 +98,7 @@ type
     procedure BuildH2PTree;
     
     function GetSimplePascalTypeOfCVar(CVarNode: TCodeTreeNode): string;
+    function GetSimplePascalResultTypeOfCFunction(CFuncNode: TCodeTreeNode): string;
     function ConvertSimpleCTypeToPascalType(CType: string): string;
 
     procedure WriteDebugReport;
@@ -127,12 +128,6 @@ begin
       Add('signed int*','pcsint');
       Add('unsigned int','cuint');
       Add('unsigned int*','pcuint');
-      Add('short int','cshort');
-      Add('short int*','pcshort');
-      Add('signed short int','csshort');
-      Add('signed short int*','pcsshort');
-      Add('unsigned short int','csshort');
-      Add('unsigned short int*','pcsshort');
       // short
       Add('short','cshort');
       Add('short*','pcshort');
@@ -140,6 +135,14 @@ begin
       Add('signed short*','pcsshort');
       Add('unsigned short','csshort');
       Add('unsigned short*','pcsshort');
+      Add('short int','cshort');
+      Add('short int*','pcshort');
+      Add('signed short int','csshort');
+      Add('signed short int*','pcsshort');
+      Add('short signed int','csshort');
+      Add('short signed int*','pcsshort');
+      Add('short unsigned int','csshort');
+      Add('short unsigned int*','pcsshort');
       // int8
       Add('int8','cint8');
       Add('int8*','pcint8');
@@ -167,6 +170,16 @@ begin
       Add('signed long*','pcslong');
       Add('unsigned long','culong');
       Add('unsigned long*','pculong');
+      Add('long int','clong');
+      Add('long int*','pclong');
+      Add('signed long int','cslong');
+      Add('signed long int*','pcslong');
+      Add('long signed int','cslong');
+      Add('long signed int*','pcslong');
+      Add('unsigned long int','culong');
+      Add('unsigned long int*','pculong');
+      Add('long unsigned int','culong');
+      Add('long unsigned int*','pculong');
       // long long
       Add('long long','clonglong');
       Add('long long*','pclonglong');
@@ -252,9 +265,9 @@ begin
     ccnFunction:
       begin
         CurName:=CTool.ExtractFunctionName(CNode);
-        CurType:=CTool.ExtractFunctionType(CNode);
+        CurType:=CTool.ExtractFunctionResultType(CNode);
-        SimpleType:=GetSimplePascalTypeOfCVar(CNode);
+        SimpleType:=GetSimplePascalResultTypeOfCFunction(CNode);
-        DebugLn(['TH2PasTool.BuildH2PTree Function Name="',CurName,'" Type="',CurType,'" SimpleType=',SimpleType]);
+        DebugLn(['TH2PasTool.BuildH2PTree Function Name="',CurName,'" ResultType="',CurType,'" SimpleType=',SimpleType]);
         if SimpleType='' then begin
           // this variable has a complex type
 
@@ -280,6 +293,22 @@ begin
     Result:='';
 end;
 
+function TH2PasTool.GetSimplePascalResultTypeOfCFunction(
+  CFuncNode: TCodeTreeNode): string;
+var
+  SimpleType: String;
+begin
+  Result:=CTool.ExtractFunctionResultType(CFuncNode);
+  if Result='' then exit;
+  SimpleType:=ConvertSimpleCTypeToPascalType(Result);
+  if SimpleType<>'' then begin
+    Result:=SimpleType;
+    exit;
+  end;
+  if not IsValidIdent(Result) then
+    Result:='';
+end;
+
 function TH2PasTool.ConvertSimpleCTypeToPascalType(CType: string): string;
 // the type must be normalized. That means no directives,
 // no unneeded spaces, no tabs, no comments, no newlines.