From 7c96b255f8cefb7de397fbebda192b446b01957d Mon Sep 17 00:00:00 2001
From: svenbarth <pascaldragon@googlemail.com>
Date: Wed, 12 Aug 2020 19:06:49 +0000
Subject: [PATCH] * use TFPGMap from fgl instead of TFPStringHashTable from
 Contnrs

git-svn-id: trunk@46391 -
---
 packages/fcl-res/src/rcparserfn.inc |  5 ++++-
 packages/fcl-res/src/rcreader.pp    |  2 +-
 packages/fcl-res/src/yypreproc.pp   | 10 +++++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/fcl-res/src/rcparserfn.inc b/packages/fcl-res/src/rcparserfn.inc
index 4aa6378443..a92f6f89f9 100644
--- a/packages/fcl-res/src/rcparserfn.inc
+++ b/packages/fcl-res/src/rcparserfn.inc
@@ -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
diff --git a/packages/fcl-res/src/rcreader.pp b/packages/fcl-res/src/rcreader.pp
index 2ad14051ec..8f17be033e 100644
--- a/packages/fcl-res/src/rcreader.pp
+++ b/packages/fcl-res/src/rcreader.pp
@@ -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');
diff --git a/packages/fcl-res/src/yypreproc.pp b/packages/fcl-res/src/yypreproc.pp
index 25574b6cc6..4dcfbb8263 100644
--- a/packages/fcl-res/src/yypreproc.pp
+++ b/packages/fcl-res/src/yypreproc.pp
@@ -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);