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

* use TFPGMap from fgl instead of TFPStringHashTable from Contnrs

Browse Source 
git-svn-id: trunk@46391 -
This commit is contained in:
svenbarth 2020-08-12 19:06:49 +00:00
parent 7da2ee4578
commit 7c96b255f8
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/fcl-res/src/rcparserfn.inc
View File

@ -7,10 +7,13 @@ interface
{$GOTO ON}
uses
SysUtils, Classes, StrUtils, Contnrs, lexlib, yacclib, resource,
SysUtils, Classes, StrUtils, fgl, lexlib, yacclib, resource,
acceleratorsresource, groupiconresource, stringtableresource,
bitmapresource, versionresource, versiontypes, groupcursorresource;
type
TStringHashTable = specialize TFPGMap<String, String>;
function yyparse : Integer;
var

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

@ -100,7 +100,7 @@ begin
rcparser.ypreproc:= typreproc.Create;
rcparser.ypreproc.Defines.Add('RC_INVOKED', '');
for i:= 0 to fRCDefines.Count-1 do
rcparser.ypreproc.Defines.Items[fRCDefines.Names[i]]:= fRCDefines.ValueFromIndex[i];
rcparser.ypreproc.Defines.KeyData[fRCDefines.Names[i]]:= fRCDefines.ValueFromIndex[i];
rcparser.aktresources:= aResources;
if rcparser.yyparse <> 0 then
raise EReadError.Create('Parse Error');

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

@ -7,7 +7,7 @@ type
const
yp_maxlevels = 16;
var
Defines: TFPStringHashTable;
Defines: TStringHashTable;
skip : array[0..yp_maxlevels-1] of boolean;
cheadermode: boolean;
level : longint;
@ -28,7 +28,7 @@ var
constructor typreproc.Create;
begin
inherited Create;
Defines:= TFPStringHashTable.Create;
Defines:= TStringHashTable.Create;
level:= 0;
cheadermode:= false;
fillchar(skip,sizeof(skip),0);
@ -65,12 +65,12 @@ end;
function typreproc.isdefine(ident: string): boolean;
begin
Result:= Defines.Find(ident) <> nil;
Result:= Defines.IndexOf(ident) >= 0;
end;
function typreproc.getdefine(ident: string): string;
begin
Result:= Defines.Items[ident];
Result:= Defines[ident];
end;
function typreproc.useline(line: string): boolean;
@ -134,7 +134,7 @@ begin
Defines[arg1]:= w;
end;
'undef': begin
Defines.Delete(w);
Defines.Remove(w);
end;
'include': begin
arg1:= yinclude.expand(w);