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

* Patch from Mattias Gaertner to Allow only one uses list

Browse Source 
git-svn-id: trunk@34201 -
This commit is contained in:
michael 2016-07-25 18:52:28 +00:00
parent 49132b57dd
commit cdc481f218
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
packages/fcl-passrc/src/pparser.pp
View File

@ -305,6 +305,7 @@ type
procedure ParseUnit(var Module: TPasModule);
procedure ParseProgram(var Module: TPasModule; SkipHeader : Boolean = False);
procedure ParseLibrary(var Module: TPasModule);
procedure ParseOptionalUsesList(ASection: TPasSection);
procedure ParseUsesList(ASection: TPasSection);
procedure ParseInterface;
procedure ParseImplementation;
@ -1920,6 +1921,7 @@ begin
end;
Section := TProgramSection(CreateElement(TProgramSection, '', CurModule));
PP.ProgramSection := Section;
ParseOptionalUsesList(Section);
ParseDeclarations(Section);
finally
FCurModule:=nil;
@ -1947,12 +1949,23 @@ begin
ParseExcTokenError(';');
Section := TLibrarySection(CreateElement(TLibrarySection, '', CurModule));
PP.LibrarySection := Section;
ParseOptionalUsesList(Section);
ParseDeclarations(Section);
finally
FCurModule:=nil;
end;
end;
procedure TPasParser.ParseOptionalUsesList(ASection: TPasSection);
// checks if next token is Uses keyword and read uses list
begin
NextToken;
if CurToken=tkuses then
ParseUsesList(ASection)
else
UngetToken;
end;
// Starts after the "interface" token
procedure TPasParser.ParseInterface;
var
@ -1960,6 +1973,7 @@ var
begin
Section := TInterfaceSection(CreateElement(TInterfaceSection, '', CurModule));
CurModule.InterfaceSection := Section;
ParseOptionalUsesList(Section);
ParseDeclarations(Section);
end;
@ -1970,6 +1984,7 @@ var
begin
Section := TImplementationSection(CreateElement(TImplementationSection, '', CurModule));
CurModule.ImplementationSection := Section;
ParseOptionalUsesList(Section);
ParseDeclarations(Section);
end;
@ -2118,8 +2133,10 @@ begin
break;
end;
tkUses:
if Declarations is TPasSection then
ParseUsesList(TPasSection(Declarations))
if Declarations.ClassType=TInterfaceSection then
ParseExcTokenError(TokenInfos[tkimplementation])
else if Declarations is TPasSection then
ParseExcTokenError(TokenInfos[tkend])
else
ParseExcSyntaxError;
tkConst: