paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-27 08:13:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Allow aliases

Browse Source 
git-svn-id: trunk@42787 -
This commit is contained in:
michael 2019-08-24 09:52:04 +00:00
parent 0f55367c37
commit 26c3882c43
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/webidl/src/webidlparser.pp
View File

@ -29,6 +29,7 @@ Type
TWebIDLContext = Class (TIDLBaseObject)
private
FAliases: TStrings;
FDefinitions: TIDLDefinitionList;
FHash : TFPObjectHashTable;
Protected
@ -50,6 +51,7 @@ Type
Function Add(aClass : TIDLDefinitionClass; const AName : UTF8String) : TIDLDefinition; override;
Function Add(aParent : TIDLBaseObject; aClass : TIDLDefinitionClass; const AName : UTF8String) : TIDLDefinition; virtual;
Property Definitions : TIDLDefinitionList Read FDefinitions;
Property Aliases : TStrings Read FAliases Write FAliases;
end;
{ TWebIDLParser }
@ -132,6 +134,7 @@ Resourcestring
SErrTypeNotAllowed = 'Type "%s" not allowed in "%s" type.';
SErrDictionaryNotFound = 'Dictionary %s not found';
SErrInterfaceNotFound = 'Interface %s not found';
SErrInterfaceNotFoundfor = 'Included Interface %s not found for %s';
{ TWebIDLParser }
@ -1367,9 +1370,17 @@ begin
Raise EWebIDLParser.CreateFmt(SErrInterfaceNotFound,[ID.Name]);
II:=FindInterface(ID.IncludedInterface);
If (II=Nil) then
Raise EWebIDLParser.CreateFmt(SErrInterfaceNotFound,[ID.Name]);
II.IsInclude:=True;
OI.Partials.Add(II);
begin
if Assigned(Aliases) and (Aliases.IndexOfName(ID.IncludedInterface)<>-1) then
OI.ParentName:=Aliases.Values[ID.IncludedInterface]
else
Raise EWebIDLParser.CreateFmt(SErrInterfaceNotFoundFor,[ID.IncludedInterface,ID.Name]);
end
else
begin
II.IsInclude:=True;
OI.Partials.Add(II);
end
end;
// if there is a single include, no members and no parent, make it a descendent
For D in FDefinitions do