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

fcl-res: replace preproc defines with much faster hashtable

Browse Source 
Reintegrate fpcres-rc branch by Martok

git-svn-id: trunk@46384 -
This commit is contained in:
svenbarth 2020-08-12 19:05:57 +00:00
parent a3a6dca5ea
commit 81885c7e72
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/fcl-res/src/rcreader.pp
View File

@ -91,7 +91,7 @@ begin
rcparser.yinclude.init();
rcparser.yinclude.WorkDir:= aLocation;
rcparser.ypreproc.init();
rcparser.ypreproc.Defines.Add('RC_INVOKED');
rcparser.ypreproc.Defines.Add('RC_INVOKED', '');
rcparser.aktresources:= aResources;
if rcparser.yyparse <> 0 then
raise EReadError.Create('Parse Error');

13
packages/fcl-res/src/yypreproc.pp
View File

@ -7,7 +7,7 @@ type
const
yp_maxlevels = 16;
var
Defines: TStringList;
Defines: TFPStringHashTable;
skip : array[0..yp_maxlevels-1] of boolean;
cheadermode: boolean;
level : longint;
@ -27,8 +27,7 @@ var
procedure typreproc.init();
begin
Defines:= TStringList.Create;
Defines.CaseSensitive:= False;
Defines:= TFPStringHashTable.Create;
level:= 0;
cheadermode:= false;
fillchar(skip,sizeof(skip),0);
@ -64,12 +63,12 @@ end;
function typreproc.isdefine(ident: string): boolean;
begin
Result:= Defines.IndexOfName(ident) >= 0;
Result:= Defines.Find(ident) <> nil;
end;
function typreproc.getdefine(ident: string): string;
begin
Result:= Defines.Values[ident];
Result:= Defines.Items[ident];
end;
function typreproc.useline(line: string): boolean;
@ -130,10 +129,10 @@ begin
end;
'define': begin
arg1:= Copy2SpaceDelTrim(w);
Defines.Values[arg1]:= w;
Defines[arg1]:= w;
end;
'undef': begin
Defines.Delete(Defines.IndexOfName(arg1));
Defines.Delete(w);
end;
'include': begin
arg1:= yinclude.expand(w);