paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-29 21:10:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

h2pas: extended tool to add implicit types for adding implicit function types

Browse Source 
git-svn-id: trunk@14147 -
This commit is contained in:
mattias 2008-02-15 20:41:29 +00:00
parent 8023d99e58
commit a807ae157b
2 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/codetools/basiccodetools.pas
View File

@ -1818,8 +1818,7 @@ begin
case Source[AtomStart] of
'{','(','[':
begin
if not ReadTilPascalBracketClose(Source,AtomStart) then exit;
Position:=AtomStart;
if not ReadTilPascalBracketClose(Source,Position) then exit;
end;
'}',')',']':
if Source[AtomStart]=CloseBracket then begin

51
components/h2pas/h2pasconvert.pas
View File

@ -2704,6 +2704,28 @@ function TReplaceImplicitTypes.FindNextImplicitType(var Position: integer;
out aTypeStart, aTypeEnd: integer): boolean;
var
AtomStart: LongInt;
function ReadTilTypeEnd: boolean;
var
CurAtom: String;
begin
repeat
CurAtom:=ReadNextPascalAtom(Src,Position,AtomStart);
if CurAtom='' then exit(false);
if (length(CurAtom)=1) and (CurAtom[1] in ['(','[']) then begin
// skip brackets
if not ReadTilPascalBracketClose(Src,Position) then exit(false);
end else if (length(CurAtom)=1) and (CurAtom[1] in [';',')',']'])
then begin
// type end found
aTypeEnd:=AtomStart;
Result:=true;
exit;
end;
until false;
end;
var
CurAtom: string;
begin
Result:=false;
@ -2713,6 +2735,7 @@ begin
repeat
CurAtom:=ReadNextPascalAtom(Src,Position,AtomStart);
if CurAtom='' then break;
//DebugLn(['TReplaceImplicitTypes.FindNextImplicitType AAA1 ',CurAtom]);
if CurAtom=':' then begin
// var, const, out declaration
CurAtom:=ReadNextPascalAtom(Src,Position,AtomStart);
@ -2726,21 +2749,21 @@ begin
// :array[
if not ReadTilPascalBracketClose(Src,Position) then break;
// :array[..]
repeat
CurAtom:=ReadNextPascalAtom(Src,Position,AtomStart);
if CurAtom='' then break;
if (length(CurAtom)=1) and (CurAtom[1] in ['(','[']) then begin
// skip brackets
if not ReadTilPascalBracketClose(Src,Position) then break;
end else if (length(CurAtom)=1) and (CurAtom[1] in [';',')',']'])
then begin
// type end found
aTypeEnd:=AtomStart;
Result:=true;
exit;
end;
until false;
Result:=ReadTilTypeEnd;
exit;
end;
end
else if CompareIdentifiers(PChar(CurAtom),'function')=0 then begin
// :function
// for example: function hci_for_each_dev(func:function (dd:longint):longint):longint;
Result:=ReadTilTypeEnd;
exit;
end
else if CompareIdentifiers(PChar(CurAtom),'procedure')=0 then begin
// :procedure
// for example: procedure hci_for_each_dev(func:function (dd:longint):longint);
Result:=ReadTilTypeEnd;
exit;
end;
end;
until CurAtom='';