hashtable cosmetix; holmes scissoring fixes

[d2df-sdl.git] / src / shared / hashtable.pas

diff --git a/src/shared/hashtable.pas b/src/shared/hashtable.pas
index 85133c3efbc10d47581f03f132ed6bda137d36b7..495f432c46474bc89027e779a6c404303fefbd55 100644 (file)
--- a/src/shared/hashtable.pas
+++ b/src/shared/hashtable.pas
@@ -185,12 +185,14 @@ type
   THashStrInt = specialize THashBase<AnsiString, Integer>;
   THashIntStr = specialize THashBase<Integer, AnsiString>;
   THashStrStr = specialize THashBase<AnsiString, AnsiString>;
+  THashStrVariant = specialize THashBase<AnsiString, Variant>;
 
 
-function hashNewIntInt (): THashIntInt;
-function hashNewStrInt (): THashStrInt;
-function hashNewIntStr (): THashIntStr;
-function hashNewStrStr (): THashStrStr;
+function hashNewIntInt (): THashIntInt; inline;
+function hashNewStrInt (): THashStrInt; inline;
+function hashNewIntStr (): THashIntStr; inline;
+function hashNewStrStr (): THashStrStr; inline;
+function hashNewStrVariant (): THashStrVariant; inline;
 
 
 function u32Hash (a: LongWord): LongWord; inline;
@@ -206,12 +208,13 @@ function hashIntHash (constref k: Integer): LongWord;
 function hashStrEqu (constref a, b: AnsiString): Boolean;
 function hashStrHash (constref k: AnsiString): LongWord;
 procedure hashStrFree (var s: AnsiString);
+procedure hashVariantFree (var v: Variant);
 
 
 implementation
 
 uses
-  SysUtils;
+  SysUtils, Variants;
 
 
 // ////////////////////////////////////////////////////////////////////////// //
@@ -235,6 +238,7 @@ end;
 function hashIntEqu (constref a, b: Integer): Boolean; begin result := (a = b); end;
 function hashStrEqu (constref a, b: AnsiString): Boolean; begin result := (a = b); end;
 procedure hashStrFree (var s: AnsiString); begin s := ''; end;
+procedure hashVariantFree (var v: Variant); begin v := Unassigned; end;
 
 {$PUSH}
 {$RANGECHECKS OFF}
@@ -257,30 +261,36 @@ end;
 {$POP}
 
 
-function hashNewIntInt (): THashIntInt;
+function hashNewIntInt (): THashIntInt; inline;
 begin
   result := THashIntInt.Create(hashIntHash, hashIntEqu);
 end;
 
 
-function hashNewStrInt (): THashStrInt;
+function hashNewStrInt (): THashStrInt; inline;
 begin
   result := THashStrInt.Create(hashStrHash, hashStrEqu, hashStrFree);
 end;
 
 
-function hashNewIntStr (): THashIntStr;
+function hashNewIntStr (): THashIntStr; inline;
 begin
   result := THashIntStr.Create(hashIntHash, hashIntEqu, nil, hashStrFree);
 end;
 
 
-function hashNewStrStr (): THashStrStr;
+function hashNewStrStr (): THashStrStr; inline;
 begin
   result := THashStrStr.Create(hashStrHash, hashStrEqu, hashStrFree, hashStrFree);
 end;
 
 
+function hashNewStrVariant (): THashStrVariant; inline;
+begin
+  result := THashStrVariant.Create(hashStrHash, hashStrEqu, hashStrFree, hashVariantFree);
+end;
+
+
 // ////////////////////////////////////////////////////////////////////////// //
 {$PUSH}
 {$RANGECHECKS OFF}