jcl-checkins-diff Mailing List for JEDI Code Library (Page 64)

Brought to you by: mthoma, obones, outchy, rrossmair

jcl-checkins-diff — SVN file check-in notifications with file differences included

You can subscribe to this list here.

2006	Jan	Feb	Mar	Apr (20)	May (48)	Jun (8)	Jul (23)	Aug (41)	Sep (42)	Oct (22)	Nov (17)	Dec (36)
2007	Jan (43)	Feb (42)	Mar (17)	Apr (39)	May (16)	Jun (35)	Jul (37)	Aug (47)	Sep (49)	Oct (9)	Nov (52)	Dec (37)
2008	Jan (48)	Feb (21)	Mar (7)	Apr (2)	May (5)	Jun (17)	Jul (17)	Aug (40)	Sep (58)	Oct (38)	Nov (19)	Dec (32)
2009	Jan (67)	Feb (46)	Mar (54)	Apr (34)	May (37)	Jun (52)	Jul (67)	Aug (72)	Sep (48)	Oct (35)	Nov (27)	Dec (12)
2010	Jan (56)	Feb (46)	Mar (19)	Apr (14)	May (21)	Jun (3)	Jul (13)	Aug (48)	Sep (34)	Oct (51)	Nov (16)	Dec (32)
2011	Jan (36)	Feb (14)	Mar (12)	Apr (3)	May (5)	Jun (24)	Jul (15)	Aug (30)	Sep (21)	Oct (4)	Nov (25)	Dec (23)
2012	Jan (45)	Feb (42)	Mar (19)	Apr (14)	May (13)	Jun (7)	Jul (3)	Aug (46)	Sep (21)	Oct (10)	Nov (2)	Dec
2013	Jan (5)	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 62 63 64 65 66 .. 92 > >> (Page 64 of 92)

[Jcl-checkins-diff] SF.net SVN: jcl: [2312] trunk/jcl/source/common/JclExprEval.pas

From: <ou...@us...> - 2008-01-23 17:52:59

Revision: 2312
          http://jcl.svn.sourceforge.net/jcl/?rev=2312&view=rev
Author:   outchy
Date:     2008-01-23 09:52:56 -0800 (Wed, 23 Jan 2008)

Log Message:
-----------
compiled evaluator looses precision when loading float constants when precision is Extended.

Modified Paths:
--------------
    trunk/jcl/source/common/JclExprEval.pas

Modified: trunk/jcl/source/common/JclExprEval.pas
===================================================================
--- trunk/jcl/source/common/JclExprEval.pas	2008-01-17 21:11:10 UTC (rev 2311)
+++ trunk/jcl/source/common/JclExprEval.pas	2008-01-23 17:52:56 UTC (rev 2312)
@@ -1180,7 +1180,7 @@
       end;
     etNumber:
       begin
-        Result := NodeFactory.LoadConst64(Lexer.TokenAsNumber);
+        Result := NodeFactory.LoadConst(Lexer.TokenAsNumber);
         Lexer.NextTok;
       end;
   else


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2311] trunk/jcl/source/common

From: <ou...@us...> - 2008-01-17 21:11:13

Revision: 2311
          http://jcl.svn.sourceforge.net/jcl/?rev=2311&view=rev
Author:   outchy
Date:     2008-01-17 13:11:10 -0800 (Thu, 17 Jan 2008)

Log Message:
-----------
updated to latest specifications.

Modified Paths:
--------------
    trunk/jcl/source/common/JclResources.pas
    trunk/jcl/source/common/JclSysInfo.pas

Modified: trunk/jcl/source/common/JclResources.pas
===================================================================
--- trunk/jcl/source/common/JclResources.pas	2008-01-15 22:40:58 UTC (rev 2310)
+++ trunk/jcl/source/common/JclResources.pas	2008-01-17 21:11:10 UTC (rev 2311)
@@ -1798,6 +1798,7 @@
   RsIntelCacheDescr86 = '2nd-level cache: 512 KByte, 4-way set associative, 64 byte line size';
   RsIntelCacheDescr87 = '2nd-level cache: 1 MByte, 8-way set associative, 64 byte line size';
   RsIntelCacheDescrB0 = 'Instruction TLB: 4 KByte pages, 4-way set associative, 128 entries';
+  RsIntelCacheDescrB1 = 'Instruction TLB: 2 MByte pages, 4-way, 8 entries or 4 MByte pages, 4-way, 4 entries';
   RsIntelCacheDescrB3 = 'Data TLB: 4 KByte pages, 4-way set associative, 128 entries';
   RsIntelCacheDescrB4 = 'Data TLB1: 4 KByte pages, 4-way set associative, 256 entries';
   RsIntelCacheDescrF0 = '64-Byte Prefetching';

Modified: trunk/jcl/source/common/JclSysInfo.pas
===================================================================
--- trunk/jcl/source/common/JclSysInfo.pas	2008-01-15 22:40:58 UTC (rev 2310)
+++ trunk/jcl/source/common/JclSysInfo.pas	2008-01-17 21:11:10 UTC (rev 2311)
@@ -617,7 +617,7 @@
   EINTEL_MONITOR = BIT_3;  // Monitor/MWAIT
   EINTEL_DSCPL   = BIT_4;  // CPL Qualified debug Store
   EINTEL_VMX     = BIT_5;  // Virtual Machine Technology
-  EINTEL_BIT_6   = BIT_6;  // Reserved, do not count on value
+  EINTEL_SMX     = BIT_6;  // Safer Mode Extensions
   EINTEL_EST     = BIT_7;  // Enhanced Intel Speedstep technology
   EINTEL_TM2     = BIT_8;  // Thermal monitor 2
   EINTEL_SSSE3   = BIT_9;  // SSSE 3 extensions
@@ -629,7 +629,7 @@
   EINTEL_PDCM    = BIT_15; // Perf/Debug Capability MSR
   EINTEL_BIT_16  = BIT_16; // Reserved, do not count on value
   EINTEL_BIT_17  = BIT_17; // Reserved, do not count on value
-  EINTEL_BIT_18  = BIT_18; // Reserved, do not count on value
+  EINTEL_DCA     = BIT_18; // Direct Cache Access
   EINTEL_SSE4_1  = BIT_19; // Streaming SIMD Extensions 4.1
   EINTEL_SSE4_2  = BIT_20; // Streaming SIMD Extensions 4.2
   EINTEL_BIT_21  = BIT_21; // Reserved, do not count on value
@@ -1155,7 +1155,7 @@
   MXCSR_FZ  = BIT_15;                 // Flush to Zero
 
 const
-  IntelCacheDescription: array [0..63] of TCacheInfo = (
+  IntelCacheDescription: array [0..64] of TCacheInfo = (
     (D: $00; Family: cfOther;                                                                           I: RsIntelCacheDescr00),
     (D: $01; Family: cfInstructionTLB;     Size: 4;     WaysOfAssoc: 4;                Entries: 32;      I: RsIntelCacheDescr01),
     (D: $02; Family: cfInstructionTLB;     Size: 4096;  WaysOfAssoc: 4;                Entries: 2;       I: RsIntelCacheDescr02),
@@ -1216,6 +1216,7 @@
     (D: $86; Family: cfL2Cache;            Size: 512;   WaysOfAssoc: 4;  LineSize: 64;                   I: RsIntelCacheDescr86),
     (D: $87; Family: cfL2Cache;            Size: 1024;  WaysOfAssoc: 8;  LineSize: 64;                   I: RsIntelCacheDescr87),
     (D: $B0; Family: cfInstructionTLB;     Size: 4;     WaysOfAssoc: 4;                 Entries: 128;    I: RsIntelCacheDescrB0),
+    (D: $B1; Family: cfInstructionTLB;     Size: 2048;  WaysOfAssoc: 4;                 Entries: 8;      I: RsIntelCacheDescrB1),
     (D: $B3; Family: cfDataTLB;            Size: 4;     WaysOfAssoc: 4;                 Entries: 128;    I: RsIntelCacheDescrB3),
     (D: $B4; Family: cfDataTLB;            Size: 4;     WaysOfAssoc: 4;                 Entries: 256;    I: RsIntelCacheDescrB4),
     (D: $F0; Family: cfOther;                                                                            I: RsIntelCacheDescrF0),


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2310] trunk/jcl/source

From: <ou...@us...> - 2008-01-15 22:42:59

Revision: 2310
          http://jcl.svn.sourceforge.net/jcl/?rev=2310&view=rev
Author:   outchy
Date:     2008-01-15 14:40:58 -0800 (Tue, 15 Jan 2008)

Log Message:
-----------
fixed hash functions type name.

Modified Paths:
--------------
    trunk/jcl/source/common/JclHashMaps.pas
    trunk/jcl/source/common/JclHashSets.pas
    trunk/jcl/source/prototypes/JclHashMaps.pas
    trunk/jcl/source/prototypes/JclHashSets.pas

Modified: trunk/jcl/source/common/JclHashMaps.pas
===================================================================
--- trunk/jcl/source/common/JclHashMaps.pas	2008-01-15 22:30:26 UTC (rev 2309)
+++ trunk/jcl/source/common/JclHashMaps.pas	2008-01-15 22:40:58 UTC (rev 2310)
@@ -2411,7 +2411,7 @@
     IJclIntfCloneable, IJclCloneable, IJclPackable, IJclContainer, IJclMap<TKey,TValue>, IJclPairOwner<TKey, TValue>)
   private
     FKeyEqualityCompare: TEqualityCompare<TKey>;
-    FKeyHash: THash<TKey>;
+    FKeyHash: THashConvert<TKey>;
     FKeyCompare: TCompare<TKey>;
     FValueEqualityCompare: TEqualityCompare<TValue>;
   protected
@@ -2425,13 +2425,13 @@
     { IJclIntfCloneable }
     function IJclIntfCloneable.Clone = IntfClone;
   public
-    constructor Create(AKeyEqualityCompare: TEqualityCompare<TKey>; AKeyHash: THash<TKey>;
+    constructor Create(AKeyEqualityCompare: TEqualityCompare<TKey>; AKeyHash: THashConvert<TKey>;
       AValueEqualityCompare: TEqualityCompare<TValue>; AKeyCompare: TCompare<TKey>;
       ACapacity: Integer; AOwnsValues: Boolean; AOwnsKeys: Boolean);
 
     property KeyEqualityCompare: TEqualityCompare<TKey> read FKeyEqualityCompare write FKeyEqualityCompare;
     property KeyCompare: TCompare<TKey> read FKeyCompare write FKeyCompare;
-    property KeyHash: THash<TKey> read FKeyHash write FKeyHash;
+    property KeyHash: THashConvert<TKey> read FKeyHash write FKeyHash;
     property ValueEqualityCompare: TEqualityCompare<TValue> read FValueEqualityCompare write FValueEqualityCompare;
   end;
 
@@ -25874,7 +25874,7 @@
 //=== { TJclHashMapF<TKey, TValue> } =========================================
 
 constructor TJclHashMapF<TKey, TValue>.Create(AKeyEqualityCompare: TEqualityCompare<TKey>;
-  AKeyHash: THash<TKey>; AValueEqualityCompare: TEqualityCompare<TValue>; AKeyCompare: TCompare<TKey>;
+  AKeyHash: THashConvert<TKey>; AValueEqualityCompare: TEqualityCompare<TValue>; AKeyCompare: TCompare<TKey>;
   ACapacity: Integer; AOwnsValues: Boolean; AOwnsKeys: Boolean);
 begin
   inherited Create(ACapacity, AOwnsKeys, AOwnsValues);

Modified: trunk/jcl/source/common/JclHashSets.pas
===================================================================
--- trunk/jcl/source/common/JclHashSets.pas	2008-01-15 22:30:26 UTC (rev 2309)
+++ trunk/jcl/source/common/JclHashSets.pas	2008-01-15 22:40:58 UTC (rev 2310)
@@ -834,7 +834,7 @@
     function IJclIntfCloneable.Clone = IntfClone;
   public
     constructor Create(const AEqualityCompare: TEqualityCompare<T>; const AMap: IJclMap<T, TRefUnique>); overload;
-    constructor Create(const AEqualityCompare: TEqualityCompare<T>; const AHash: THash<T>; const ACompare: TCompare<T>;
+    constructor Create(const AEqualityCompare: TEqualityCompare<T>; const AHash: THashConvert<T>; const ACompare: TCompare<T>;
       ACapacity: Integer; AOwnsItems: Boolean); overload;
   end;
 
@@ -5039,7 +5039,7 @@
   SetEqualityCompare(AEqualityCompare);
 end;
 
-constructor TJclHashSetF<T>.Create(const AEqualityCompare: TEqualityCompare<T>; const AHash: THash<T>; const ACompare: TCompare<T>;
+constructor TJclHashSetF<T>.Create(const AEqualityCompare: TEqualityCompare<T>; const AHash: THashConvert<T>; const ACompare: TCompare<T>;
   ACapacity: Integer; AOwnsItems: Boolean);
 begin
   Create(AEqualityCompare, TJclHashMapF<T, TRefUnique>.Create(AEqualityCompare, AHash, EqualityCompareEqObjects, ACompare, ACapacity, AOwnsItems, False));

Modified: trunk/jcl/source/prototypes/JclHashMaps.pas
===================================================================
--- trunk/jcl/source/prototypes/JclHashMaps.pas	2008-01-15 22:30:26 UTC (rev 2309)
+++ trunk/jcl/source/prototypes/JclHashMaps.pas	2008-01-15 22:40:58 UTC (rev 2310)
@@ -490,7 +490,7 @@
     IJclIntfCloneable, IJclCloneable, IJclPackable, IJclContainer, IJclMap<TKey,TValue>, IJclPairOwner<TKey, TValue>)
   private
     FKeyEqualityCompare: TEqualityCompare<TKey>;
-    FKeyHash: THash<TKey>;
+    FKeyHash: THashConvert<TKey>;
     FKeyCompare: TCompare<TKey>;
     FValueEqualityCompare: TEqualityCompare<TValue>;
   protected
@@ -504,13 +504,13 @@
     { IJclIntfCloneable }
     function IJclIntfCloneable.Clone = IntfClone;
   public
-    constructor Create(AKeyEqualityCompare: TEqualityCompare<TKey>; AKeyHash: THash<TKey>;
+    constructor Create(AKeyEqualityCompare: TEqualityCompare<TKey>; AKeyHash: THashConvert<TKey>;
       AValueEqualityCompare: TEqualityCompare<TValue>; AKeyCompare: TCompare<TKey>;
       ACapacity: Integer; AOwnsValues: Boolean; AOwnsKeys: Boolean);
 
     property KeyEqualityCompare: TEqualityCompare<TKey> read FKeyEqualityCompare write FKeyEqualityCompare;
     property KeyCompare: TCompare<TKey> read FKeyCompare write FKeyCompare;
-    property KeyHash: THash<TKey> read FKeyHash write FKeyHash;
+    property KeyHash: THashConvert<TKey> read FKeyHash write FKeyHash;
     property ValueEqualityCompare: TEqualityCompare<TValue> read FValueEqualityCompare write FValueEqualityCompare;
   end;
 
@@ -2863,7 +2863,7 @@
 //=== { TJclHashMapF<TKey, TValue> } =========================================
 
 constructor TJclHashMapF<TKey, TValue>.Create(AKeyEqualityCompare: TEqualityCompare<TKey>;
-  AKeyHash: THash<TKey>; AValueEqualityCompare: TEqualityCompare<TValue>; AKeyCompare: TCompare<TKey>;
+  AKeyHash: THashConvert<TKey>; AValueEqualityCompare: TEqualityCompare<TValue>; AKeyCompare: TCompare<TKey>;
   ACapacity: Integer; AOwnsValues: Boolean; AOwnsKeys: Boolean);
 begin
   inherited Create(ACapacity, AOwnsKeys, AOwnsValues);

Modified: trunk/jcl/source/prototypes/JclHashSets.pas
===================================================================
--- trunk/jcl/source/prototypes/JclHashSets.pas	2008-01-15 22:30:26 UTC (rev 2309)
+++ trunk/jcl/source/prototypes/JclHashSets.pas	2008-01-15 22:40:58 UTC (rev 2310)
@@ -185,7 +185,7 @@
     function IJclIntfCloneable.Clone = IntfClone;
   public
     constructor Create(const AEqualityCompare: TEqualityCompare<T>; const AMap: IJclMap<T, TRefUnique>); overload;
-    constructor Create(const AEqualityCompare: TEqualityCompare<T>; const AHash: THash<T>; const ACompare: TCompare<T>;
+    constructor Create(const AEqualityCompare: TEqualityCompare<T>; const AHash: THashConvert<T>; const ACompare: TCompare<T>;
       ACapacity: Integer; AOwnsItems: Boolean); overload;
   end;
 
@@ -664,7 +664,7 @@
   SetEqualityCompare(AEqualityCompare);
 end;
 
-constructor TJclHashSetF<T>.Create(const AEqualityCompare: TEqualityCompare<T>; const AHash: THash<T>; const ACompare: TCompare<T>;
+constructor TJclHashSetF<T>.Create(const AEqualityCompare: TEqualityCompare<T>; const AHash: THashConvert<T>; const ACompare: TCompare<T>;
   ACapacity: Integer; AOwnsItems: Boolean);
 begin
   Create(AEqualityCompare, TJclHashMapF<T, TRefUnique>.Create(AEqualityCompare, AHash, EqualityCompareEqObjects, ACompare, ACapacity, AOwnsItems, False));


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2309] trunk/jcl/source

From: <ou...@us...> - 2008-01-15 22:31:38

Revision: 2309
          http://jcl.svn.sourceforge.net/jcl/?rev=2309&view=rev
Author:   outchy
Date:     2008-01-15 14:30:26 -0800 (Tue, 15 Jan 2008)

Log Message:
-----------
renamed GetPtr and SetPtr respectively to GetPointer and SetPointer.

Modified Paths:
--------------
    trunk/jcl/source/common/JclAlgorithms.pas
    trunk/jcl/source/common/JclArrayLists.pas
    trunk/jcl/source/common/JclArraySets.pas
    trunk/jcl/source/common/JclBinaryTrees.pas
    trunk/jcl/source/common/JclContainerIntf.pas
    trunk/jcl/source/common/JclLinkedLists.pas
    trunk/jcl/source/common/JclTrees.pas
    trunk/jcl/source/common/JclVectors.pas
    trunk/jcl/source/prototypes/JclAlgorithms.pas
    trunk/jcl/source/prototypes/JclArrayLists.pas
    trunk/jcl/source/prototypes/JclArraySets.pas
    trunk/jcl/source/prototypes/JclBinaryTrees.pas
    trunk/jcl/source/prototypes/JclContainerIntf.pas
    trunk/jcl/source/prototypes/JclLinkedLists.pas
    trunk/jcl/source/prototypes/JclTrees.pas
    trunk/jcl/source/prototypes/JclVectors.pas

Modified: trunk/jcl/source/common/JclAlgorithms.pas
===================================================================
--- trunk/jcl/source/common/JclAlgorithms.pas	2008-01-15 22:20:38 UTC (rev 2308)
+++ trunk/jcl/source/common/JclAlgorithms.pas	2008-01-15 22:30:26 UTC (rev 2309)
@@ -683,7 +683,7 @@
 begin
   for I := Count - 1 downto 0 do
     if First.HasNext then
-      First.SetPtr(F(First.Next))
+      First.SetPointer(F(First.Next))
     else
       Break;
 end;
@@ -1553,7 +1553,7 @@
     if Output.HasNext and First.HasNext then
     begin
       Output.Next;
-      Output.SetPtr(First.Next);
+      Output.SetPointer(First.Next);
     end
     else
       Break;
@@ -1832,7 +1832,7 @@
     if First.HasNext then
     begin
       First.Next;
-      First.SetPtr(APtr);
+      First.SetPointer(APtr);
     end
     else
       Break;
@@ -2020,8 +2020,8 @@
   begin
     Obj := First.Next;
     Last.Previous;
-    First.SetPtr(Last.GetPtr);
-    Last.SetPtr(Obj);
+    First.SetPointer(Last.GetPointer);
+    Last.SetPointer(Obj);
   end;
 end;
 {$ENDIF ~CLR}
@@ -2379,16 +2379,16 @@
     J := R;
     P := (L + R) shr 1;
     repeat
-      Obj := AList.GetPtr(P);
-      while AComparator(AList.GetPtr(I), Obj) < 0 do
+      Obj := AList.GetPointer(P);
+      while AComparator(AList.GetPointer(I), Obj) < 0 do
         Inc(I);
-      while AComparator(AList.GetPtr(J), Obj) > 0 do
+      while AComparator(AList.GetPointer(J), Obj) > 0 do
         Dec(J);
       if I <= J then
       begin
-        Obj := AList.GetPtr(I);
-        AList.SetPtr(I, AList.GetPtr(J));
-        AList.SetPtr(J, Obj);
+        Obj := AList.GetPointer(I);
+        AList.SetPointer(I, AList.GetPointer(J));
+        AList.SetPointer(J, Obj);
         if P = I then
           P := J
         else

Modified: trunk/jcl/source/common/JclArrayLists.pas
===================================================================
--- trunk/jcl/source/common/JclArrayLists.pas	2008-01-15 22:20:38 UTC (rev 2308)
+++ trunk/jcl/source/common/JclArrayLists.pas	2008-01-15 22:30:26 UTC (rev 2309)
@@ -499,11 +499,11 @@
     { IJclPtrList }
     function Insert(Index: Integer; APtr: Pointer): Boolean;
     function InsertAll(Index: Integer; const ACollection: IJclPtrCollection): Boolean;
-    function GetPtr(Index: Integer): Pointer;
+    function GetPointer(Index: Integer): Pointer;
     function IndexOf(APtr: Pointer): Integer;
     function LastIndexOf(APtr: Pointer): Integer;
     function Delete(Index: Integer): Pointer; overload;
-    procedure SetPtr(Index: Integer; APtr: Pointer);
+    procedure SetPointer(Index: Integer; APtr: Pointer);
     function SubList(First, Count: Integer): IJclPtrList;
     function CreateEmptyContainer: TJclAbstractContainerBase; override;
   public
@@ -2310,7 +2310,7 @@
     { IJclPtrIterator }
     function Add(APtr: Pointer): Boolean;
     function Equals(const AIterator: IJclPtrIterator): Boolean;
-    function GetPtr: Pointer;
+    function GetPointer: Pointer;
     function HasNext: Boolean;
     function HasPrevious: Boolean;
     function Insert(APtr: Pointer): Boolean;
@@ -2320,10 +2320,10 @@
     function PreviousIndex: Integer;
     procedure Remove;
     procedure Reset;
-    procedure SetPtr(APtr: Pointer);
+    procedure SetPointer(APtr: Pointer);
     {$IFDEF SUPPORTS_FOR_IN}
     function MoveNext: Boolean;
-    property Current: Pointer read GetPtr;
+    property Current: Pointer read GetPointer;
     {$ENDIF SUPPORTS_FOR_IN}
   public
     constructor Create(const AOwnList: IJclPtrList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
@@ -2379,10 +2379,10 @@
   end;
 end;
 
-function TPtrItr.GetPtr: Pointer;
+function TPtrItr.GetPointer: Pointer;
 begin
   CheckValid;
-  Result := FOwnList.GetPtr(FCursor);
+  Result := FOwnList.GetPointer(FCursor);
 end;
 
 function TPtrItr.HasNext: Boolean;
@@ -2424,7 +2424,7 @@
     Inc(FCursor)
   else
     Valid := True;
-  Result := FOwnList.GetPtr(FCursor);
+  Result := FOwnList.GetPointer(FCursor);
 end;
 
 function TPtrItr.NextIndex: Integer;
@@ -2441,7 +2441,7 @@
     Dec(FCursor)
   else
     Valid := True;
-  Result := FOwnList.GetPtr(FCursor);
+  Result := FOwnList.GetPointer(FCursor);
 end;
 
 function TPtrItr.PreviousIndex: Integer;
@@ -2470,10 +2470,10 @@
   end;
 end;
 
-procedure TPtrItr.SetPtr(APtr: Pointer);
+procedure TPtrItr.SetPointer(APtr: Pointer);
 begin
   CheckValid;
-  FOwnList.SetPtr(FCursor, APtr);
+  FOwnList.SetPointer(FCursor, APtr);
 end;
 {$ENDIF ~CLR}
 
@@ -8453,7 +8453,7 @@
 end;
 {$ENDIF SUPPORTS_FOR_IN}
 
-function TJclPtrArrayList.GetPtr(Index: Integer): Pointer;
+function TJclPtrArrayList.GetPointer(Index: Integer): Pointer;
 begin
   {$IFDEF THREADSAFE}
   ReadLock;
@@ -8697,7 +8697,7 @@
   {$ENDIF THREADSAFE}
 end;
 
-procedure TJclPtrArrayList.SetPtr(Index: Integer; APtr: Pointer);
+procedure TJclPtrArrayList.SetPointer(Index: Integer; APtr: Pointer);
 var
   ReplaceItem: Boolean;
   I: Integer;

Modified: trunk/jcl/source/common/JclArraySets.pas
===================================================================
--- trunk/jcl/source/common/JclArraySets.pas	2008-01-15 22:20:38 UTC (rev 2308)
+++ trunk/jcl/source/common/JclArraySets.pas	2008-01-15 22:30:26 UTC (rev 2309)
@@ -1623,7 +1623,7 @@
     begin
       Idx := BinarySearch(APtr);
       if Idx >= 0 then
-        Result := not ItemsEqual(GetPtr(Idx), APtr) or CheckDuplicate
+        Result := not ItemsEqual(GetPointer(Idx), APtr) or CheckDuplicate
       else
         Result := True;
       if Result then
@@ -1673,7 +1673,7 @@
     CompPos := (HiPos + LoPos) div 2;
     while HiPos >= LoPos do
     begin
-      Comp := ItemsCompare(GetPtr(CompPos), APtr);
+      Comp := ItemsCompare(GetPointer(CompPos), APtr);
       if Comp < 0 then
         LoPos := CompPos + 1
       else
@@ -1704,7 +1704,7 @@
   {$ENDIF THREADSAFE}
     Idx := BinarySearch(APtr);
     if Idx >= 0 then
-      Result := ItemsEqual(GetPtr(Idx), APtr)
+      Result := ItemsEqual(GetPointer(Idx), APtr)
     else
       Result := False;
   {$IFDEF THREADSAFE}

Modified: trunk/jcl/source/common/JclBinaryTrees.pas
===================================================================
--- trunk/jcl/source/common/JclBinaryTrees.pas	2008-01-15 22:20:38 UTC (rev 2308)
+++ trunk/jcl/source/common/JclBinaryTrees.pas	2008-01-15 22:30:26 UTC (rev 2309)
@@ -7404,7 +7404,7 @@
     { IJclPtrIterator }
     function Add(APtr: Pointer): Boolean;
     function Equals(const AIterator: IJclPtrIterator): Boolean;
-    function GetPtr: Pointer;
+    function GetPointer: Pointer;
     function HasNext: Boolean;
     function HasPrevious: Boolean;
     function Insert(APtr: Pointer): Boolean;
@@ -7414,10 +7414,10 @@
     function PreviousIndex: Integer;
     procedure Remove;
     procedure Reset;
-    procedure SetPtr(APtr: Pointer);
+    procedure SetPointer(APtr: Pointer);
     {$IFDEF SUPPORTS_FOR_IN}
     function MoveNext: Boolean;
-    property Current: Pointer read GetPtr;
+    property Current: Pointer read GetPointer;
     {$ENDIF SUPPORTS_FOR_IN}
     { IJclPtrTreeIterator }
     function AddChild(APtr: Pointer): Boolean;
@@ -7582,7 +7582,7 @@
   {$ENDIF THREADSAFE}
 end;
 
-function TPtrItr.GetPtr: Pointer;
+function TPtrItr.GetPointer: Pointer;
 begin
   {$IFDEF THREADSAFE}
   FOwnTree.ReadLock;
@@ -7953,7 +7953,7 @@
   raise EJclOperationNotSupportedError.Create;
 end;
 
-procedure TPtrItr.SetPtr(APtr: Pointer);
+procedure TPtrItr.SetPointer(APtr: Pointer);
 begin
   raise EJclOperationNotSupportedError.Create;
 end;

Modified: trunk/jcl/source/common/JclContainerIntf.pas
===================================================================
--- trunk/jcl/source/common/JclContainerIntf.pas	2008-01-15 22:20:38 UTC (rev 2308)
+++ trunk/jcl/source/common/JclContainerIntf.pas	2008-01-15 22:30:26 UTC (rev 2309)
@@ -975,7 +975,7 @@
     ['{62B5501C-07AA-4D00-A85B-713B39912CDF}']
     function Add(APtr: Pointer): Boolean;
     function Equals(const AIterator: IJclPtrIterator): Boolean;
-    function GetPtr: Pointer;
+    function GetPointer: Pointer;
     function HasNext: Boolean;
     function HasPrevious: Boolean;
     function Insert(APtr: Pointer): Boolean;
@@ -985,10 +985,10 @@
     function PreviousIndex: Integer;
     procedure Remove;
     procedure Reset;
-    procedure SetPtr(APtr: Pointer);
+    procedure SetPointer(APtr: Pointer);
     {$IFDEF SUPPORTS_FOR_IN}
     function MoveNext: Boolean;
-    property Current: Pointer read GetPtr;
+    property Current: Pointer read GetPointer;
     {$ENDIF SUPPORTS_FOR_IN}
   end;
   {$ENDIF ~CLR}
@@ -1767,13 +1767,13 @@
     ['{2CF5CF1F-C012-480C-A4CE-38BDAFB15D05}']
     function Insert(Index: Integer; APtr: Pointer): Boolean;
     function InsertAll(Index: Integer; const ACollection: IJclPtrCollection): Boolean;
-    function GetPtr(Index: Integer): Pointer;
+    function GetPointer(Index: Integer): Pointer;
     function IndexOf(APtr: Pointer): Integer;
     function LastIndexOf(APtr: Pointer): Integer;
     function Delete(Index: Integer): Pointer;
-    procedure SetPtr(Index: Integer; APtr: Pointer);
+    procedure SetPointer(Index: Integer; APtr: Pointer);
     function SubList(First, Count: Integer): IJclPtrList;
-    property Pointers[Key: Integer]: Pointer read GetPtr write SetPtr; default;
+    property Pointers[Key: Integer]: Pointer read GetPointer write SetPointer; default;
   end;
   {$ENDIF ~CLR}
 
@@ -1931,10 +1931,10 @@
   IJclPtrArray = interface(IJclPtrList)
     ['{D43E8D18-26B3-41A2-8D52-ED7EA2FE1AB7}']
     {$IFDEF CLR}
-    function GetPtr(Index: Integer): Pointer;
-    procedure SetPtr(Index: Integer; APtr: Pointer);
+    function GetPointer(Index: Integer): Pointer;
+    procedure SetPointer(Index: Integer; APtr: Pointer);
     {$ENDIF CLR}
-    property Pointers[Index: Integer]: Pointer read GetPtr write SetPtr; default;
+    property Pointers[Index: Integer]: Pointer read GetPointer write SetPointer; default;
   end;
   {$ENDIF ~CLR}
 

Modified: trunk/jcl/source/common/JclLinkedLists.pas
===================================================================
--- trunk/jcl/source/common/JclLinkedLists.pas	2008-01-15 22:20:38 UTC (rev 2308)
+++ trunk/jcl/source/common/JclLinkedLists.pas	2008-01-15 22:30:26 UTC (rev 2309)
@@ -548,11 +548,11 @@
     { IJclPtrList }
     function Insert(Index: Integer; APtr: Pointer): Boolean;
     function InsertAll(Index: Integer; const ACollection: IJclPtrCollection): Boolean;
-    function GetPtr(Index: Integer): Pointer;
+    function GetPointer(Index: Integer): Pointer;
     function IndexOf(APtr: Pointer): Integer;
     function LastIndexOf(APtr: Pointer): Integer;
     function Delete(Index: Integer): Pointer; overload;
-    procedure SetPtr(Index: Integer; APtr: Pointer);
+    procedure SetPointer(Index: Integer; APtr: Pointer);
     function SubList(First, Count: Integer): IJclPtrList;
     { IJclIntfCloneable }
     function IJclIntfCloneable.Clone = IntfClone;
@@ -3699,7 +3699,7 @@
     { IJclPtrIterator }
     function Add(AValue: Pointer): Boolean;
     function Equals(const AIterator: IJclPtrIterator): Boolean;
-    function GetPtr: Pointer;
+    function GetPointer: Pointer;
     function HasNext: Boolean;
     function HasPrevious: Boolean;
     function Insert(AValue: Pointer): Boolean;
@@ -3709,10 +3709,10 @@
     function PreviousIndex: Integer;
     procedure Remove;
     procedure Reset;
-    procedure SetPtr(AValue: Pointer);
+    procedure SetPointer(AValue: Pointer);
     {$IFDEF SUPPORTS_FOR_IN}
     function MoveNext: Boolean;
-    property Current: Pointer read GetPtr;
+    property Current: Pointer read GetPointer;
     {$ENDIF SUPPORTS_FOR_IN}
     { IJclIntfCloneable }
     function IJclIntfCloneable.Clone = IntfClone;
@@ -3772,7 +3772,7 @@
   end;
 end;
 
-function TPtrItr.GetPtr: Pointer;
+function TPtrItr.GetPointer: Pointer;
 begin
   CheckValid;
   Result := nil;
@@ -3996,7 +3996,7 @@
   {$ENDIF THREADSAFE}
 end;
 
-procedure TPtrItr.SetPtr(AValue: Pointer);
+procedure TPtrItr.SetPointer(AValue: Pointer);
 begin
   if FOwnList.ReadOnly then
     raise EJclReadOnlyError.Create;
@@ -12212,7 +12212,7 @@
 end;
 {$ENDIF SUPPORTS_FOR_IN}
 
-function TJclPtrLinkedList.GetPtr(Index: Integer): Pointer;
+function TJclPtrLinkedList.GetPointer(Index: Integer): Pointer;
 var
   Current: TJclPtrLinkedListItem;
 begin
@@ -12613,7 +12613,7 @@
   {$ENDIF THREADSAFE}
 end;
 
-procedure TJclPtrLinkedList.SetPtr(Index: Integer; APtr: Pointer);
+procedure TJclPtrLinkedList.SetPointer(Index: Integer; APtr: Pointer);
 var
   Current: TJclPtrLinkedListItem;
   ReplaceItem: Boolean;

Modified: trunk/jcl/source/common/JclTrees.pas
===================================================================
--- trunk/jcl/source/common/JclTrees.pas	2008-01-15 22:20:38 UTC (rev 2308)
+++ trunk/jcl/source/common/JclTrees.pas	2008-01-15 22:30:26 UTC (rev 2309)
@@ -8019,7 +8019,7 @@
     { IJclPtrIterator }
     function Add(APtr: Pointer): Boolean;
     function Equals(const AIterator: IJclPtrIterator): Boolean;
-    function GetPtr: Pointer;
+    function GetPointer: Pointer;
     function HasNext: Boolean;
     function HasPrevious: Boolean;
     function Insert(APtr: Pointer): Boolean;
@@ -8029,10 +8029,10 @@
     function PreviousIndex: Integer;
     procedure Remove;
     procedure Reset;
-    procedure SetPtr(APtr: Pointer);
+    procedure SetPointer(APtr: Pointer);
     {$IFDEF SUPPORTS_FOR_IN}
     function MoveNext: Boolean;
-    property Current: Pointer read GetPtr;
+    property Current: Pointer read GetPointer;
     {$ENDIF SUPPORTS_FOR_IN}
     { IJclPtrTreeIterator }
     function AddChild(APtr: Pointer): Boolean;
@@ -8276,7 +8276,7 @@
   {$ENDIF THREADSAFE}
 end;
 
-function TPtrItr.GetPtr: Pointer;
+function TPtrItr.GetPointer: Pointer;
 begin
   {$IFDEF THREADSAFE}
   FOwnTree.ReadLock;
@@ -8648,7 +8648,7 @@
   {$ENDIF THREADSAFE}
 end;
 
-procedure TPtrItr.SetPtr(APtr: Pointer);
+procedure TPtrItr.SetPointer(APtr: Pointer);
 begin
   if FOwnTree.ReadOnly then
     raise EJclReadOnlyError.Create;

Modified: trunk/jcl/source/common/JclVectors.pas
===================================================================
--- trunk/jcl/source/common/JclVectors.pas	2008-01-15 22:20:38 UTC (rev 2308)
+++ trunk/jcl/source/common/JclVectors.pas	2008-01-15 22:30:26 UTC (rev 2309)
@@ -502,11 +502,11 @@
     { IJclPtrList }
     function Insert(Index: Integer; APtr: Pointer): Boolean;
     function InsertAll(Index: Integer; const ACollection: IJclPtrCollection): Boolean;
-    function GetPtr(Index: Integer): Pointer;
+    function GetPointer(Index: Integer): Pointer;
     function IndexOf(APtr: Pointer): Integer;
     function LastIndexOf(APtr: Pointer): Integer;
     function Delete(Index: Integer): Pointer; overload;
-    procedure SetPtr(Index: Integer; APtr: Pointer);
+    procedure SetPointer(Index: Integer; APtr: Pointer);
     function SubList(First, Count: Integer): IJclPtrList;
     function CreateEmptyContainer: TJclAbstractContainerBase; override;
   public
@@ -2309,7 +2309,7 @@
     { IJclPtrIterator }
     function Add(APtr: Pointer): Boolean;
     function Equals(const AIterator: IJclPtrIterator): Boolean;
-    function GetPtr: Pointer;
+    function GetPointer: Pointer;
     function HasNext: Boolean;
     function HasPrevious: Boolean;
     function Insert(APtr: Pointer): Boolean;
@@ -2319,10 +2319,10 @@
     function PreviousIndex: Integer;
     procedure Remove;
     procedure Reset;
-    procedure SetPtr(APtr: Pointer);
+    procedure SetPointer(APtr: Pointer);
     {$IFDEF SUPPORTS_FOR_IN}
     function MoveNext: Boolean;
-    property Current: Pointer read GetPtr;
+    property Current: Pointer read GetPointer;
     {$ENDIF SUPPORTS_FOR_IN}
   public
     constructor Create(const OwnList: IJclPtrList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
@@ -2378,10 +2378,10 @@
   end;
 end;
 
-function TPtrItr.GetPtr: Pointer;
+function TPtrItr.GetPointer: Pointer;
 begin
   CheckValid;
-  Result := FOwnList.GetPtr(FCursor);
+  Result := FOwnList.GetPointer(FCursor);
 end;
 
 function TPtrItr.HasNext: Boolean;
@@ -2423,7 +2423,7 @@
     Inc(FCursor)
   else
     Valid := True;
-  Result := FOwnList.GetPtr(FCursor);
+  Result := FOwnList.GetPointer(FCursor);
 end;
 
 function TPtrItr.NextIndex: Integer;
@@ -2440,7 +2440,7 @@
     Dec(FCursor)
   else
     Valid := True;
-  Result := FOwnList.GetPtr(FCursor);
+  Result := FOwnList.GetPointer(FCursor);
 end;
 
 function TPtrItr.PreviousIndex: Integer;
@@ -2469,10 +2469,10 @@
   end;
 end;
 
-procedure TPtrItr.SetPtr(APtr: Pointer);
+procedure TPtrItr.SetPointer(APtr: Pointer);
 begin
   CheckValid;
-  FOwnList.SetPtr(FCursor, APtr);
+  FOwnList.SetPointer(FCursor, APtr);
 end;
 {$ENDIF ~CLR}
 
@@ -7831,7 +7831,7 @@
 end;
 {$ENDIF SUPPORTS_FOR_IN}
 
-function TJclPtrVector.GetPtr(Index: Integer): Pointer;
+function TJclPtrVector.GetPointer(Index: Integer): Pointer;
 begin
   {$IFDEF THREADSAFE}
   ReadLock;
@@ -8067,7 +8067,7 @@
   {$ENDIF THREADSAFE}
 end;
 
-procedure TJclPtrVector.SetPtr(Index: Integer; APtr: Pointer);
+procedure TJclPtrVector.SetPointer(Index: Integer; APtr: Pointer);
 var
   ReplaceItem: Boolean;
   I: Integer;

Modified: trunk/jcl/source/prototypes/JclAlgorithms.pas
===================================================================
--- trunk/jcl/source/prototypes/JclAlgorithms.pas	2008-01-15 22:20:38 UTC (rev 2308)
+++ trunk/jcl/source/prototypes/JclAlgorithms.pas	2008-01-15 22:30:26 UTC (rev 2309)
@@ -533,7 +533,7 @@
 {$JPPEXPANDMACRO APPLYIMP(Apply,IJclInt64Iterator,TInt64ApplyFunction,SetValue)}
 
 {$IFNDEF CLR}
-{$JPPEXPANDMACRO APPLYIMP(Apply,IJclPtrIterator,TPtrApplyFunction,SetPtr)}
+{$JPPEXPANDMACRO APPLYIMP(Apply,IJclPtrIterator,TPtrApplyFunction,SetPointer)}
 {$ENDIF ~CLR}
 
 {$JPPEXPANDMACRO APPLYIMP(Apply,IJclIterator,TApplyFunction,SetObject)}
@@ -649,7 +649,7 @@
 {$JPPEXPANDMACRO COPYIMP(Copy,IJclInt64Iterator,SetValue)}
 
 {$IFNDEF CLR}
-{$JPPEXPANDMACRO COPYIMP(Copy,IJclPtrIterator,SetPtr)}
+{$JPPEXPANDMACRO COPYIMP(Copy,IJclPtrIterator,SetPointer)}
 {$ENDIF ~CLR}
 
 {$JPPEXPANDMACRO COPYIMP(Copy,IJclIterator,SetObject)}
@@ -697,7 +697,7 @@
 {$JPPEXPANDMACRO FILLIMP(Fill,IJclInt64Iterator,const ,AValue,Int64,SetValue)}
 
 {$IFNDEF CLR}
-{$JPPEXPANDMACRO FILLIMP(Fill,IJclPtrIterator,,APtr,Pointer,SetPtr)}
+{$JPPEXPANDMACRO FILLIMP(Fill,IJclPtrIterator,,APtr,Pointer,SetPointer)}
 {$ENDIF ~CLR}
 
 {$JPPEXPANDMACRO FILLIMP(Fill,IJclIterator,,AObject,TObject,SetObject)}
@@ -721,7 +721,7 @@
 {$JPPEXPANDMACRO REVERSEIMP(Reverse,IJclInt64Iterator,Int64,GetValue,SetValue)}
 
 {$IFNDEF CLR}
-{$JPPEXPANDMACRO REVERSEIMP(Reverse,IJclPtrIterator,Pointer,GetPtr,SetPtr)}
+{$JPPEXPANDMACRO REVERSEIMP(Reverse,IJclPtrIterator,Pointer,GetPointer,SetPointer)}
 {$ENDIF ~CLR}
 
 {$JPPEXPANDMACRO REVERSEIMP(Reverse,IJclIterator,TObject,GetObject,SetObject)}
@@ -745,7 +745,7 @@
 {$JPPEXPANDMACRO QUICKSORTIMP(QuickSort,IJclInt64List,L,R,TInt64Compare,Int64,GetValue,SetValue)}
 
 {$IFNDEF CLR}
-{$JPPEXPANDMACRO QUICKSORTIMP(QuickSort,IJclPtrList,L,R,TPtrCompare,Pointer,GetPtr,SetPtr)}
+{$JPPEXPANDMACRO QUICKSORTIMP(QuickSort,IJclPtrList,L,R,TPtrCompare,Pointer,GetPointer,SetPointer)}
 {$ENDIF ~CLR}
 
 {$JPPEXPANDMACRO QUICKSORTIMP(QuickSort,IJclList,L,R,TCompare,TObject,GetObject,SetObject)}

Modified: trunk/jcl/source/prototypes/JclArrayLists.pas
===================================================================
--- trunk/jcl/source/prototypes/JclArrayLists.pas	2008-01-15 22:20:38 UTC (rev 2308)
+++ trunk/jcl/source/prototypes/JclArrayLists.pas	2008-01-15 22:30:26 UTC (rev 2309)
@@ -99,7 +99,7 @@
 
   {$IFNDEF CLR}
 {$JPPEXPANDMACRO JCLARRAYLISTINT(TJclPtrArrayList,TJclPtrAbstractContainer,IJclPtrCollection,IJclPtrList,IJclPtrArray,IJclPtrIterator,JclBase.TDynPointerArray, IJclPtrEqualityComparer\,,,
-    function CreateEmptyContainer: TJclAbstractContainerBase; override;,,,,,APtr,Pointer,GetPtr,SetPtr)}
+    function CreateEmptyContainer: TJclAbstractContainerBase; override;,,,,,APtr,Pointer,GetPointer,SetPointer)}
   {$ENDIF ~CLR}
 
 {$JPPEXPANDMACRO JCLARRAYLISTINT(TJclArrayList,TJclAbstractContainer,IJclCollection,IJclList,IJclArray,IJclIterator,JclBase.TDynObjectArray, IJclObjectOwner\, IJclEqualityComparer\,,,
@@ -219,9 +219,9 @@
 
 {$IFNDEF CLR}
 type
-{$JPPEXPANDMACRO JCLARRAYLISTITRINT(TPtrItr,IJclPtrIterator,IJclPtrList,,APtr,Pointer,GetPtr,SetPtr)}
+{$JPPEXPANDMACRO JCLARRAYLISTITRINT(TPtrItr,IJclPtrIterator,IJclPtrList,,APtr,Pointer,GetPointer,SetPointer)}
 
-{$JPPEXPANDMACRO JCLARRAYLISTITRIMP(TPtrItr,IJclPtrIterator,IJclPtrList,,APtr,Pointer,GetPtr,SetPtr)}
+{$JPPEXPANDMACRO JCLARRAYLISTITRIMP(TPtrItr,IJclPtrIterator,IJclPtrList,,APtr,Pointer,GetPointer,SetPointer)}
 {$ENDIF ~CLR}
 
 type
@@ -334,7 +334,7 @@
   AssignPropertiesTo(Result);
 end;
 }
-{$JPPEXPANDMACRO JCLARRAYLISTIMP(TJclPtrArrayList,,,IJclPtrCollection,IJclPtrIterator,TPtrItr,IJclPtrList,,APtr,GetPtr,SetPtr,FreePointer,Pointer,nil,JclBase.MoveArray)}
+{$JPPEXPANDMACRO JCLARRAYLISTIMP(TJclPtrArrayList,,,IJclPtrCollection,IJclPtrIterator,TPtrItr,IJclPtrList,,APtr,GetPointer,SetPointer,FreePointer,Pointer,nil,JclBase.MoveArray)}
 {$JPPUNDEFMACRO CREATEEMPTYCONTAINER}
 {$ENDIF ~CLR}
 

Modified: trunk/jcl/source/prototypes/JclArraySets.pas
===================================================================
--- trunk/jcl/source/prototypes/JclArraySets.pas	2008-01-15 22:20:38 UTC (rev 2308)
+++ trunk/jcl/source/prototypes/JclArraySets.pas	2008-01-15 22:30:26 UTC (rev 2309)
@@ -268,7 +268,7 @@
   AssignPropertiesTo(Result);
 end;
 }
-(*$JPPEXPANDMACRO JCLARRAYSETIMP(TJclPtrArraySet,IJclPtrCollection,IJclPtrIterator,,APtr,Pointer,nil,GetPtr)*)
+(*$JPPEXPANDMACRO JCLARRAYSETIMP(TJclPtrArraySet,IJclPtrCollection,IJclPtrIterator,,APtr,Pointer,nil,GetPointer)*)
 {$JPPUNDEFMACRO CREATEEMPTYCONTAINER}
 {$ENDIF ~CLR}
 

Modified: trunk/jcl/source/prototypes/JclBinaryTrees.pas
===================================================================
--- trunk/jcl/source/prototypes/JclBinaryTrees.pas	2008-01-15 22:20:38 UTC (rev 2308)
+++ trunk/jcl/source/prototypes/JclBinaryTrees.pas	2008-01-15 22:30:26 UTC (rev 2309)
@@ -220,9 +220,9 @@
 
 {$IFNDEF CLR}
 type
-{$JPPEXPANDMACRO JCLBINARYTREEITRINT(TPtrItr,TPreOrderPtrItr,TInOrderPtrItr,TPostOrderPtrItr,IJclPtrIterator,IJclPtrTreeIterator,IJclPtrBinaryTreeIterator,IJclPtrCollection,IJclPtrEqualityComparer,TJclPtrBinaryNode,,APtr,Pointer,GetPtr,SetPtr)}
+{$JPPEXPANDMACRO JCLBINARYTREEITRINT(TPtrItr,TPreOrderPtrItr,TInOrderPtrItr,TPostOrderPtrItr,IJclPtrIterator,IJclPtrTreeIterator,IJclPtrBinaryTreeIterator,IJclPtrCollection,IJclPtrEqualityComparer,TJclPtrBinaryNode,,APtr,Pointer,GetPointer,SetPointer)}
 
-{$JPPEXPANDMACRO JCLBINARYTREEITRIMP(TPtrItr,TPreOrderPtrItr,TInOrderPtrItr,TPostOrderPtrItr,IJclPtrIterator,IJclPtrCollection,IJclPtrEqualityComparer,TJclPtrBinaryNode,,APtr,Pointer,nil,GetPtr,SetPtr,FreePtr)}
+{$JPPEXPANDMACRO JCLBINARYTREEITRIMP(TPtrItr,TPreOrderPtrItr,TInOrderPtrItr,TPostOrderPtrItr,IJclPtrIterator,IJclPtrCollection,IJclPtrEqualityComparer,TJclPtrBinaryNode,,APtr,Pointer,nil,GetPointer,SetPointer,FreePointer)}
 {$ENDIF ~CLR}
 
 type

Modified: trunk/jcl/source/prototypes/JclContainerIntf.pas
===================================================================
--- trunk/jcl/source/prototypes/JclContainerIntf.pas	2008-01-15 22:20:38 UTC (rev 2308)
+++ trunk/jcl/source/prototypes/JclContainerIntf.pas	2008-01-15 22:30:26 UTC (rev 2309)
@@ -580,7 +580,7 @@
 {$JPPEXPANDMACRO ITERATOR(IJclInt64Iterator,IJclAbstractIterator,573E5A51-BF76-43D7-9F93-46305BED20A8,const ,AValue,Int64,GetValue,SetValue)}
 
   {$IFNDEF CLR}
-{$JPPEXPANDMACRO ITERATOR(IJclPtrIterator,IJclAbstractIterator,62B5501C-07AA-4D00-A85B-713B39912CDF,,APtr,Pointer,GetPtr,SetPtr)}
+{$JPPEXPANDMACRO ITERATOR(IJclPtrIterator,IJclAbstractIterator,62B5501C-07AA-4D00-A85B-713B39912CDF,,APtr,Pointer,GetPointer,SetPointer)}
   {$ENDIF ~CLR}
 
 {$JPPEXPANDMACRO ITERATOR(IJclIterator,IJclAbstractIterator,997DF9B7-9AA2-4239-8B94-14DFFD26D790,,AObject,TObject,GetObject,SetObject)}
@@ -760,7 +760,7 @@
 {$JPPEXPANDMACRO LIST(IJclInt64List,IJclInt64Collection,E8D49200-91D3-4BD0-A59B-B93EC7E2074B,const ,AValue,Int64,GetValue,SetValue,Values)}
 
   {$IFNDEF CLR}
-{$JPPEXPANDMACRO LIST(IJclPtrList,IJclPtrCollection,2CF5CF1F-C012-480C-A4CE-38BDAFB15D05,,APtr,Pointer,GetPtr,SetPtr,Pointers)}
+{$JPPEXPANDMACRO LIST(IJclPtrList,IJclPtrCollection,2CF5CF1F-C012-480C-A4CE-38BDAFB15D05,,APtr,Pointer,GetPointer,SetPointer,Pointers)}
   {$ENDIF ~CLR}
 
 {$JPPEXPANDMACRO LIST(IJclList,IJclCollection,8ABC70AC-5C06-43EA-AFE0-D066379BCC28,,AObject,TObject,GetObject,SetObject,Objects)}
@@ -829,7 +829,7 @@
 {$JPPEXPANDMACRO ARRAY(IJclInt64Array,IJclInt64List,D947C43D-2D04-442A-A707-39EDE7D96FC9,const ,AValue,Int64,GetValue,SetValue,Values)}
 
   {$IFNDEF CLR}
-{$JPPEXPANDMACRO ARRAY(IJclPtrArray,IJclPtrList,D43E8D18-26B3-41A2-8D52-ED7EA2FE1AB7,,APtr,Pointer,GetPtr,SetPtr,Pointers)}
+{$JPPEXPANDMACRO ARRAY(IJclPtrArray,IJclPtrList,D43E8D18-26B3-41A2-8D52-ED7EA2FE1AB7,,APtr,Pointer,GetPointer,SetPointer,Pointers)}
   {$ENDIF ~CLR}
 
 {$JPPEXPANDMACRO ARRAY(IJclArray,IJclList,A69F6D35-54B2-4361-852E-097ED75E648A,,AObject,TObject,GetObject,SetObject,Objects)}

Modified: trunk/jcl/source/prototypes/JclLinkedLists.pas
===================================================================
--- trunk/jcl/source/prototypes/JclLinkedLists.pas	2008-01-15 22:20:38 UTC (rev 2308)
+++ trunk/jcl/source/prototypes/JclLinkedLists.pas	2008-01-15 22:30:26 UTC (rev 2309)
@@ -99,7 +99,7 @@
 
 {$IFNDEF CLR}
 (*$JPPEXPANDMACRO JCLLINKEDLISTINT(TJclPtrLinkedListItem,TJclPtrLinkedList,TJclPtrAbstractContainer,IJclPtrCollection,IJclPtrList,IJclPtrIterator, IJclPtrEqualityComparer\,,,
-    function CreateEmptyContainer: TJclAbstractContainerBase; override;,,,,,APtr,Pointer,GetPtr,SetPtr)*)
+    function CreateEmptyContainer: TJclAbstractContainerBase; override;,,,,,APtr,Pointer,GetPointer,SetPointer)*)
 {$ENDIF ~CLR}
 
 (*$JPPEXPANDMACRO JCLLINKEDLISTINT(TJclLinkedListItem,TJclLinkedList,TJclAbstractContainer,IJclCollection,IJclList,IJclIterator, IJclObjectOwner\, IJclEqualityComparer\,,,
@@ -235,10 +235,10 @@
 
 {$IFNDEF CLR}
 type
-(*$JPPEXPANDMACRO JCLLINKEDLISTITRINT(TPtrItr,IJclPtrIterator,IJclPtrList,IJclPtrEqualityComparer,TJclPtrLinkedListItem,,AValue,Pointer,nil,GetPtr,SetPtr)*)
+(*$JPPEXPANDMACRO JCLLINKEDLISTITRINT(TPtrItr,IJclPtrIterator,IJclPtrList,IJclPtrEqualityComparer,TJclPtrLinkedListItem,,AValue,Pointer,nil,GetPointer,SetPointer)*)
 
 {$JPPDEFINEMACRO ITEMFREE(Item)Item := nil}
-(*$JPPEXPANDMACRO JCLLINKEDLISTITRIMP(TPtrItr,IJclPtrIterator,IJclPtrList,IJclPtrEqualityComparer,TJclPtrLinkedListItem,,AValue,Pointer,nil,GetPtr,SetPtr)*)
+(*$JPPEXPANDMACRO JCLLINKEDLISTITRIMP(TPtrItr,IJclPtrIterator,IJclPtrList,IJclPtrEqualityComparer,TJclPtrLinkedListItem,,AValue,Pointer,nil,GetPointer,SetPointer)*)
 {$JPPUNDEFMACRO ITEMFREE(Item)}
 {$ENDIF ~CLR}
 
@@ -356,7 +356,7 @@
   AssignPropertiesTo(Result);
 end;
 }
-{$JPPEXPANDMACRO JCLLINKEDLISTIMP(TJclPtrLinkedList,TJclPtrLinkedListItem,IJclPtrCollection,IJclPtrList,IJclPtrIterator,TPtrItr,,,,APtr,Pointer,nil,GetPtr,SetPtr,FreePointer)}
+{$JPPEXPANDMACRO JCLLINKEDLISTIMP(TJclPtrLinkedList,TJclPtrLinkedListItem,IJclPtrCollection,IJclPtrList,IJclPtrIterator,TPtrItr,,,,APtr,Pointer,nil,GetPointer,SetPointer,FreePointer)}
 {$JPPUNDEFMACRO CREATEEMPTYCONTAINER}
 {$ENDIF ~CLR}
 

Modified: trunk/jcl/source/prototypes/JclTrees.pas
===================================================================
--- trunk/jcl/source/prototypes/JclTrees.pas	2008-01-15 22:20:38 UTC (rev 2308)
+++ trunk/jcl/source/prototypes/JclTrees.pas	2008-01-15 22:30:26 UTC (rev 2309)
@@ -215,9 +215,9 @@
 
 {$IFNDEF CLR}
 type
-{$JPPEXPANDMACRO JCLTREEITRINT(TPtrItr,TPreOrderPtrItr,TPostOrderPtrItr,TJclPtrTreeNode,TJclPtrTree,IJclPtrIterator,IJclPtrTreeIterator,IJclPtrEqualityComparer,,APtr,Pointer,nil,GetPtr,SetPtr)}
+{$JPPEXPANDMACRO JCLTREEITRINT(TPtrItr,TPreOrderPtrItr,TPostOrderPtrItr,TJclPtrTreeNode,TJclPtrTree,IJclPtrIterator,IJclPtrTreeIterator,IJclPtrEqualityComparer,,APtr,Pointer,nil,GetPointer,SetPointer)}
 
-{$JPPEXPANDMACRO JCLTREEITRIMP(TPtrItr,TPreOrderPtrItr,TPostOrderPtrItr,TJclPtrTreeNode,TJclPtrTree,IJclPtrIterator,IJclPtrTreeIterator,IJclPtrEqualityComparer,,APtr,Pointer,nil,GetPtr,SetPtr,FreePointer)}
+{$JPPEXPANDMACRO JCLTREEITRIMP(TPtrItr,TPreOrderPtrItr,TPostOrderPtrItr,TJclPtrTreeNode,TJclPtrTree,IJclPtrIterator,IJclPtrTreeIterator,IJclPtrEqualityComparer,,APtr,Pointer,nil,GetPointer,SetPointer,FreePointer)}
 {$ENDIF ~CLR}
 
 type

Modified: trunk/jcl/source/prototypes/JclVectors.pas
===================================================================
--- trunk/jcl/source/prototypes/JclVectors.pas	2008-01-15 22:20:38 UTC (rev 2308)
+++ trunk/jcl/source/prototypes/JclVectors.pas	2008-01-15 22:30:26 UTC (rev 2309)
@@ -102,7 +102,7 @@
 
   {$IFNDEF CLR}
 (*$JPPEXPANDMACRO JCLVECTORINT(TJclPtrVector,TJclPtrAbstractContainer,IJclPtrCollection,IJclPtrList,IJclPtrArray,IJclPtrIterator, IJclPtrEqualityComparer\,,,
-    function CreateEmptyContainer: TJclAbstractContainerBase; override;,,,,,APtr,Pointer,nil,JclBase.TDynPointerArray,GetPtr,SetPtr)*)
+    function CreateEmptyContainer: TJclAbstractContainerBase; override;,,,,,APtr,Pointer,nil,JclBase.TDynPointerArray,GetPointer,SetPointer)*)
   {$ENDIF ~CLR}
 
 (*$JPPEXPANDMACRO JCLVECTORINT(TJclVector,TJclAbstractContainer,IJclCollection,IJclList,IJclArray,IJclIterator, IJclObjectOwner\, IJclEqualityComparer\,,,
@@ -218,9 +218,9 @@
 
 {$IFNDEF CLR}
 type
-(*$JPPEXPANDMACRO JCLVECTORITRINT(TPtrItr,IJclPtrIterator,IJclPtrList,,APtr,Pointer,GetPtr,SetPtr)*)
+(*$JPPEXPANDMACRO JCLVECTORITRINT(TPtrItr,IJclPtrIterator,IJclPtrList,,APtr,Pointer,GetPointer,SetPointer)*)
 
-(*$JPPEXPANDMACRO JCLVECTORITRIMP(TPtrItr,IJclPtrIterator,IJclPtrList,,APtr,Pointer,GetPtr,SetPtr)*)
+(*$JPPEXPANDMACRO JCLVECTORITRIMP(TPtrItr,IJclPtrIterator,IJclPtrList,,APtr,Pointer,GetPointer,SetPointer)*)
 {$ENDIF ~CLR}
 
 type
@@ -334,7 +334,7 @@
   AssignPropertiesTo(Result);
 end;
 }
-(*$JPPEXPANDMACRO JCLVECTORIMP(TJclPtrVector,IJclPtrCollection,IJclPtrList,IJclPtrIterator,TPtrItr,,,,APtr,Pointer,nil,GetPtr,SetPtr,FreePointer,JclBase.MoveArray)*)
+(*$JPPEXPANDMACRO JCLVECTORIMP(TJclPtrVector,IJclPtrCollection,IJclPtrList,IJclPtrIterator,TPtrItr,,,,APtr,Pointer,nil,GetPointer,SetPointer,FreePointer,JclBase.MoveArray)*)
 {$JPPUNDEFMACRO CREATEEMPTYCONTAINER}
 {$ENDIF ~CLR}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2308] trunk/jcl/source/jedi.inc

From: <ou...@us...> - 2008-01-15 22:22:41

Revision: 2308
          http://jcl.svn.sourceforge.net/jcl/?rev=2308&view=rev
Author:   outchy
Date:     2008-01-15 14:20:38 -0800 (Tue, 15 Jan 2008)

Log Message:
-----------
fixed CPU386 for .NET: the framework should be processor independent (lol)

Modified Paths:
--------------
    trunk/jcl/source/jedi.inc

Modified: trunk/jcl/source/jedi.inc
===================================================================
--- trunk/jcl/source/jedi.inc	2008-01-15 22:01:28 UTC (rev 2307)
+++ trunk/jcl/source/jedi.inc	2008-01-15 22:20:38 UTC (rev 2308)
@@ -83,8 +83,8 @@
   CPU32 and CPU64 are mostly for generic pointer size dependant differences rather
   than for a specific architecture.
 
-  CPU386              Defined when target platform is x86 (win32)
-  CPUx86_64           Defined when target platform is x86_64 (win64)
+  CPU386              Defined when target platform is native x86 (win32)
+  CPUx86_64           Defined when target platform is native x86_64 (win64)
   CPU32               Defined when target is 32-bit
   CPU64	              Defined when target is 64-bit
 
@@ -427,8 +427,10 @@
   {$IFDEF LINUX}
     {$DEFINE KYLIX}
   {$ENDIF LINUX}
-  {$DEFINE CPU386}  // For Borland compilers select the x86 compat assembler by default
-  {$DEFINE CPU32}   // Assume Borland compilers are 32-bit (rather than 64-bit)
+  {$IFNDEF CLR}
+    {$DEFINE CPU386}  // For Borland compilers select the x86 compat assembler by default
+    {$DEFINE CPU32}   // Assume Borland compilers are 32-bit (rather than 64-bit)
+  {$ENDIF ~CLR}
 {$ENDIF BORLAND}
 
 {------------------------------------------------------------------------------}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2307] trunk/jcl/source

From: <ou...@us...> - 2008-01-15 22:03:17

Revision: 2307
          http://jcl.svn.sourceforge.net/jcl/?rev=2307&view=rev
Author:   outchy
Date:     2008-01-15 14:01:28 -0800 (Tue, 15 Jan 2008)

Log Message:
-----------
JclAlgorithms generated from templates.
Moved basic function types from JclBase.pas and JclAlgorithms.pas to JclContainerIntf.pas.
Improved Reverse and QuickSort algorithms.

Modified Paths:
--------------
    trunk/jcl/source/common/JclAlgorithms.pas
    trunk/jcl/source/common/JclBase.pas
    trunk/jcl/source/common/JclContainerIntf.pas
    trunk/jcl/source/prototypes/JclContainerIntf.pas
    trunk/jcl/source/prototypes/Makefile.mak
    trunk/jcl/source/prototypes/containers/JclContainerIntf.int

Added Paths:
-----------
    trunk/jcl/source/prototypes/JclAlgorithms.pas
    trunk/jcl/source/prototypes/containers/JclAlgorithms.imp
    trunk/jcl/source/prototypes/containers/JclAlgorithms.int

Modified: trunk/jcl/source/common/JclAlgorithms.pas
===================================================================
--- trunk/jcl/source/common/JclAlgorithms.pas	2008-01-14 21:56:35 UTC (rev 2306)
+++ trunk/jcl/source/common/JclAlgorithms.pas	2008-01-15 22:01:28 UTC (rev 2307)
@@ -1,4 +1,8 @@
 {**************************************************************************************************}
+{  WARNING:  JEDI preprocessor generated unit.  Do not edit.                                       }
+{**************************************************************************************************}
+
+{**************************************************************************************************}
 {                                                                                                  }
 { Project JEDI Code Library (JCL)                                                                  }
 {                                                                                                  }
@@ -43,72 +47,6 @@
   {$ENDIF UNITVERSIONING}
   JclBase, JclContainerIntf;
 
-// function pointer types
-type
-  // pointer functions for Apply Algorithms
-  TIntfApplyFunction = function(const AInterface: IInterface): IInterface;
-  TAnsiStrApplyFunction = function(const AString: AnsiString): AnsiString;
-  TWideStrApplyFunction = function(const AString: WideString): WideString;
-  {$IFDEF CONTAINER_ANSISTR}
-  TStrApplyFunction = TAnsiStrApplyFunction;
-  {$ENDIF CONTAINER_ANSISTR}
-  {$IFDEF CONTAINER_WIDESTR}
-  TStrApplyFunction = TWideStrApplyFunction;
-  {$ENDIF CONTAINER_WIDESTR}
-  TSingleApplyFunction = function(const Value: Single): Single;
-  TDoubleApplyFunction = function(const Value: Double): Double;
-  TExtendedApplyFunction = function(const Value: Extended): Extended;
-  {$IFDEF MATH_SINGLE_PRECISION}
-  TFloatApplyFunction = TSingleApplyFunction;
-  {$ENDIF MATH_SINGLE_PRECISION}
-  {$IFDEF MATH_DOUBLE_PRECISION}
-  TFloatApplyFunction = TDoubleApplyFunction;
-  {$ENDIF MATH_DOUBLE_PRECISION}
-  {$IFDEF MATH_EXTENDED_PRECISION}
-  TFloatApplyFunction = TExtendedApplyFunction;
-  {$ENDIF MATH_EXTENDED_PRECISION}
-  TIntegerApplyFunction = function(AValue: Integer): Integer;
-  TCardinalApplyFunction = function(AValue: Cardinal): Cardinal;
-  TInt64ApplyFunction = function(const Value: Int64): Int64;
-  {$IFNDEF CLR}
-  TPtrApplyFunction = function(APtr: Pointer): Pointer;
-  {$ENDIF ~CLR}
-  TApplyFunction = function(AObject: TObject): TObject;
-
-// Apply algorithms
-procedure Apply(const First: IJclIntfIterator; Count: Integer; F: TIntfApplyFunction); overload;
-procedure Apply(const First: IJclAnsiStrIterator; Count: Integer; F: TAnsiStrApplyFunction); overload;
-procedure Apply(const First: IJclWideStrIterator; Count: Integer; F: TWideStrApplyFunction); overload;
-procedure Apply(const First: IJclSingleIterator; Count: Integer; F: TSingleApplyFunction); overload;
-procedure Apply(const First: IJclDoubleIterator; Count: Integer; F: TDoubleApplyFunction); overload;
-procedure Apply(const First: IJclExtendedIterator; Count: Integer; F: TExtendedApplyFunction); overload;
-procedure Apply(const First: IJclIntegerIterator; Count: Integer; F: TIntegerApplyFunction); overload;
-procedure Apply(const First: IJclCardinalIterator; Count: Integer; F: TCardinalApplyFunction); overload;
-procedure Apply(const First: IJclInt64Iterator; Count: Integer; F: TInt64ApplyFunction); overload;
-{$IFNDEF CLR}
-procedure Apply(const First: IJclPtrIterator; Count: Integer; F: TPtrApplyFunction); overload;
-{$ENDIF ~CLR}
-procedure Apply(const First: IJclIterator; Count: Integer; F: TApplyFunction); overload;
-
-type
-  TIntfCompare = JclBase.TIntfCompare;
-  TAnsiStrCompare = JclBase.TAnsiStrCompare;
-  TWideStrCompare = JclBase.TWideStrCompare;
-  {$IFNDEF CONTAINER_NOSTR}
-  TStrCompare = JclBase.TStrCompare;
-  {$ENDIF ~CONTAINER_NOSTR}
-  TSingleCompare = JclBase.TSingleCompare;
-  TDoubleCompare = JclBase.TDoubleCompare;
-  TExtendedCompare = JclBase.TExtendedCompare;
-  TFloatCompare = JclBase.TFloatCompare;
-  TIntegerCompare = JclBase.TIntegerCompare;
-  TCardinalCompare = JclBase.TCardinalCompare;
-  TInt64Compare = JclBase.TInt64Compare;
-  {$IFNDEF CLR}
-  TPtrCompare = JclBase.TPtrCompare;
-  {$ENDIF ~CLR}
-  TCompare = JclBase.TCompare;
-
 // Compare functions
 function IntfSimpleCompare(const Obj1, Obj2: IInterface): Integer;
 function AnsiStrSimpleCompare(const Obj1, Obj2: AnsiString): Integer;
@@ -128,25 +66,6 @@
 
 function IntegerCompare(Obj1, Obj2: TObject): Integer;
 
-type
-  TIntfEqualityCompare = JclBase.TIntfEqualityCompare;
-  TAnsiStrEqualityCompare = JclBase.TAnsiStrEqualityCompare;
-  TWideStrEqualityCompare = JclBase.TWideStrEqualityCompare;
-  {$IFNDEF CONTAINER_NOSTR}
-  TStrEqualityCompare = JclBase.TStrEqualityCompare;
-  {$ENDIF ~CONTAINER_NOSTR}
-  TSingleEqualityCompare = JclBase.TSingleEqualityCompare;
-  TDoubleEqualityCompare = JclBase.TDoubleEqualityCompare;
-  TExtendedEqualityCompare = JclBase.TExtendedEqualityCompare;
-  TFloatEqualityCompare = JclBase.TFloatEqualityCompare;
-  TIntegerEqualityCompare = JclBase.TIntegerEqualityCompare;
-  TCardinalEqualityCompare = JclBase.TCardinalEqualityCompare;
-  TInt64EqualityCompare = JclBase.TInt64EqualityCompare;
-  {$IFNDEF CLR}
-  TPtrEqualityCompare = JclBase.TPtrEqualityCompare;
-  {$ENDIF ~CLR}
-  TEqualityCompare = JclBase.TEqualityCompare;
-
 // Compare functions for equality
 function IntfSimpleEqualityCompare(const Obj1, Obj2: IInterface): Boolean;
 function AnsiStrSimpleEqualityCompare(const Obj1, Obj2: AnsiString): Boolean;
@@ -164,18 +83,33 @@
 {$ENDIF ~CLR}
 function SimpleEqualityCompare(Obj1, Obj2: TObject): Boolean;
 
+// Apply algorithms
+procedure Apply(const First: IJclIntfIterator; Count: Integer; F: TIntfApplyFunction); overload;
+procedure Apply(const First: IJclAnsiStrIterator; Count: Integer; F: TAnsiStrApplyFunction); overload;
+procedure Apply(const First: IJclWideStrIterator; Count: Integer; F: TWideStrApplyFunction); overload;
+procedure Apply(const First: IJclSingleIterator; Count: Integer; F: TSingleApplyFunction); overload;
+procedure Apply(const First: IJclDoubleIterator; Count: Integer; F: TDoubleApplyFunction); overload;
+procedure Apply(const First: IJclExtendedIterator; Count: Integer; F: TExtendedApplyFunction); overload;
+procedure Apply(const First: IJclIntegerIterator; Count: Integer; F: TIntegerApplyFunction); overload;
+procedure Apply(const First: IJclCardinalIterator; Count: Integer; F: TCardinalApplyFunction); overload;
+procedure Apply(const First: IJclInt64Iterator; Count: Integer; F: TInt64ApplyFunction); overload;
+{$IFNDEF CLR}
+procedure Apply(const First: IJclPtrIterator; Count: Integer; F: TPtrApplyFunction); overload;
+{$ENDIF ~CLR}
+procedure Apply(const First: IJclIterator; Count: Integer; F: TApplyFunction); overload;
+
 // Find algorithms
 function Find(const First: IJclIntfIterator; Count: Integer; const AInterface: IInterface;
   AComparator: TIntfCompare): IJclIntfIterator; overload;
 function Find(const First: IJclIntfIterator; Count: Integer; const AInterface: IInterface;
   AEqualityComparator: TIntfEqualityCompare): IJclIntfIterator; overload;
-function Find(const First: IJclAnsiStrIterator; Count: Integer; const AString: string;
+function Find(const First: IJclAnsiStrIterator; Count: Integer; const AString: AnsiString;
   AComparator: TAnsiStrCompare): IJclAnsiStrIterator; overload;
-function Find(const First: IJclAnsiStrIterator; Count: Integer; const AString: string;
+function Find(const First: IJclAnsiStrIterator; Count: Integer; const AString: AnsiString;
   AEqualityComparator: TAnsiStrEqualityCompare): IJclAnsiStrIterator; overload;
-function Find(const First: IJclWideStrIterator; Count: Integer; const AString: string;
+function Find(const First: IJclWideStrIterator; Count: Integer; const AString: WideString;
   AComparator: TWideStrCompare): IJclWideStrIterator; overload;
-function Find(const First: IJclWideStrIterator; Count: Integer; const AString: string;
+function Find(const First: IJclWideStrIterator; Count: Integer; const AString: WideString;
   AEqualityComparator: TWideStrEqualityCompare): IJclWideStrIterator; overload;
 function Find(const First: IJclSingleIterator; Count: Integer; const AValue: Single;
   AComparator: TSingleCompare): IJclSingleIterator; overload;
@@ -225,40 +159,40 @@
   const AString: WideString; AComparator: TWideStrCompare): Integer; overload;
 function CountObject(const First: IJclWideStrIterator; Count: Integer;
   const AString: WideString; AEqualityComparator: TWideStrEqualityCompare): Integer; overload;
-function CountObject(const First: IJclSingleIterator; Count: Integer; const AValue: Single;
-  AComparator: TSingleCompare): Integer; overload;
-function CountObject(const First: IJclSingleIterator; Count: Integer; const AValue: Single;
-  AEqualityComparator: TSingleEqualityCompare): Integer; overload;
-function CountObject(const First: IJclDoubleIterator; Count: Integer; const AValue: Double;
-  AComparator: TDoubleCompare): Integer; overload;
-function CountObject(const First: IJclDoubleIterator; Count: Integer; const AValue: Double;
-  AEqualityComparator: TDoubleEqualityCompare): Integer; overload;
-function CountObject(const First: IJclExtendedIterator; Count: Integer; const AValue: Extended;
-  AComparator: TExtendedCompare): Integer; overload;
-function CountObject(const First: IJclExtendedIterator; Count: Integer; const AValue: Extended;
-  AEqualityComparator: TExtendedEqualityCompare): Integer; overload;
-function CountObject(const First: IJclIntegerIterator; Count: Integer; AValue: Integer;
-  AComparator: TIntegerCompare): Integer; overload;
-function CountObject(const First: IJclIntegerIterator; Count: Integer; AValue: Integer;
-  AEqualityComparator: TIntegerEqualityCompare): Integer; overload;
-function CountObject(const First: IJclCardinalIterator; Count: Integer; AValue: Cardinal;
-  AComparator: TCardinalCompare): Integer; overload;
-function CountObject(const First: IJclCardinalIterator; Count: Integer; AValue: Cardinal;
-  AEqualityComparator: TCardinalEqualityCompare): Integer; overload;
-function CountObject(const First: IJclInt64Iterator; Count: Integer; const AValue: Int64;
-  AComparator: TInt64Compare): Integer; overload;
-function CountObject(const First: IJclInt64Iterator; Count: Integer; const AValue: Int64;
-  AEqualityComparator: TInt64EqualityCompare): Integer; overload;
+function CountObject(const First: IJclSingleIterator; Count: Integer;
+  const AValue: Single; AComparator: TSingleCompare): Integer; overload;
+function CountObject(const First: IJclSingleIterator; Count: Integer;
+  const AValue: Single; AEqualityComparator: TSingleEqualityCompare): Integer; overload;
+function CountObject(const First: IJclDoubleIterator; Count: Integer;
+  const AValue: Double; AComparator: TDoubleCompare): Integer; overload;
+function CountObject(const First: IJclDoubleIterator; Count: Integer;
+  const AValue: Double; AEqualityComparator: TDoubleEqualityCompare): Integer; overload;
+function CountObject(const First: IJclExtendedIterator; Count: Integer;
+  const AValue: Extended; AComparator: TExtendedCompare): Integer; overload;
+function CountObject(const First: IJclExtendedIterator; Count: Integer;
+  const AValue: Extended; AEqualityComparator: TExtendedEqualityCompare): Integer; overload;
+function CountObject(const First: IJclIntegerIterator; Count: Integer;
+  AValue: Integer; AComparator: TIntegerCompare): Integer; overload;
+function CountObject(const First: IJclIntegerIterator; Count: Integer;
+  AValue: Integer; AEqualityComparator: TIntegerEqualityCompare): Integer; overload;
+function CountObject(const First: IJclCardinalIterator; Count: Integer;
+  AValue: Cardinal; AComparator: TCardinalCompare): Integer; overload;
+function CountObject(const First: IJclCardinalIterator; Count: Integer;
+  AValue: Cardinal; AEqualityComparator: TCardinalEqualityCompare): Integer; overload;
+function CountObject(const First: IJclInt64Iterator; Count: Integer;
+  const AValue: Int64; AComparator: TInt64Compare): Integer; overload;
+function CountObject(const First: IJclInt64Iterator; Count: Integer;
+  const AValue: Int64; AEqualityComparator: TInt64EqualityCompare): Integer; overload;
 {$IFNDEF CLR}
-function CountObject(const First: IJclPtrIterator; Count: Integer; APtr: Pointer;
-  AComparator: TPtrCompare): Integer; overload;
-function CountObject(const First: IJclPtrIterator; Count: Integer; APtr: Pointer;
-  AEqualityComparator: TPtrEqualityCompare): Integer; overload;
+function CountObject(const First: IJclPtrIterator; Count: Integer;
+  APtr: Pointer; AComparator: TPtrCompare): Integer; overload;
+function CountObject(const First: IJclPtrIterator; Count: Integer;
+  APtr: Pointer; AEqualityComparator: TPtrEqualityCompare): Integer; overload;
 {$ENDIF ~CLR}
-function CountObject(const First: IJclIterator; Count: Integer; AObject: TObject;
-  AComparator: TCompare): Integer; overload;
-function CountObject(const First: IJclIterator; Count: Integer; AObject: TObject;
-  AEqualityComparator: TEqualityCompare): Integer; overload;
+function CountObject(const First: IJclIterator; Count: Integer;
+  AObject: TObject; AComparator: TCompare): Integer; overload;
+function CountObject(const First: IJclIterator; Count: Integer;
+  AObject: TObject; AEqualityComparator: TEqualityCompare): Integer; overload;
 
 // Copy algorithms
 procedure Copy(const First: IJclIntfIterator; Count: Integer;
@@ -331,28 +265,6 @@
 {$ENDIF CLR}
 procedure Reverse(const First, Last: IJclIterator); overload;
 
-type
-  // Pointer functions for sort algorithms
-  TIntfSortProc = procedure(const AList: IJclIntfList; L, R: Integer; AComparator: TIntfCompare);
-  TAnsiStrSortProc = procedure(const AList: IJclAnsiStrList; L, R: Integer; AComparator: TAnsiStrCompare);
-  TWideStrSortProc = procedure(const AList: IJclWideStrList; L, R: Integer; AComparator: TWideStrCompare);
-  {$IFDEF CONTAINER_ANSISTR}
-  TStrSortProc = TAnsiStrSortProc;
-  {$ENDIF CONTAINER_ANSISTR}
-  {$IFDEF CONTAINER_WIDESTR}
-  TStrSortProc = TWideStrSortProc;
-  {$ENDIF CONTAINER_WIDESTR}
-  TSingleSortProc = procedure(const AList: IJclSingleList; L, R: Integer; AComparator: TSingleCompare);
-  TDoubleSortProc = procedure(const AList: IJclDoubleList; L, R: Integer; AComparator: TDoubleCompare);
-  TExtendedSortProc = procedure(const AList: IJclExtendedList; L, R: Integer; AComparator: TExtendedCompare);
-  TIntegerSortProc = procedure(const AList: IJclIntegerList; L, R: Integer; AComparator: TIntegerCompare);
-  TCardinalSortProc = procedure(const AList: IJclCardinalList; L, R: Integer; AComparator: TCardinalCompare);
-  TInt64SortProc = procedure(const AList: IJclInt64List; L, R: Integer; AComparator: TInt64Compare);
-  {$IFNDEF CLR}
-  TPtrSortProc = procedure(const AList: IJclPtrList; L, R: Integer; AComparator: TPtrCompare);
-  {$ENDIF ~CLR}
-  TSortProc = procedure(const AList: IJclList; L, R: Integer; AComparator: TCompare);
-
 procedure QuickSort(const AList: IJclIntfList; L, R: Integer; AComparator: TIntfCompare); overload;
 procedure QuickSort(const AList: IJclAnsiStrList; L, R: Integer; AComparator: TAnsiStrCompare); overload;
 procedure QuickSort(const AList: IJclWideStrList; L, R: Integer; AComparator: TWideStrCompare); overload;
@@ -399,26 +311,27 @@
 
 {$IFDEF SUPPORTS_GENERICS}
 type
-  TApplyFunction<T> = function(AItem: T): T;
-  THash<T> = function(AItem: T): Integer;
-  TSortProc<T> = procedure(const AList: IJclList<T>; L, R: Integer; AComparator: TCompare<T>);
-
   // cannot implement generic global functions
   TJclAlgorithms<T> = class
   private
     //FSortProc: TSortProc;
   public
     class procedure Apply(const First: IJclIterator<T>; Count: Integer; F: TApplyFunction<T>);
-    class function Find(const First: IJclIterator<T>; Count: Integer; AItem: T;
-      AComparator: TCompare<T>): IJclIterator<T>;
-    class function CountObject(const First: IJclIterator<T>; Count: Integer; AItem: T;
-      AComparator: TCompare<T>): Integer;
-    class procedure Copy(const First: IJclIterator<T>; Count: Integer; const Output: IJclIterator<T>);
-    class procedure Generate(const List: IJclList<T>; Count: Integer; AItem: T);
-    class procedure Fill(const First: IJclIterator<T>; Count: Integer; AItem: T);
+    class function Find(const First: IJclIterator<T>; Count: Integer; const AItem: T;
+  AComparator: TCompare<T>): IJclIterator<T>; overload;
+    class function Find(const First: IJclIterator<T>; Count: Integer; const AItem: T;
+  AEqualityComparator: TEqualityCompare<T>): IJclIterator<T>; overload;
+    class function CountObject(const First: IJclIterator<T>; Count: Integer;
+  const AItem: T; AComparator: TCompare<T>): Integer; overload;
+    class function CountObject(const First: IJclIterator<T>; Count: Integer;
+  const AItem: T; AEqualityComparator: TEqualityCompare<T>): Integer; overload;
+    class procedure Copy(const First: IJclIterator<T>; Count: Integer;
+  const Output: IJclIterator<T>);
+    class procedure Generate(const List: IJclList<T>; Count: Integer; const AItem: T);
+    class procedure Fill(const First: IJclIterator<T>; Count: Integer; const AItem: T);
     class procedure Reverse(const First, Last: IJclIterator<T>);
     class procedure QuickSort(const AList: IJclList<T>; L, R: Integer; AComparator: TCompare<T>);
-    //class procedure Sort(const AList: IJclList<T>; First, Last: Integer; AComparator: TCompare<T>);
+    class procedure Sort(const AList: IJclList<T>; First, Last: Integer; AComparator: TCompare<T>);
     //class property SortProc: TSortProc<T> read FSortProc write FSortProc;
   end;
 {$ENDIF SUPPORTS_GENERICS}
@@ -826,7 +739,7 @@
 end;
 
 function Find(const First: IJclAnsiStrIterator; Count: Integer;
-  const AString: string; AComparator: TAnsiStrCompare): IJclAnsiStrIterator;
+  const AString: AnsiString; AComparator: TAnsiStrCompare): IJclAnsiStrIterator;
 var
   I: Integer;
 begin
@@ -845,7 +758,7 @@
 end;
 
 function Find(const First: IJclAnsiStrIterator; Count: Integer;
-  const AString: string; AEqualityComparator: TAnsiStrEqualityCompare): IJclAnsiStrIterator;
+  const AString: AnsiString; AEqualityComparator: TAnsiStrEqualityCompare): IJclAnsiStrIterator;
 var
   I: Integer;
 begin
@@ -864,7 +777,7 @@
 end;
 
 function Find(const First: IJclWideStrIterator; Count: Integer;
-  const AString: string; AComparator: TWideStrCompare): IJclWideStrIterator;
+  const AString: WideString; AComparator: TWideStrCompare): IJclWideStrIterator;
 var
   I: Integer;
 begin
@@ -883,7 +796,7 @@
 end;
 
 function Find(const First: IJclWideStrIterator; Count: Integer;
-  const AString: string; AEqualityComparator: TWideStrEqualityCompare): IJclWideStrIterator;
+  const AString: WideString; AEqualityComparator: TWideStrEqualityCompare): IJclWideStrIterator;
 var
   I: Integer;
 begin
@@ -901,8 +814,8 @@
       Break;
 end;
 
-function Find(const First: IJclSingleIterator; Count: Integer; const AValue: Single;
-  AComparator: TSingleCompare): IJclSingleIterator;
+function Find(const First: IJclSingleIterator; Count: Integer;
+  const AValue: Single; AComparator: TSingleCompare): IJclSingleIterator;
 var
   I: Integer;
 begin
@@ -920,8 +833,8 @@
       Break;
 end;
 
-function Find(const First: IJclSingleIterator; Count: Integer; const AValue: Single;
-  AEqualityComparator: TSingleEqualityCompare): IJclSingleIterator;
+function Find(const First: IJclSingleIterator; Count: Integer;
+  const AValue: Single; AEqualityComparator: TSingleEqualityCompare): IJclSingleIterator;
 var
   I: Integer;
 begin
@@ -939,8 +852,8 @@
       Break;
 end;
 
-function Find(const First: IJclDoubleIterator; Count: Integer; const AValue: Double;
-  AComparator: TDoubleCompare): IJclDoubleIterator;
+function Find(const First: IJclDoubleIterator; Count: Integer;
+  const AValue: Double; AComparator: TDoubleCompare): IJclDoubleIterator;
 var
   I: Integer;
 begin
@@ -958,8 +871,8 @@
       Break;
 end;
 
-function Find(const First: IJclDoubleIterator; Count: Integer; const AValue: Double;
-  AEqualityComparator: TDoubleEqualityCompare): IJclDoubleIterator;
+function Find(const First: IJclDoubleIterator; Count: Integer;
+  const AValue: Double; AEqualityComparator: TDoubleEqualityCompare): IJclDoubleIterator;
 var
   I: Integer;
 begin
@@ -977,8 +890,8 @@
       Break;
 end;
 
-function Find(const First: IJclExtendedIterator; Count: Integer; const AValue: Extended;
-  AComparator: TExtendedCompare): IJclExtendedIterator;
+function Find(const First: IJclExtendedIterator; Count: Integer;
+  const AValue: Extended; AComparator: TExtendedCompare): IJclExtendedIterator;
 var
   I: Integer;
 begin
@@ -996,8 +909,8 @@
       Break;
 end;
 
-function Find(const First: IJclExtendedIterator; Count: Integer; const AValue: Extended;
-  AEqualityComparator: TExtendedEqualityCompare): IJclExtendedIterator;
+function Find(const First: IJclExtendedIterator; Count: Integer;
+  const AValue: Extended; AEqualityComparator: TExtendedEqualityCompare): IJclExtendedIterator;
 var
   I: Integer;
 begin
@@ -1015,8 +928,8 @@
       Break;
 end;
 
-function Find(const First: IJclIntegerIterator; Count: Integer; AValue: Integer;
-  AComparator: TIntegerCompare): IJclIntegerIterator;
+function Find(const First: IJclIntegerIterator; Count: Integer;
+  AValue: Integer; AComparator: TIntegerCompare): IJclIntegerIterator;
 var
   I: Integer;
 begin
@@ -1034,8 +947,8 @@
       Break;
 end;
 
-function Find(const First: IJclIntegerIterator; Count: Integer; AValue: Integer;
-  AEqualityComparator: TIntegerEqualityCompare): IJclIntegerIterator;
+function Find(const First: IJclIntegerIterator; Count: Integer;
+  AValue: Integer; AEqualityComparator: TIntegerEqualityCompare): IJclIntegerIterator;
 var
   I: Integer;
 begin
@@ -1053,8 +966,8 @@
       Break;
 end;
 
-function Find(const First: IJclCardinalIterator; Count: Integer; AValue: Cardinal;
-  AComparator: TCardinalCompare): IJclCardinalIterator;
+function Find(const First: IJclCardinalIterator; Count: Integer;
+  AValue: Cardinal; AComparator: TCardinalCompare): IJclCardinalIterator;
 var
   I: Integer;
 begin
@@ -1072,8 +985,8 @@
       Break;
 end;
 
-function Find(const First: IJclCardinalIterator; Count: Integer; AValue: Cardinal;
-  AEqualityComparator: TCardinalEqualityCompare): IJclCardinalIterator;
+function Find(const First: IJclCardinalIterator; Count: Integer;
+  AValue: Cardinal; AEqualityComparator: TCardinalEqualityCompare): IJclCardinalIterator;
 var
   I: Integer;
 begin
@@ -1091,8 +1004,8 @@
       Break;
 end;
 
-function Find(const First: IJclInt64Iterator; Count: Integer; const AValue: Int64;
-  AComparator: TInt64Compare): IJclInt64Iterator;
+function Find(const First: IJclInt64Iterator; Count: Integer;
+  const AValue: Int64; AComparator: TInt64Compare): IJclInt64Iterator;
 var
   I: Integer;
 begin
@@ -1110,8 +1023,8 @@
       Break;
 end;
 
-function Find(const First: IJclInt64Iterator; Count: Integer; const AValue: Int64;
-  AEqualityComparator: TInt64EqualityCompare): IJclInt64Iterator;
+function Find(const First: IJclInt64Iterator; Count: Integer;
+  const AValue: Int64; AEqualityComparator: TInt64EqualityCompare): IJclInt64Iterator;
 var
   I: Integer;
 begin
@@ -1130,8 +1043,8 @@
 end;
 
 {$IFNDEF CLR}
-function Find(const First: IJclPtrIterator; Count: Integer; APtr: Pointer;
-  AComparator: TPtrCompare): IJclPtrIterator;
+function Find(const First: IJclPtrIterator; Count: Integer;
+  APtr: Pointer; AComparator: TPtrCompare): IJclPtrIterator;
 var
   I: Integer;
 begin
@@ -1149,8 +1062,8 @@
       Break;
 end;
 
-function Find(const First: IJclPtrIterator; Count: Integer; APtr: Pointer;
-  AEqualityComparator: TPtrEqualityCompare): IJclPtrIterator;
+function Find(const First: IJclPtrIterator; Count: Integer;
+  APtr: Pointer; AEqualityComparator: TPtrEqualityCompare): IJclPtrIterator;
 var
   I: Integer;
 begin
@@ -1169,8 +1082,8 @@
 end;
 {$ENDIF ~CLR}
 
-function Find(const First: IJclIterator; Count: Integer; AObject: TObject;
-  AComparator: TCompare): IJclIterator;
+function Find(const First: IJclIterator; Count: Integer;
+  AObject: TObject; AComparator: TCompare): IJclIterator;
 var
   I: Integer;
 begin
@@ -1188,8 +1101,8 @@
       Break;
 end;
 
-function Find(const First: IJclIterator; Count: Integer; AObject: TObject;
-  AEqualityComparator: TEqualityCompare): IJclIterator;
+function Find(const First: IJclIterator; Count: Integer;
+  AObject: TObject; AEqualityComparator: TEqualityCompare): IJclIterator;
 var
   I: Integer;
 begin
@@ -1285,8 +1198,8 @@
       Break;
 end;
 
-function CountObject(const First: IJclSingleIterator; Count: Integer; const AValue: Single;
-  AComparator: TSingleCompare): Integer;
+function CountObject(const First: IJclSingleIterator; Count: Integer;
+  const AValue: Single; AComparator: TSingleCompare): Integer;
 var
   I: Integer;
 begin
@@ -1298,8 +1211,8 @@
       Break;
 end;
 
-function CountObject(const First: IJclSingleIterator; Count: Integer; const AValue: Single;
-  AEqualityComparator: TSingleEqualityCompare): Integer;
+function CountObject(const First: IJclSingleIterator; Count: Integer;
+  const AValue: Single; AEqualityComparator: TSingleEqualityCompare): Integer;
 var
   I: Integer;
 begin
@@ -1311,8 +1224,8 @@
       Break;
 end;
 
-function CountObject(const First: IJclDoubleIterator; Count: Integer; const AValue: Double;
-  AComparator: TDoubleCompare): Integer;
+function CountObject(const First: IJclDoubleIterator; Count: Integer;
+  const AValue: Double; AComparator: TDoubleCompare): Integer;
 var
   I: Integer;
 begin
@@ -1324,8 +1237,8 @@
       Break;
 end;
 
-function CountObject(const First: IJclDoubleIterator; Count: Integer; const AValue: Double;
-  AEqualityComparator: TDoubleEqualityCompare): Integer;
+function CountObject(const First: IJclDoubleIterator; Count: Integer;
+  const AValue: Double; AEqualityComparator: TDoubleEqualityCompare): Integer;
 var
   I: Integer;
 begin
@@ -1337,8 +1250,8 @@
       Break;
 end;
 
-function CountObject(const First: IJclExtendedIterator; Count: Integer; const AValue: Extended;
-  AComparator: TExtendedCompare): Integer;
+function CountObject(const First: IJclExtendedIterator; Count: Integer;
+  const AValue: Extended; AComparator: TExtendedCompare): Integer;
 var
   I: Integer;
 begin
@@ -1350,8 +1263,8 @@
       Break;
 end;
 
-function CountObject(const First: IJclExtendedIterator; Count: Integer; const AValue: Extended;
-  AEqualityComparator: TExtendedEqualityCompare): Integer;
+function CountObject(const First: IJclExtendedIterator; Count: Integer;
+  const AValue: Extended; AEqualityComparator: TExtendedEqualityCompare): Integer;
 var
   I: Integer;
 begin
@@ -1363,8 +1276,8 @@
       Break;
 end;
 
-function CountObject(const First: IJclIntegerIterator; Count: Integer; AValue: Integer;
-  AComparator: TIntegerCompare): Integer;
+function CountObject(const First: IJclIntegerIterator; Count: Integer;
+  AValue: Integer; AComparator: TIntegerCompare): Integer;
 var
   I: Integer;
 begin
@@ -1376,8 +1289,8 @@
       Break;
 end;
 
-function CountObject(const First: IJclIntegerIterator; Count: Integer; AValue: Integer;
-  AEqualityComparator: TIntegerEqualityCompare): Integer;
+function CountObject(const First: IJclIntegerIterator; Count: Integer;
+  AValue: Integer; AEqualityComparator: TIntegerEqualityCompare): Integer;
 var
   I: Integer;
 begin
@@ -1389,8 +1302,8 @@
       Break;
 end;
 
-function CountObject(const First: IJclCardinalIterator; Count: Integer; AValue: Cardinal;
-  AComparator: TCardinalCompare): Integer;
+function CountObject(const First: IJclCardinalIterator; Count: Integer;
+  AValue: Cardinal; AComparator: TCardinalCompare): Integer;
 var
   I: Integer;
 begin
@@ -1402,8 +1315,8 @@
       Break;
 end;
 
-function CountObject(const First: IJclCardinalIterator; Count: Integer; AValue: Cardinal;
-  AEqualityComparator: TCardinalEqualityCompare): Integer;
+function CountObject(const First: IJclCardinalIterator; Count: Integer;
+  AValue: Cardinal; AEqualityComparator: TCardinalEqualityCompare): Integer;
 var
   I: Integer;
 begin
@@ -1415,8 +1328,8 @@
       Break;
 end;
 
-function CountObject(const First: IJclInt64Iterator; Count: Integer; const AValue: Int64;
-  AComparator: TInt64Compare): Integer;
+function CountObject(const First: IJclInt64Iterator; Count: Integer;
+  const AValue: Int64; AComparator: TInt64Compare): Integer;
 var
   I: Integer;
 begin
@@ -1428,8 +1341,8 @@
       Break;
 end;
 
-function CountObject(const First: IJclInt64Iterator; Count: Integer; const AValue: Int64;
-  AEqualityComparator: TInt64EqualityCompare): Integer;
+function CountObject(const First: IJclInt64Iterator; Count: Integer;
+  const AValue: Int64; AEqualityComparator: TInt64EqualityCompare): Integer;
 var
   I: Integer;
 begin
@@ -1442,8 +1355,8 @@
 end;
 
 {$IFNDEF CLR}
-function CountObject(const First: IJclPtrIterator; Count: Integer; APtr: Pointer;
-  AComparator: TPtrCompare): Integer;
+function CountObject(const First: IJclPtrIterator; Count: Integer;
+  APtr: Pointer; AComparator: TPtrCompare): Integer;
 var
   I: Integer;
 begin
@@ -1455,8 +1368,8 @@
       Break;
 end;
 
-function CountObject(const First: IJclPtrIterator; Count: Integer; APtr: Pointer;
-  AEqualityComparator: TPtrEqualityCompare): Integer;
+function CountObject(const First: IJclPtrIterator; Count: Integer;
+  APtr: Pointer; AEqualityComparator: TPtrEqualityCompare): Integer;
 var
   I: Integer;
 begin
@@ -1469,8 +1382,8 @@
 end;
 {$ENDIF ~CLR}
 
-function CountObject(const First: IJclIterator; Count: Integer; AObject: TObject;
-  AComparator: TCompare): Integer;
+function CountObject(const First: IJclIterator; Count: Integer;
+  AObject: TObject; AComparator: TCompare): Integer;
 var
   I: Integer;
 begin
@@ -1482,8 +1395,8 @@
       Break;
 end;
 
-function CountObject(const First: IJclIterator; Count: Integer; AObject: TObject;
-  AEqualityComparator: TEqualityCompare): Integer;
+function CountObject(const First: IJclIterator; Count: Integer;
+  AObject: TObject; AEqualityComparator: TEqualityCompare): Integer;
 var
   I: Integer;
 begin
@@ -1678,7 +1591,7 @@
   I: Integer;
 begin
   List.Clear;
-  for I := Count - 1 downto 0 do
+  for I := 0 to Count - 1 do
     List.Add(AString);
 end;
 
@@ -1688,81 +1601,89 @@
   I: Integer;
 begin
   List.Clear;
-  for I := Count - 1 downto 0 do
+  for I := 0 to Count - 1 do
     List.Add(AString);
 end;
 
-procedure Generate(const List: IJclSingleList; Count: Integer; const AValue: Single);
+procedure Generate(const List: IJclSingleList; Count: Integer;
+  const AValue: Single);
 var
   I: Integer;
 begin
   List.Clear;
-  for I := Count - 1 downto 0 do
+  for I := 0 to Count - 1 do
     List.Add(AValue);
 end;
 
-procedure Generate(const List: IJclDoubleList; Count: Integer; const AValue: Double);
+procedure Generate(const List: IJclDoubleList; Count: Integer;
+  const AValue: Double);
 var
   I: Integer;
 begin
   List.Clear;
-  for I := Count - 1 downto 0 do
+  for I := 0 to Count - 1 do
     List.Add(AValue);
 end;
 
-procedure Generate(const List: IJclExtendedList; Count: Integer; const AValue: Extended);
+procedure Generate(const List: IJclExtendedList; Count: Integer;
+  const AValue: Extended);
 var
   I: Integer;
 begin
   List.Clear;
-  for I := Count - 1 downto 0 do
+  for I := 0 to Count - 1 do
     List.Add(AValue);
 end;
 
-procedure Generate(const List: IJclIntegerList; Count: Integer; AValue: Integer);
+procedure Generate(const List: IJclIntegerList; Count: Integer;
+  AValue: Integer);
 var
   I: Integer;
 begin
   List.Clear;
-  for I := Count - 1 downto 0 do
+  for I := 0 to Count - 1 do
     List.Add(AValue);
 end;
 
-procedure Generate(const List: IJclCardinalList; Count: Integer; AValue: Cardinal);
+procedure Generate(const List: IJclCardinalList; Count: Integer;
+  AValue: Cardinal);
 var
   I: Integer;
 begin
   List.Clear;
-  for I := Count - 1 downto 0 do
+  for I := 0 to Count - 1 do
     List.Add(AValue);
 end;
 
-procedure Generate(const List: IJclInt64List; Count: Integer; const AValue: Int64);
+procedure Generate(const List: IJclInt64List; Count: Integer;
+  const AValue: Int64);
 var
   I: Integer;
 begin
   List.Clear;
-  for I := Count - 1 downto 0 do
+  for I := 0 to Count - 1 do
     List.Add(AValue);
 end;
 
 {$IFNDEF CLR}
-procedure Generate(const List: IJclPtrList; Count: Integer; APtr: Pointer);
+procedure Generate(const List: IJclPtrList; Count: Integer;
+  APtr: Pointer);
 var
   I: Integer;
 begin
   List.Clear;
-  for I := Count - 1 downto 0 do
+  for I := 0 to Count - 1 do
     List.Add(APtr);
 end;
 {$ENDIF ~CLR}
 
-procedure Generate(const List: IJclList; Count: Integer; AObject: TObject);
+procedure Generate(const List: IJclList; Count: Integer;
+  AObject: TObject);
 var
   I: Integer;
 begin
   List.Clear;
-  for I := Count - 1 downto 0 do
+  for I := 0 to Count - 1 do
     List.Add(AObject);
 end;
 
@@ -1811,7 +1732,8 @@
       Break;
 end;
 
-procedure Fill(const First: IJclSingleIterator; Count: Integer; const AValue: Single);
+procedure Fill(const First: IJclSingleIterator; Count: Integer;
+  const AValue: Single);
 var
   I: Integer;
 begin
@@ -1825,7 +1747,8 @@
       Break;
 end;
 
-procedure Fill(const First: IJclDoubleIterator; Count: Integer; const AValue: Double);
+procedure Fill(const First: IJclDoubleIterator; Count: Integer;
+  const AValue: Double);
 var
   I: Integer;
 begin
@@ -1839,7 +1762,8 @@
       Break;
 end;
 
-procedure Fill(const First: IJclExtendedIterator; Count: Integer; const AValue: Extended);
+procedure Fill(const First: IJclExtendedIterator; Count: Integer;
+  const AValue: Extended);
 var
   I: Integer;
 begin
@@ -1853,7 +1777,8 @@
       Break;
 end;
 
-procedure Fill(const First: IJclIntegerIterator; Count: Integer; AValue: Integer);
+procedure Fill(const First: IJclIntegerIterator; Count: Integer;
+  AValue: Integer);
 var
   I: Integer;
 begin
@@ -1867,7 +1792,8 @@
       Break;
 end;
 
-procedure Fill(const First: IJclCardinalIterator; Count: Integer; AValue: Cardinal);
+procedure Fill(const First: IJclCardinalIterator; Count: Integer;
+  AValue: Cardinal);
 var
   I: Integer;
 begin
@@ -1881,7 +1807,8 @@
       Break;
 end;
 
-procedure Fill(const First: IJclInt64Iterator; Count: Integer; const AValue: Int64);
+procedure Fill(const First: IJclInt64Iterator; Count: Integer;
+  const AValue: Int64);
 var
   I: Integer;
 begin
@@ -1896,7 +1823,8 @@
 end;
 
 {$IFNDEF CLR}
-procedure Fill(const First: IJclPtrIterator; Count: Integer; APtr: Pointer);
+procedure Fill(const First: IJclPtrIterator; Count: Integer;
+  APtr: Pointer);
 var
   I: Integer;
 begin
@@ -1911,7 +1839,8 @@
 end;
 {$ENDIF ~CLR}
 
-procedure Fill(const First: IJclIterator; Count: Integer; AObject: TObject);
+procedure Fill(const First: IJclIterator; Count: Integer;
+  AObject: TObject);
 var
   I: Integer;
 begin
@@ -1950,7 +1879,7 @@
     Exit;
   if not Last.HasPrevious then
     Exit;
-  while First.NextIndex <= Last.PreviousIndex do
+  while First.NextIndex < Last.PreviousIndex do
   begin
     Obj := First.Next;
     Last.Previous;
@@ -1967,7 +1896,7 @@
     Exit;
   if not Last.HasPrevious then
     Exit;
-  while First.NextIndex <= Last.PreviousIndex do
+  while First.NextIndex < Last.PreviousIndex do
   begin
     Obj := First.Next;
     Last.Previous;
@@ -1984,7 +1913,7 @@
     Exit;
   if not Last.HasPrevious then
     Exit;
-  while First.NextIndex <= Last.PreviousIndex do
+  while First.NextIndex < Last.PreviousIndex do
   begin
     Obj := First.Next;
     Last.Previous;
@@ -2001,7 +1930,7 @@
     Exit;
   if not Last.HasPrevious then
     Exit;
-  while First.NextIndex <= Last.PreviousIndex do
+  while First.NextIndex < Last.PreviousIndex do
   begin
     Obj := First.Next;
     Last.Previous;
@@ -2018,7 +1947,7 @@
     Exit;
   if not Last.HasPrevious then
     Exit;
-  while First.NextIndex <= Last.PreviousIndex do
+  while First.NextIndex < Last.PreviousIndex do
   begin
     Obj := First.Next;
     Last.Previous;
@@ -2035,7 +1964,7 @@
     Exit;
   if not Last.HasPrevious then
     Exit;
-  while First.NextIndex <= Last.PreviousIndex do
+  while First.NextIndex < Last.PreviousIndex do
   begin
     Obj := First.Next;
     Last.Previous;
@@ -2052,7 +1981,7 @@
     Exit;
   if not Last.HasPrevious then
     Exit;
-  while First.NextIndex <= Last.PreviousIndex do
+  while First.NextIndex < Last.PreviousIndex do
   begin
     Obj := First.Next;
     Last.Previous;
@@ -2069,7 +1998,7 @@
     Exit;
   if not Last.HasPrevious then
     Exit;
-  while First.NextIndex <= Last.PreviousIndex do
+  while First.NextIndex < Last.PreviousIndex do
   begin
     Obj := First.Next;
     Last.Previous;
@@ -2087,7 +2016,7 @@
     Exit;
   if not Last.HasPrevious then
     Exit;
-  while First.NextIndex <= Last.PreviousIndex do
+  while First.NextIndex < Last.PreviousIndex do
   begin
     Obj := First.Next;
     Last.Previous;
@@ -2105,7 +2034,7 @@
     Exit;
   if not Last.HasPrevious then
     Exit;
-  while First.NextIndex <= Last.PreviousIndex do
+  while First.NextIndex < Last.PreviousIndex do
   begin
     Obj := First.Next;
     Last.Previous;
@@ -2125,9 +2054,10 @@
     J := R;
     P := (L + R) shr 1;
     repeat
-      while AComparator(AList.GetObject(I), AList.GetObject(P)) < 0 do
+      Obj := AList.GetObject(P);
+      while AComparator(AList.GetObject(I), Obj) < 0 do
         Inc(I);
-      while AComparator(AList.GetObject(J), AList.GetObject(P)) > 0 do
+      while AComparator(AList.GetObject(J), Obj) > 0 do
         Dec(J);
       if I <= J then
       begin
@@ -2160,9 +2090,10 @@
     J := R;
     P := (L + R) shr 1;
     repeat
-      while AComparator(AList.GetString(I), AList.GetString(P)) < 0 do
+      Obj := AList.GetString(P);
+      while AComparator(AList.GetString(I), Obj) < 0 do
         Inc(I);
-      while AComparator(AList.GetString(J), AList.GetString(P)) > 0 do
+      while AComparator(AList.GetString(J), Obj) > 0 do
         Dec(J);
       if I <= J then
       begin
@@ -2195,9 +2126,10 @@
     J := R;
     P := (L + R) shr 1;
     repeat
-      while AComparator(AList.GetString(I), AList.GetString(P)) < 0 do
+      Obj := AList.GetString(P);
+      while AComparator(AList.GetString(I), Obj) < 0 do
         Inc(I);
-      while AComparator(AList.GetString(J), AList.GetString(P)) > 0 do
+      while AComparator(AList.GetString(J), Obj) > 0 do
         Dec(J);
       if I <= J then
       begin
@@ -2219,7 +2151,8 @@
   until I >= R;
 end;
 
-procedure QuickSort(const AList: IJclSingleList; L, R: Integer; AComparator: TSingleCompare);
+procedure QuickSort(const AList: IJclSingleList; L, R: Integer;
+  AComparator: TSingleCompare);
 var
   I, J, P: Integer;
   Obj: Single;
@@ -2229,9 +2162,10 @@
     J := R;
     P := (L + R) shr 1;
     repeat
-      while AComparator(AList.GetValue(I), AList.GetValue(P)) < 0 do
+      Obj := AList.GetValue(P);
+      while AComparator(AList.GetValue(I), Obj) < 0 do
         Inc(I);
-      while AComparator(AList.GetValue(J), AList.GetValue(P)) > 0 do
+      while AComparator(AList.GetValue(J), Obj) > 0 do
         Dec(J);
       if I <= J then
       begin
@@ -2253,7 +2187,8 @@
   until I >= R;
 end;
 
-procedure QuickSort(const AList: IJclDoubleList; L, R: Integer; AComparator: TDoubleCompare);
+procedure QuickSort(const AList: IJclDoubleList; L, R: Integer;
+  AComparator: TDoubleCompare);
 var
   I, J, P: Integer;
   Obj: Double;
@@ -2263,9 +2198,10 @@
     J := R;
     P := (L + R) shr 1;
     repeat
-      while AComparator(AList.GetValue(I), AList.GetValue(P)) < 0 do
+      Obj := AList.GetValue(P);
+      while AComparator(AList.GetValue(I), Obj) < 0 do
         Inc(I);
-      while AComparator(AList.GetValue(J), AList.GetValue(P)) > 0 do
+      while AComparator(AList.GetValue(J), Obj) > 0 do
         Dec(J);
       if I <= J then
       begin
@@ -2287,7 +2223,8 @@
   until I >= R;
 end;
 
-procedure QuickSort(const AList: IJclExtendedList; L, R: Integer; AComparator: TExtendedCompare);
+procedure QuickSort(const AList: IJclExtendedList; L, R: Integer;
+  AComparator: TExtendedCompare);
 var
   I, J, P: Integer;
   Obj: Extended;
@@ -2297,9 +2234,10 @@
     J := R;
     P := (L + R) shr 1;
     repeat
-      while AComparator(AList.GetValue(I), AList.GetValue(P)) < 0 do
+      Obj := AList.GetValue(P);
+      while AComparator(AList.GetValue(I), Obj) < 0 do
         Inc(I);
-      while AComparator(AList.GetValue(J), AList.GetValue(P)) > 0 do
+      while AComparator(AList.GetValue(J), Obj) > 0 do
         Dec(J);
       if I <= J then
       begin
@@ -2321,7 +2259,8 @@
   until I >= R;
 end;
 
-procedure QuickSort(const AList: IJclIntegerList; L, R: Integer; AComparator: TIntegerCompare);
+procedure QuickSort(const AList: IJclIntegerList; L, R: Integer;
+  AComparator: TIntegerCompare);
 var
   I, J, P: Integer;
   Obj: Integer;
@@ -2331,9 +2270,10 @@
     J := R;
     P := (L + R) shr 1;
     repeat
-      while AComparator(AList.GetValue(I), AList.GetValue(P)) < 0 do
+      Obj := AList.GetValue(P);
+      while AComparator(AList.GetValue(I), Obj) < 0 do
         Inc(I);
-      while AComparator(AList.GetValue(J), AList.GetValue(P)) > 0 do
+      while AComparator(AList.GetValue(J), Obj) > 0 do
         Dec(J);
       if I <= J then
       begin
@@ -2355,7 +2295,8 @@
   until I >= R;
 end;
 
-procedure QuickSort(const AList: IJclCardinalList; L, R: Integer; AComparator: TCardinalCompare);
+procedure QuickSort(const AList: IJclCardinalList; L, R: Integer;
+  AComparator: TCardinalCompare);
 var
   I, J, P: Integer;
   Obj: Cardinal;
@@ -2365,9 +2306,10 @@
     J := R;
     P := (L + R) shr 1;
     repeat
-      while AComparator(AList.GetValue(I), AList.GetValue(P)) < 0 do
+      Obj := AList.GetValue(P);
+      while AComparator(AList.GetValue(I), Obj) < 0 do
         Inc(I);
-      while AComparator(AList.GetValue(J), AList.GetValue(P)) > 0 do
+      while AComparator(AList.GetValue(J), Obj) > 0 do
         Dec(J);
       if I <= J then
       begin
@@ -2389,7 +2331,8 @@
   until I >= R;
 end;
 
-procedure QuickSort(const AList: IJclInt64List; L, R: Integer; AComparator: TInt64Compare);
+procedure QuickSort(const AList: IJclInt64List; L, R: Integer;
+  AComparator: TInt64Compare);
 var
   I, J, P: Integer;
   Obj: Int64;
@@ -2399,9 +2342,10 @@
     J := R;
     P := (L + R) shr 1;
     repeat
-      while AComparator(AList.GetValue(I), AList.GetValue(P)) < 0 do
+      Obj := AList.GetValue(P);
+      while AComparator(AList.GetValue(I), Obj) < 0 do
         Inc(I);
-      while AComparator(AList.GetValue(J), AList.GetValue(P)) > 0 do
+      while AComparator(AList.GetValue(J), Obj) > 0 do
         Dec(J);
       if I <= J then
       begin
@@ -2424,7 +2368,8 @@
 end;
 
 {$IFNDEF CLR}
-procedure QuickSort(const AList: IJclPtrList; L, R: Integer; AComparator: TPtrCompare);
+procedure QuickSort(const AList: IJclPtrList; L, R: Integer;
+  AComparator: TPtrCompare);
 var
   I, J, P: Integer;
   Obj: Pointer;
@@ -2434,9 +2379,10 @@
     J := R;
     P := (L + R) shr 1;
     repeat
-      while AComparator(AList.GetPtr(I), AList.GetPtr(P)) < 0 do
+      Obj := AList.GetPtr(P);
+      while AComparator(AList.GetPtr(I), Obj) < 0 do
         Inc(I);
-      while AComparator(AList.GetPtr(J), AList.GetPtr(P)) > 0 do
+      while AComparator(AList.GetPtr(J), Obj) > 0 do
         Dec(J);
       if I <= J then
       begin
@@ -2459,7 +2405,8 @@
 end;
 {$ENDIF ~CLR}
 
-procedure QuickSort(const AList: IJclList; L, R: Integer; AComparator: TCompare);
+procedure QuickSort(const AList: IJclList; L, R: Integer;
+  AComparator: TCompare);
 var
   I, J, P: Integer;
   Obj: TObject;
@@ -2469,9 +2416,10 @@
     J := R;
     P := (L + R) shr 1;
     repeat
-      while AComparator(AList.GetObject(I), AList.GetObject(P)) < 0 do
+      Obj := AList.GetObject(P);
+      while AComparator(AList.GetObject(I), Obj) < 0 do
         Inc(I);
-      while AComparator(AList.GetObject(J), AList.GetObject(P)) > 0 do
+      while AComparator(AList.GetObject(J), Obj) > 0 do
         Dec(J);
       if I <= J then
       begin
@@ -2551,8 +2499,7 @@
 end;
 
 {$IFDEF SUPPORTS_GENERICS}
-class procedure TJclAlgorithms<T>.Apply(const First: IJclIterator<T>; Count: Integer;
-  F: TApplyFunction<T>);
+class procedure TJclAlgorithms<T>.Apply(const First: IJclIterator<T>; Count: Integer; F: TApplyFunction<T>);
 var
   I: Integer;
 begin
@@ -2563,8 +2510,8 @@
       Break;
 end;
 
-class function TJclAlgorithms<T>.Find(const First: IJclIterator<T>; Count: Integer; AItem: T;
-  AComparator: TCompare<T>): IJclIterator<T>;
+class function TJclAlgorithms<T>.Find(const First: IJclIterator<T>; Count: Integer;
+  const AItem: T; AComparator: TCompare<T>): IJclIterator<T>;
 var
   I: Integer;
 begin
@@ -2582,8 +2529,27 @@
       Break;
 end;
 
+class function TJclAlgorithms<T>.Find(const First: IJclIterator<T>; Count: Integer;
+  const AItem: T; AEqualityComparator: TEqualityCompare<T>): IJclIterator<T>;
+var
+  I: Integer;
+begin
+  Result := nil;
+  for I := Count - 1 downto 0 do
+    if First.HasNext then
+    begin
+      if AEqualityComparator(First.Next, AItem) then
+      begin
+        Result := First;
+        Break;
+      end;
+    end
+    else
+      Break;
+end;
+
 class function TJclAlgorithms<T>.CountObject(const First: IJclIterator<T>; Count: Integer;
-  AItem: T; AComparator: TCompare<T>): Integer;
+  const AItem: T; AComparator: TCompare<T>): Integer;
 var
   I: Integer;
 begin
@@ -2595,6 +2561,19 @@
       Break;
 end;
 
+class function TJclAlgorithms<T>.CountObject(const First: IJclIterator<T>; Count: Integer;
+  const AItem: T; AEqualityComparator: TEqualityCompare<T>): Integer;
+var
+  I: Integer;
+begin
+  Result := 0;
+  for I := Count - 1 downto 0 do
+    if First.HasNext then
+      Inc(Result, Ord(AEqualityComparator(First.Next, AItem)))
+    else
+      Break;
+end;
+
 class procedure TJclAlgorithms<T>.Copy(const First: IJclIterator<T>; Count: Integer;
   const Output: IJclIterator<T>);
 var
@@ -2610,16 +2589,18 @@
       Break;
 end;
 
-class procedure TJclAlgorithms<T>.Generate(const List: IJclList<T>; Count: Integer; AItem: T);
+class procedure TJclAlgorithms<T>.Generate(const List: IJclList<T>; Count: Integer;
+  const AItem: T);
 var
   I: Integer;
 begin
   List.Clear;
-  for I := Count - 1 downto 0 do
+  for I := 0 to Count - 1 do
     List.Add(AItem);
 end;
 
-class procedure TJclAlgorithms<T>.Fill(const First: IJclIterator<T>; Count: Integer; AItem: T);
+class procedure TJclAlgorithms<T>.Fill(const First: IJclIterator<T>; Count: Integer;
+  const AItem: T);
 var
   I: Integer;
 begin
@@ -2641,7 +2622,7 @@
     Exit;
   if not Last.HasPrevious then
     Exit;
-  while First.NextIndex <= Last.PreviousIndex do
+  while First.NextIndex < Last.PreviousIndex do
   begin
     Obj := First.Next;
     Last.Previous;
@@ -2661,9 +2642,10 @@
     J := R;
     P := (L + R) shr 1;
     repeat
-      while AComparator(AList.GetItem(I), AList.GetItem(P)) < 0 do
+      Obj := AList.GetItem(P);
+      while AComparator(AList.GetItem(I), Obj) < 0 do
         Inc(I);
-      while AComparator(AList.GetItem(J), AList.GetItem(P)) > 0 do
+      while AComparator(AList.GetItem(J), Obj) > 0 do
         Dec(J);
       if I <= J then
       begin
@@ -2680,16 +2662,16 @@
       end;
     until I > J;
     if L < J then
-      QuickSort(AList, L, J, AComparator);
+      TJclAlgorithms<T>.QuickSort(AList, L, J, AComparator);
     L := I;
   until I >= R;
 end;
 
-{class procedure TJclAlgorithms<T>.Sort(const AList: IJclList<T>; First, Last: Integer;
+class procedure TJclAlgorithms<T>.Sort(const AList: IJclList<T>; First, Last: Integer;
   AComparator: TCompare<T>);
 begin
-
-end;}
+  TJclAlgorithms<T>.QuickSort(AList, First, Last, AComparator);
+end;
 {$ENDIF SUPPORTS_GENERICS}
 
 
@@ -2701,5 +2683,4 @@
   UnregisterUnitVersion(HInstance);
 {$ENDIF UNITVERSIONING}
 
-end.
-
+end.
\ No newline at end of file

Modified: trunk/jcl/source/common/JclBase.pas
===================================================================
--- trunk/jcl/source/common/JclBase.pas	2008-01-14 21:56:35 UTC (rev 2306)
+++ trunk/jcl/source/common/JclBase.pas	2008-01-15 22:01:28 UTC (rev 2307)
@@ -251,96 +251,6 @@
 procedure RaiseLastOSError;
 {$ENDIF ~XPLATFORM_RTL}
 
-type
-  TIntfCompare = function(const Obj1, Obj2: IInterface): Integer;
-  TAnsiStrCompare = function(const Obj, Obj2: AnsiString): Integer;
-  TWideStrCompare = function(const Obj, Obj2: WideString): Integer;
-  {$IFDEF CONTAINER_ANSISTR}
-  TStrCompare = TAnsiStrCompare;
-  {$ENDIF CONTAINER_ANSISTR}
-  {$IFDEF CONTAINER_WIDESTR}
-  TStrCompare = TWideStrCompare;
-  {$ENDIF CONTAINER_WIDESTR}
-  TSingleCompare = function(const Obj1, Obj2: Single): Integer;
-  TDoubleCompare = function(const Obj1, Obj2: Double): Integer;
-  TExtendedCompare = function(const Obj1, Obj2: Extended): Integer;
-  {$IFDEF MATH_SINGLE_PRECISION}
-  TFloatCompare = TSingleCompare;
-  {$ENDIF MATH_SINGLE_PRECISION}
-  {$IFDEF MATH_DOUBLE_PRECISION}
-  TFloatCompare = TDoubleCompare;
-  {$ENDIF MATH_DOUBLE_PRECISION}
-  {$IFDEF MATH_EXTENDED_PRECISION}
-  TFloatCompare = TExtendedCompare;
-  {$ENDIF MATH_EXTENDED_PRECISION}
-  TIntegerCompare = function(Obj1, Obj2: Integer): Integer;
-  TCardinalCompare = function(Obj1, Obj2: Cardinal): Integer;
-  TInt64Compare = function(const Obj1, Obj2: Int64): Integer;
-  {$IFNDEF CLR}
-  TPtrCompare = function(Obj1, Obj2: Pointer): Integer;
-  {$ENDIF ~CLR}
-  TCompare = function(Obj1, Obj2: TObject): Integer;
-
-type
-  TIntfEqualityCompare = function(const Obj1, Obj2: IInterface): Boolean;
-  TAnsiStrEqualityCompare = function(const Obj, Obj2: AnsiString): Boolean;
-  TWideStrEqualityCompare = function(const Obj, Obj2: WideString): Boolean;
-  {$IFDEF CONTAINER_ANSISTR}
-  TStrEqualityCompare = TAnsiStrEqualityCompare;
-  {$ENDIF CONTAINER_ANSISTR}
-  {$IFDEF CONTAINER_WIDESTR}
-  TStrEqualityCompare = TWideStrEqualityCompare;
-  {$ENDIF CONTAINER_WIDESTR}
-  TSingleEqualityCompare = function(const Obj1, Obj2: Single): Boolean;
-  TDoubleEqualityCompare = function(const Obj1, Obj2: Double): Boolean;
-  TExtendedEqualityCompare = function(const Obj1, Obj2: Extended): Boolean;
-  {$IFDEF MATH_SINGLE_PRECISION}
-  TFloatEqualityCompare = TSingleEqualityCompare;
-  {$ENDIF MATH_SINGLE_PRECISION}
-  {$IFDEF MATH_DOUBLE_PRECISION}
-  TFloatEqualityCompare = TDoubleEqualityCompare;
-  {$ENDIF MATH_DOUBLE_PRECISION}
-  {$IFDEF MATH_EXTENDED_PRECISION}
-  TFloatEqualityCompare = TExtendedEqualityCompare;
-  {$ENDIF MATH_EXTENDED_PRECISION}
-  TIntegerEqualityCompare = function(Obj1, Obj2: Integer): Boolean;
-  TCardinalEqualityCompare = function(Obj1, Obj2: Cardinal): Boolean;
-  TInt64EqualityCompare = function(const Obj1, Obj2: Int64): Boolean;
-  {$IFNDEF CLR}
-  TPtrEqualityCompare = function(Obj1, Obj2: Pointer): Boolean;
-  {$ENDIF ~CLR}
-  TEqualityCompare = function(Obj1, Obj2: TObject): Boolean;
-
-type
-  TIntfHashConvert = function(const AInterface: IInterface): Integer;
-  TAnsiStrHashConvert = function(const AString: AnsiString): Integer;
-  TWideStrHashConvert = function(const AString: WideString): Integer;
-  {$IFDEF CONTAINER_ANSISTR}
-  TStrHashConvert = TAnsiStrHashConvert;
-  {$ENDIF CONTAINER_ANSISTR}
-  {$IFDEF CONTAINER_WIDESTR}
-  TStrHashConvert = TWideStrHashConvert;
-  {$ENDIF CONTAINER_WIDESTR}
-  TSingleHashConvert = function(const AValue: Single): Integer;
-  TDoubleHashConvert = function(const AValue: Double): Integer;
-  TExtendedHashConvert = function(const AValue: Extended): Integer;
-  {$IFDEF MATH_SINGLE_PRECISION}
-  TFloatHashConvert = TSingleHashConvert;
-  {$ENDIF MATH_SINGLE_PRECISION}
-  {$IFDEF MATH_DOUBLE_PRECISION}
-  TFloatHashConvert = TDoubleHashConvert;
-  {$ENDIF MATH_DOUBLE_PRECISION}
-  {$IFDEF MATH_EXTENDED_PRECISION}
-  TFloatHashConvert = TExtendedHashConvert;
-  {$ENDIF MATH_EXTENDED_PRECISION}
-  TIntegerHashConvert = function(AValue: Integer): Integer;
-  TCardinalHashConvert = function(AValue: Cardinal): Integer;
-  TInt64HashConvert = function(const AValue: Int64): Integer;
-  {$IFNDEF CLR}
-  TPtrHashConvert = function(APtr: Pointer): Integer;
-  {$ENDIF ~CLR}
-  THashConvert = function(AObject: TObject): Integer;
-
 procedure MoveArray(var List: TDynIInterfaceArray; FromIndex, ToIndex, Count: Integer); overload;
 {$IFNDEF CLR}
 procedure MoveArray(var List: TDynStringArray; FromIndex, ToIndex, Count: Integer); overload;

Modified: trunk/jcl/source/common/JclContainerIntf.pas
===================================================================
--- trunk/jcl/source/common/JclContainerIntf.pas	2008-01-14 21:56:35 UTC (rev 2306)
+++ trunk/jcl/source/common/JclContainerIntf.pas	2008-01-15 22:01:28 UTC (rev 2307)
@@ -64,6 +64,140 @@
   DefaultContainerCapacity = 16;
 
 type
+  // function pointer types
+
+  // apply functions Type -> Type
+  TIntfApplyFunction = function(const AInterface: IInterface): IInterface;
+  TAnsiStrApplyFunction = function(const AString: AnsiString): AnsiString;
+  TWideStrApplyFunction = function(const AString: WideString): WideString;
+  {$IFDEF CONTAINER_ANSISTR}
+  TStrApplyFunction = TAnsiStrApplyFunction;
+  {$ENDIF CONTAINER_ANSISTR}
+  {$IFDEF CONTAINER_WIDESTR}
+  TStrApplyFunction = TWideStrApplyFunction;
+  {$ENDIF CONTAINER_WIDESTR}
+  TSingleApplyFunction = function(const AValue: Single): Single;
+  TDoubleApplyFunction = function(const AValue: Double): Double;
+  TExtendedApplyFunction = function(const AValue: Extended): Extended;
+  {$IFDEF MATH_SINGLE_PRECISION}
+  TFloatApplyFunction = TSingleApplyFunction;
+  {$ENDIF MATH_SINGLE_PRECISION}
+  {$IFDEF MATH_DOUBLE_PRECISION}
+  TFloatApplyFunction = TDoubleApplyFunction;
+  {$ENDIF MATH_DOUBLE_PRECISION}
+  {$IFDEF MATH_EXTENDED_PRECISION}
+  TFloatApplyFunction = TExtendedApplyFunction;
+  {$ENDIF MATH_EXTENDED_PRECISION}
+  TIntegerApplyFunction = function(AValue: Integer): Integer;
+  TCardinalApplyFunction = function(AValue: Cardinal): Cardinal;
+  TInt64ApplyFunction = function(const AValue: Int64): Int64;
+  {$IFNDEF CLR}
+  TPtrApplyFunction = function(APtr: Pointer): Pointer;
+  {$ENDIF ~CLR}
+  TApplyFunction = function(AObject: TObject): TObject;
+  {$IFDEF SUPPORTS_GENERICS}
+  TApplyFunction<T> = function(const AItem: T): T;
+  {$ENDIF SUPPORTS_GENERICS}
+
+  // comparison functions Type -> Type -> Integer
+  TIntfCompare = function(const Obj1, Obj2: IInterface): Integer;
+  TAnsiStrCompare = function(const Obj1, Obj2: AnsiString): Integer;
+  TWideStrCompare = function(const Obj1, Obj2: WideString): Integer;
+  {$IFDEF CONTAINER_ANSISTR}
+  TStrCompare = TAnsiStrCompare;
+  {$ENDIF CONTAINER_ANSISTR}
+  {$IFDEF CONTAINER_WIDESTR}
+  TStrCompare = TWideStrCompare;
+  {$ENDIF CONTAINER_WIDESTR}
+  TSingleCompare = function(const Obj1, Obj2: Single): Integer;
+  TDoubleCompare = function(const Obj1, Obj2: Double): Integer;
+  TExtendedCompare = function(const Obj1, Obj2: Extended): Integer;
+  {$IFDEF MATH_SINGLE_PRECISION}
+  TFloatCompare = TSingleCompare;
+  {$ENDIF MATH_SINGLE_PRECISION}
+  {$IFDEF MATH_DOUBLE_PRECISION}
+  TFloatCompare = TDoubleCompare;
+  {$ENDIF MATH_DOUBLE_PRECISION}
+  {$IFDEF MATH_EXTENDED_PRECISION}
+  TFloatCompare = TExtendedCompare;
+  {$ENDIF MATH_EXTENDED_PRECISION}
+  TIntegerCompare = function(Obj1, Obj2: Integer): Integer;
+  TCardinalCompare = function(Obj1, Obj2: Cardinal): Integer;
+  TInt64Compare = function(Obj1, Obj2: Int64): Integer;
+  {$IFNDEF CLR}
+  TPtrCompare = function(Obj1, Obj2: Pointer): Integer;
+  {$ENDIF ~CLR}
+  TCompare = function(Obj1, Obj2: TObject): Integer;
+  {$IFDEF SUPPORTS_GENERICS}
+  TCompare<T> = function(const Obj1, Obj2: T): Integer;
+  {$ENDIF SUPPORTS_GENERICS}
+
+  // comparison for equality functions Type -> Type -> Boolean
+  TIntfEqualityCompare = function(const Obj1, Obj2: IInterface): Boolean;
+  TAnsiStrEqualityCompare = function(const Obj1, Obj2: AnsiString): Boolean;
+  TWideStrEqualityCompare = function(const Obj1, Obj2: WideString): Boolean;
+  {$IFDEF CONTAINER_ANSISTR}
+  TStrEqualityCompare = TAnsiStrEqualityCompare;
+  {$ENDIF CONTAINER_ANSISTR}
+  {$IFDEF CONTAINER_WIDESTR}
+  TStrEqualityCompare = TWideStrEqualityCompare;
+  {$ENDIF CONTAINER_WIDESTR}
+  TSingleEqualityCompare = function(const Obj1, Obj2: Single): Boolean;
+  TDoubleEqualityCompare = function(const Obj1, Obj2: Double): Boolean;
+  TExtendedEqualityCompare = function(const Obj1, Obj2: Extended): Boolean;
+  {$IFDEF MATH_SINGLE_PRECISION}
+  TFloatEqualityCompare = TSingleEqualityCompare;
+  {$ENDIF MATH_SINGLE_PRECISION}
+  {$IFDEF MATH_DOUBLE_PRECISION}
+  TFloatEqualityCompare = TDoubleEqualityCompare;
+  {$ENDIF MATH_DOUBLE_PRECISION}
+  {$IFDEF MATH_EXTENDED_PRECISION}
+  TFloatEqualityCompare = TExtendedEqualityCompare;
+  {$ENDIF MATH_EXTENDED_PRECISION}
+  TIntegerEqualityCompare = function(Obj1, Obj2: Integer): Boolean;
+  TCardinalEqualityCompare = function(Obj1, Obj2: Cardinal): Boolean;
+  TInt64EqualityCompare = function(const Obj1, Obj2: Int64): Boolean;
+  {$IFNDEF CLR}
+  TPtrEqualityCompare = function(Obj1, Obj2: Pointer): Boolean;
+  {$ENDIF ~CLR}
+  TEqualityCompare = function(Obj1, Obj2: TObject): Boolean;
+  {$IFDEF SUPPORTS_GENERICS}
+  TEqualityCompare<T> = function(const Obj1, Obj2: T): Boolean;
+  {$ENDIF SUPPORTS_GENERICS}
+
+  // hash functions Type -> Integer
+  TIntfHashConvert = function(const AInterface: IInterface): Integer;
+  TAnsiStrHashConvert = function(const AString: AnsiString): Integer;
+  TWideStrHashConvert = function(const AString: WideString): Integer;
+  {$IFDEF CONTAINER_ANSISTR}
+  TStrHashConvert = TAnsiStrHashConvert;
+  {$ENDIF CONTAINER_ANSISTR}
+  {$IFDEF CONTAINER_WIDESTR}
+  TStrHashConvert = TWideStrHashConvert;
+  {$ENDIF CONTAINER_WIDESTR}
+  TSingleHashConvert = function(const AValue: Single): Integer;
+  TDoubleHashConvert = function(const AValue: Double): Integer;
+  TExtendedHashConvert = function(const AValue: Extended): Integer;
+  {$IFDEF MATH_SINGLE_PRECISION}
+  TFloatHashConvert = TSingleHashConvert;
+  {$ENDIF MATH_SINGLE_PRECISION}
+  {$IFDEF MATH_DOUBLE_PRECISION}
+  TFloatHashConvert = TDoubleHashConvert;
+  {$ENDIF MATH_DOUBLE_PRECISION}
+  {$IFDEF MATH_EXTENDED_PRECISION}
+  TFloatHashConvert = TExtendedHashConvert;
+  {$ENDIF MATH_EXTENDED_PRECISION}
+  TIntegerHashConvert = function(AValue: Integer): Integer;
+  TCardinalHashConvert = function(AValue: Cardinal): Integer;
+  TInt64HashConvert = function(const AValue: Int64): Integer;
+  {$IFNDEF CLR}
+  TPtrHashConvert = function(APtr: Pointer): Integer;
+  {$ENDIF ~CLR}
+  THashConvert = function(AObject: TObject): Integer;
+  {$IFDEF SUPPORTS_GENERICS}
+  THashConvert<T> = function(const AItem: T): Integer;
+  {$ENDIF SUPPORTS_GENERICS}
+
   IJclLockable = interface
     ['{524AD65E-AE1B-4BC6-91C8-8181F0198BA9}']
     procedure ReadLock;
@@ -1671,6 +1805,30 @@
   end;
   {$ENDIF SUPPORTS_GENERICS}
 
+  // Pointer functions for sort algorithms
+  TIntfSortProc = procedure(const AList: IJclIntfList; L, R: Integer; AComparator: TIntfCompare);
+  TAnsiStrSortProc = procedure(const AList: IJclAnsiStrList; L, R: Integer; AComparator: TAnsiStrCompare);
+  TWideStrSortProc = procedure(const AList: IJclWideStrList; L, R: Integer; AComparator: TWideStrCompare);
+  {$IFDEF CONTAINER_ANSISTR}
+  TStrSortProc = TAnsiStrSortProc;
+  {$ENDIF CONTAINER_ANSISTR}
+  {$IFDEF CONTAINER_WIDESTR}
+  TStrSortProc = TWideStrSortProc;
+  {$ENDIF CONTAINER_WIDESTR}
+  TSingleSortProc = procedure(const AList: IJclSingleList; L, R: Integer; AComparator: TSingleCompare);
+  TDoubleSortProc = procedure(const AList: IJclDoubleList; L, R: Integer; AComparator: TDoubleCompare);
+  TExtendedSortProc = procedure(const...
 
[truncated message content]

[Jcl-checkins-diff] SF.net SVN: jcl: [2306] trunk/jcl/source/jedi.inc

From: <ou...@us...> - 2008-01-14 21:56:37

Revision: 2306
          http://jcl.svn.sourceforge.net/jcl/?rev=2306&view=rev
Author:   outchy
Date:     2008-01-14 13:56:35 -0800 (Mon, 14 Jan 2008)

Log Message:
-----------
sync with the Jedi Api Library.

Modified Paths:
--------------
    trunk/jcl/source/jedi.inc

Modified: trunk/jcl/source/jedi.inc
===================================================================
--- trunk/jcl/source/jedi.inc	2008-01-14 21:18:16 UTC (rev 2305)
+++ trunk/jcl/source/jedi.inc	2008-01-14 21:56:35 UTC (rev 2306)
@@ -73,12 +73,21 @@
   Directive           Description
   ------------------------------------------------------------------------------
   WIN32               Defined when target platform is 32 bit Windows
+  WIN64               Defined when target platform is 64 bit Windows
   MSWINDOWS           Defined when target platform is 32 bit Windows
   LINUX               Defined when target platform is Linux
-  UNIX                Defined when target platform is Linux or Unix
+  UNIX                Defined when target platform is Unix-like (including Linux)
   CLR                 Defined when target platform is .NET
 
+- Architecture directives. These are auto-defined by FPC
+  CPU32 and CPU64 are mostly for generic pointer size dependant differences rather
+  than for a specific architecture.
 
+  CPU386              Defined when target platform is x86 (win32)
+  CPUx86_64           Defined when target platform is x86_64 (win64)
+  CPU32               Defined when target is 32-bit
+  CPU64	              Defined when target is 64-bit
+
 - Visual library Directives
 
   The following directives indicate for a visual library. In a Delphi/BCB
@@ -340,9 +349,9 @@
   SUPPORTS_IMPLEMENTS           Compiler supports implements (D4+/BCB4+)
   SUPPORTS_DEPRECATED           Compiler supports the deprecated directive (D6+/BCB6+)
   SUPPORTS_PLATFORM             Compiler supports the platform directive (D6+/BCB6+)
-  SUPPORTS_LIBRARY              Compiler supports the library directive (D6+/BCB6+)
+  SUPPORTS_LIBRARY              Compiler supports the library directive (D6+/BCB6+/FPC)
   SUPPORTS_LOCAL                Compiler supports the local directive (D6+/BCB6+)
-  SUPPORTS_INLINE               Compiler supports the inline directive (D9+)
+  SUPPORTS_INLINE               Compiler supports the inline directive (D9+/FPC)
   SUPPORTS_FOR_IN               Compiler supports for in loops (D9+)
   SUPPORTS_NESTED_CONSTANTS     Compiler supports nested constants (D9+)
   SUPPORTS_NESTED_TYPES         Compiler supports nested types (D9+)
@@ -355,7 +364,7 @@
   SUPPORTS_FINAL                Compiler supports final keyword (D9.NET, D10+)
   SUPPORTS_GENERICS             Compiler supports generic implementations (D11.net)
   ACCEPT_DEPRECATED             Compiler supports or ignores the deprecated directive (D6+/BCB6+/FPC)
-  ACCEPT_PLATFORM               Compiler supports or ignores the platform directive (D6+/BCB6+)
+  ACCEPT_PLATFORM               Compiler supports or ignores the platform directive (D6+/BCB6+/FPC)
   ACCEPT_LIBRARY                Compiler supports or ignores the library directive (D6+/BCB6+)
   SUPPORTS_CUSTOMVARIANTS       Compiler supports custom variants (D6+/BCB6+)
   SUPPORTS_VARARGS              Compiler supports varargs (D6+/BCB6+)
@@ -366,11 +375,12 @@
   SUPPORTS_UNSAFE_WARNINGS      Compiler supports unsafe warnings (D7)
   SUPPORTS_WEAKPACKAGEUNIT      Compiler supports the WEAKPACKAGEUNIT directive
   SUPPORTS_COMPILETIME_MESSAGES Compiler supports the MESSAGE directive
-  HAS_UNIT_LIBC                 Unit Libc exists (Kylix, FPC on Linux)
-  HAS_UNIT_RTLCONSTS            Unit RTLConsts exists (D6+/BCB6+)
-  HAS_UNIT_TYPES                Unit Types exists (D6+/BCB6+)
-  HAS_UNIT_VARIANTS             Unit Variants exists (D6+/BCB6+)
-  HAS_UNIT_STRUTILS             Unit StrUtils exists (D6+/BCB6+)
+  HAS_UNIT_LIBC                 Unit Libc exists (Kylix, FPC on Linux/x86)
+  HAS_UNIT_RTLCONSTS            Unit RTLConsts exists (D6+/BCB6+/FPC)
+  HAS_UNIT_TYPES                Unit Types exists (D6+/BCB6+/FPC)
+  HAS_UNIT_VARIANTS             Unit Variants exists (D6+/BCB6+/FPC)
+  HAS_UNIT_STRUTILS             Unit StrUtils exists (D6+/BCB6+/FPC)
+  HAS_UNIT_DATEUTILS            Unit DateUtils exists (D6+/BCB6+/FPC)
   XPLATFORM_RTL                 The RTL supports crossplatform function names (e.g. RaiseLastOSError) (D6+/BCB6+/FPC)
 
 
@@ -410,12 +420,15 @@
   {$MODE DELPHI}
   {$ASMMODE Intel}
   {$UNDEF BORLAND}
+   // FPC defines CPU* and Unix automatically
 {$ENDIF}
 
 {$IFDEF BORLAND}
   {$IFDEF LINUX}
     {$DEFINE KYLIX}
   {$ENDIF LINUX}
+  {$DEFINE CPU386}  // For Borland compilers select the x86 compat assembler by default
+  {$DEFINE CPU32}   // Assume Borland compilers are 32-bit (rather than 64-bit)
 {$ENDIF BORLAND}
 
 {------------------------------------------------------------------------------}
@@ -880,8 +893,8 @@
     {$DEFINE SUPPORTS_DYNAMICARRAYS}
     {$DEFINE SUPPORTS_DEFAULTPARAMS}
     {$DEFINE SUPPORTS_OVERLOAD}
-    {$DEFINE ACCEPT_DEPRECATED}
-    {$DEFINE ACCEPT_PLATFORM}
+    {$DEFINE ACCEPT_DEPRECATED}  // 2.2 also gives warnings
+    {$DEFINE ACCEPT_PLATFORM}    // 2.2 also gives warnings
     {$DEFINE ACCEPT_LIBRARY}
     {$DEFINE SUPPORTS_EXTSYM}
     {$DEFINE SUPPORTS_NODEFINE}
@@ -895,12 +908,19 @@
     {$DEFINE HAS_UNIT_TYPES}
     {$DEFINE HAS_UNIT_VARIANTS}
     {$DEFINE HAS_UNIT_STRUTILS}
+    {$DEFINE HAS_UNIT_DATEUTILS}
     {$DEFINE HAS_UNIT_RTLCONSTS}
 
     {$DEFINE XPLATFORM_RTL}
 
-    {$UNDEF SUPPORTS_DISPINTERFACE}
-    {$UNDEF SUPPORTS_IMPLEMENTS}
+    {$IFDEF VER2_2}
+      {$DEFINE SUPPORTS_DISPINTERFACE}
+      {$DEFINE SUPPORTS_IMPLEMENTS}
+      {$DEFINE SUPPORTS_DISPID}
+    {$ELSE}
+      {$UNDEF SUPPORTS_DISPINTERFACE}
+      {$UNDEF SUPPORTS_IMPLEMENTS}
+    {$endif}
     {$UNDEF SUPPORTS_UNSAFE_WARNINGS}
   {$ENDIF}
 {$ENDIF FPC}
@@ -1003,6 +1023,7 @@
   {$DEFINE HAS_UNIT_TYPES}
   {$DEFINE HAS_UNIT_VARIANTS}
   {$DEFINE HAS_UNIT_STRUTILS}
+  {$DEFINE HAS_UNIT_DATEUTILS}
   {$DEFINE XPLATFORM_RTL}
 {$ENDIF RTL140_UP}
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2305] trunk/jcl/source

From: <ou...@us...> - 2008-01-14 21:18:18

Revision: 2305
          http://jcl.svn.sourceforge.net/jcl/?rev=2305&view=rev
Author:   outchy
Date:     2008-01-14 13:18:16 -0800 (Mon, 14 Jan 2008)

Log Message:
-----------
JclContainerIntf generated from template.

Modified Paths:
--------------
    trunk/jcl/source/common/JclContainerIntf.pas
    trunk/jcl/source/prototypes/Makefile.mak

Added Paths:
-----------
    trunk/jcl/source/prototypes/JclContainerIntf.pas
    trunk/jcl/source/prototypes/containers/JclContainerIntf.int

Modified: trunk/jcl/source/common/JclContainerIntf.pas
===================================================================
--- trunk/jcl/source/common/JclContainerIntf.pas	2008-01-13 18:55:51 UTC (rev 2304)
+++ trunk/jcl/source/common/JclContainerIntf.pas	2008-01-14 21:18:16 UTC (rev 2305)
@@ -1,4 +1,8 @@
 {**************************************************************************************************}
+{  WARNING:  JEDI preprocessor generated unit.  Do not edit.                                       }
+{**************************************************************************************************}
+
+{**************************************************************************************************}
 {                                                                                                  }
 { Project JEDI Code Library (JCL)                                                                  }
 {                                                                                                  }
@@ -27,7 +31,7 @@
 {                                                                                                  }
 {**************************************************************************************************}
 {                                                                                                  }
-{ Last modified: $Date::                                                                        $ }
+{ Last modified: $Date::                                                                         $ }
 { Revision:      $Rev::                                                                          $ }
 { Author:        $Author::                                                                       $ }
 {                                                                                                  }
@@ -1500,8 +1504,7 @@
     function Delete(Index: Integer): IInterface;
     procedure SetObject(Index: Integer; const AInterface: IInterface);
     function SubList(First, Count: Integer): IJclIntfList;
-
-    property Items[Key: Integer]: IInterface read GetObject write SetObject; default;
+    property Objects[Key: Integer]: IInterface read GetObject write SetObject; default;
   end;
 
   IJclAnsiStrList = interface(IJclAnsiStrCollection)
@@ -1514,8 +1517,7 @@
     function Delete(Index: Integer): AnsiString;
     procedure SetString(Index: Integer; const AString: AnsiString);
     function SubList(First, Count: Integer): IJclAnsiStrList;
-    //Daniele Teti
-    property Items[Key: Integer]: AnsiString read GetString write SetString; default;
+    property Strings[Key: Integer]: AnsiString read GetString write SetString; default;
   end;
 
   IJclWideStrList = interface(IJclWideStrCollection)
@@ -1528,8 +1530,7 @@
     function Delete(Index: Integer): WideString;
     procedure SetString(Index: Integer; const AString: WideString);
     function SubList(First, Count: Integer): IJclWideStrList;
-    //Daniele Teti
-    property Items[Key: Integer]: WideString read GetString write SetString; default;
+    property Strings[Key: Integer]: WideString read GetString write SetString; default;
   end;
 
   {$IFDEF CONTAINER_ANSISTR}
@@ -1549,7 +1550,6 @@
     function Delete(Index: Integer): Single;
     procedure SetValue(Index: Integer; const AValue: Single);
     function SubList(First, Count: Integer): IJclSingleList;
-    //Daniele Teti
     property Values[Key: Integer]: Single read GetValue write SetValue; default;
   end;
 
@@ -1563,7 +1563,6 @@
     function Delete(Index: Integer): Double;
     procedure SetValue(Index: Integer; const AValue: Double);
     function SubList(First, Count: Integer): IJclDoubleList;
-    //Daniele Teti
     property Values[Key: Integer]: Double read GetValue write SetValue; default;
   end;
 
@@ -1577,7 +1576,6 @@
     function Delete(Index: Integer): Extended;
     procedure SetValue(Index: Integer; const AValue: Extended);
     function SubList(First, Count: Integer): IJclExtendedList;
-    //Daniele Teti
     property Values[Key: Integer]: Extended read GetValue write SetValue; default;
   end;
 
@@ -1601,7 +1599,6 @@
     function Delete(Index: Integer): Integer;
     procedure SetValue(Index: Integer; AValue: Integer);
     function SubList(First, Count: Integer): IJclIntegerList;
-    //Daniele Teti
     property Values[Key: Integer]: Integer read GetValue write SetValue; default;
   end;
 
@@ -1615,7 +1612,6 @@
     function Delete(Index: Integer): Cardinal;
     procedure SetValue(Index: Integer; AValue: Cardinal);
     function SubList(First, Count: Integer): IJclCardinalList;
-    //Daniele Teti
     property Values[Key: Integer]: Cardinal read GetValue write SetValue; default;
   end;
 
@@ -1629,7 +1625,6 @@
     function Delete(Index: Integer): Int64;
     procedure SetValue(Index: Integer; const AValue: Int64);
     function SubList(First, Count: Integer): IJclInt64List;
-    //Daniele Teti
     property Values[Key: Integer]: Int64 read GetValue write SetValue; default;
   end;
 
@@ -1644,8 +1639,7 @@
     function Delete(Index: Integer): Pointer;
     procedure SetPtr(Index: Integer; APtr: Pointer);
     function SubList(First, Count: Integer): IJclPtrList;
-    //Daniele Teti
-    property Ptrs[Key: Integer]: Pointer read GetPtr write SetPtr; default;
+    property Pointers[Key: Integer]: Pointer read GetPtr write SetPtr; default;
   end;
   {$ENDIF ~CLR}
 
@@ -1659,8 +1653,7 @@
     function Delete(Index: Integer): TObject;
     procedure SetObject(Index: Integer; AObject: TObject);
     function SubList(First, Count: Integer): IJclList;
-    //Daniele Teti
-    property Items[Key: Integer]: TObject read GetObject write SetObject; default;
+    property Objects[Key: Integer]: TObject read GetObject write SetObject; default;
   end;
 
   {$IFDEF SUPPORTS_GENERICS}
@@ -1674,7 +1667,6 @@
     function Delete(Index: Integer): T;
     procedure SetItem(Index: Integer; const AItem: T);
     function SubList(First, Count: Integer): IJclList<T>;
-    //Daniele Teti
     property Items[Key: Integer]: T read GetItem write SetItem; default;
   end;
   {$ENDIF SUPPORTS_GENERICS}
@@ -1685,16 +1677,16 @@
     function GetObject(Index: Integer): IInterface;
     procedure SetObject(Index: Integer; const AInterface: IInterface);
     {$ENDIF CLR}
-    property Items[Index: Integer]: IInterface read GetObject write SetObject; default;
+    property Objects[Index: Integer]: IInterface read GetObject write SetObject; default;
   end;
 
   IJclAnsiStrArray = interface(IJclAnsiStrList)
-    ['{B055B427-7817-43FC-97D4-AD1845643D63}']
+    ['{4953EA83-9288-4537-9D10-544D1C992B62}']
     {$IFDEF CLR}
     function GetString(Index: Integer): AnsiString;
     procedure SetString(Index: Integer; const AString: AnsiString);
     {$ENDIF CLR}
-    property Items[Index: Integer]: AnsiString read GetString write SetString; default;
+    property Strings[Index: Integer]: AnsiString read GetString write SetString; default;
   end;
 
   IJclWideStrArray = interface(IJclWideStrList)
@@ -1703,7 +1695,7 @@
     function GetString(Index: Integer): WideString;
     procedure SetString(Index: Integer; const AString: WideString);
     {$ENDIF CLR}
-    property Items[Index: Integer]: WideString read GetString write SetString; default;
+    property Strings[Index: Integer]: WideString read GetString write SetString; default;
   end;
 
   {$IFDEF CONTAINER_ANSISTR}
@@ -1719,7 +1711,7 @@
     function GetValue(Index: Integer): Single;
     procedure SetValue(Index: Integer; const AValue: Single);
     {$ENDIF CLR}
-    property Items[Index: Integer]: Single read GetValue write SetValue; default;
+    property Values[Index: Integer]: Single read GetValue write SetValue; default;
   end;
 
   IJclDoubleArray = interface(IJclDoubleList)
@@ -1728,7 +1720,7 @@
     function GetValue(Index: Integer): Double;
     procedure SetValue(Index: Integer; const AValue: Double);
     {$ENDIF CLR}
-    property Items[Index: Integer]: Double read GetValue write SetValue; default;
+    property Values[Index: Integer]: Double read GetValue write SetValue; default;
   end;
 
   IJclExtendedArray = interface(IJclExtendedList)
@@ -1737,7 +1729,7 @@
     function GetValue(Index: Integer): Extended;
     procedure SetValue(Index: Integer; const AValue: Extended);
     {$ENDIF CLR}
-    property Items[Index: Integer]: Extended read GetValue write SetValue; default;
+    property Values[Index: Integer]: Extended read GetValue write SetValue; default;
   end;
 
   {$IFDEF MATH_EXTENDED_PRECISION}
@@ -1756,7 +1748,7 @@
     function GetValue(Index: Integer): Integer;
     procedure SetValue(Index: Integer; AValue: Integer);
     {$ENDIF CLR}
-    property Items[Index: Integer]: Integer read GetValue write SetValue; default;
+    property Values[Index: Integer]: Integer read GetValue write SetValue; default;
   end;
 
   IJclCardinalArray = interface(IJclCardinalList)
@@ -1765,7 +1757,7 @@
     function GetValue(Index: Integer): Cardinal;
     procedure SetValue(Index: Integer; AValue: Cardinal);
     {$ENDIF CLR}
-    property Items[Index: Integer]: Cardinal read GetValue write SetValue; default;
+    property Values[Index: Integer]: Cardinal read GetValue write SetValue; default;
   end;
 
   IJclInt64Array = interface(IJclInt64List)
@@ -1774,7 +1766,7 @@
     function GetValue(Index: Integer): Int64;
     procedure SetValue(Index: Integer; const AValue: Int64);
     {$ENDIF CLR}
-    property Items[Index: Integer]: Int64 read GetValue write SetValue; default;
+    property Values[Index: Integer]: Int64 read GetValue write SetValue; default;
   end;
 
   {$IFNDEF CLR}
@@ -1784,7 +1776,7 @@
     function GetPtr(Index: Integer): Pointer;
     procedure SetPtr(Index: Integer; APtr: Pointer);
     {$ENDIF CLR}
-    property Items[Index: Integer]: Pointer read GetPtr write SetPtr; default;
+    property Pointers[Index: Integer]: Pointer read GetPtr write SetPtr; default;
   end;
   {$ENDIF ~CLR}
 
@@ -1794,7 +1786,7 @@
     function GetObject(Index: Integer): TObject;
     procedure SetObject(Index: Integer; AObject: TObject);
     {$ENDIF CLR}
-    property Items[Index: Integer]: TObject read GetObject write SetObject; default;
+    property Objects[Index: Integer]: TObject read GetObject write SetObject; default;
   end;
 
   {$IFDEF SUPPORTS_GENERICS}
@@ -2059,7 +2051,8 @@
     function Remove(const Key: IInterface): IInterface;
     function Size: Integer;
     function Values: IJclIntfCollection;
-    property Items[const Key: IInterface]: IInterface read GetValue write PutValue; default;
+    property Items[const Key: IInterface]: IInterface read GetValue write PutValue;
+      {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
 
   (*IJclMultiIntfIntfMap = interface(IJclIntfIntfMap)
@@ -2166,7 +2159,6 @@
     function Equals(const AMap: IJclAnsiStrAnsiStrMap): Boolean;
     function GetValue(const Key: AnsiString): AnsiString;
     function IsEmpty: Boolean;
-    //Daniele Teti
     function KeyOfValue(const Value: AnsiString): AnsiString;
     function KeySet: IJclAnsiStrSet;
     procedure PutAll(const AMap: IJclAnsiStrAnsiStrMap);
@@ -2174,8 +2166,8 @@
     function Remove(const Key: AnsiString): AnsiString;
     function Size: Integer;
     function Values: IJclAnsiStrCollection;
-    //Daniele Teti
-    property Items[const Key: AnsiString]: AnsiString read GetValue write PutValue; default;
+    property Items[const Key: AnsiString]: AnsiString read GetValue write PutValue;
+      {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
 
   IJclWideStrWideStrMap = interface(IJclWideStrContainer)
@@ -2186,7 +2178,6 @@
     function Equals(const AMap: IJclWideStrWideStrMap): Boolean;
     function GetValue(const Key: WideString): WideString;
     function IsEmpty: Boolean;
-    //Daniele Teti
     function KeyOfValue(const Value: WideString): WideString;
     function KeySet: IJclWideStrSet;
     procedure PutAll(const AMap: IJclWideStrWideStrMap);
@@ -2194,8 +2185,8 @@
     function Remove(const Key: WideString): WideString;
     function Size: Integer;
     function Values: IJclWideStrCollection;
-    //Daniele Teti
-    property Items[const Key: WideString]: WideString read GetValue write PutValue; default;
+    property Items[const Key: WideString]: WideString read GetValue write PutValue;
+      {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
 
   {$IFDEF CONTAINER_ANSISTR}
@@ -2258,7 +2249,8 @@
     function Remove(const Key: Single): Single;
     function Size: Integer;
     function Values: IJclSingleCollection;
-    property Items[const Key: Single]: Single read GetValue write PutValue; default;
+    property Items[const Key: Single]: Single read GetValue write PutValue;
+      {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
 
   IJclDoubleIntfMap = interface(IJclDoubleContainer)
@@ -2314,7 +2306,8 @@
     function Remove(const Key: Double): Double;
     function Size: Integer;
     function Values: IJclDoubleCollection;
-    property Items[const Key: Double]: Double read GetValue write PutValue; default;
+    property Items[const Key: Double]: Double read GetValue write PutValue;
+      {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
 
   IJclExtendedIntfMap = interface(IJclExtendedContainer)
@@ -2370,7 +2363,8 @@
     function Remove(const Key: Extended): Extended;
     function Size: Integer;
     function Values: IJclExtendedCollection;
-    property Items[const Key: Extended]: Extended read GetValue write PutValue; default;
+    property Items[const Key: Extended]: Extended read GetValue write PutValue;
+      {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
 
   {$IFDEF MATH_EXTENDED_PRECISION}
@@ -2442,7 +2436,8 @@
     function Remove(Key: Integer): Integer;
     function Size: Integer;
     function Values: IJclIntegerCollection;
-    property Items[Key: Integer]: Integer read GetValue write PutValue; default;
+    property Items[Key: Integer]: Integer read GetValue write PutValue;
+      {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
 
   IJclCardinalIntfMap = interface(IJclContainer)
@@ -2498,7 +2493,8 @@
     function Remove(Key: Cardinal): Cardinal;
     function Size: Integer;
     function Values: IJclCardinalCollection;
-    property Items[Key: Cardinal]: Cardinal read GetValue write PutValue; default;
+    property Items[Key: Cardinal]: Cardinal read GetValue write PutValue;
+      {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
 
   IJclInt64IntfMap = interface(IJclContainer)
@@ -2554,7 +2550,8 @@
     function Remove(const Key: Int64): Int64;
     function Size: Integer;
     function Values: IJclInt64Collection;
-    property Items[const Key: Int64]: Int64 read GetValue write PutValue; default;
+    property Items[const Key: Int64]: Int64 read GetValue write PutValue;
+      {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
 
   {$IFNDEF CLR}
@@ -2611,7 +2608,8 @@
     function Remove(Key: Pointer): Pointer;
     function Size: Integer;
     function Values: IJclPtrCollection;
-    property Items[Key: Pointer]: Pointer read GetValue write PutValue; default;
+    property Items[Key: Pointer]: Pointer read GetValue write PutValue;
+      {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
   {$ENDIF ~CLR}
 
@@ -2630,7 +2628,6 @@
     function Remove(const Key: IInterface): TObject;
     function Size: Integer;
     function Values: IJclCollection;
-    //Daniele Teti
     property Items[const Key: IInterface]: TObject read GetValue write PutValue;
       {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
@@ -2650,7 +2647,6 @@
     function Remove(const Key: AnsiString): TObject;
     function Size: Integer;
     function Values: IJclCollection;
-    //Daniele Teti
     property Items[const Key: AnsiString]: TObject read GetValue write PutValue;
       {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
@@ -2670,7 +2666,6 @@
     function Remove(const Key: WideString): TObject;
     function Size: Integer;
     function Values: IJclCollection;
-    //Daniele Teti
     property Items[const Key: WideString]: TObject read GetValue write PutValue;
       {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
@@ -2697,7 +2692,6 @@
     function Remove(const Key: Single): TObject;
     function Size: Integer;
     function Values: IJclCollection;
-    //Daniele Teti
     property Items[const Key: Single]: TObject read GetValue write PutValue;
       {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
@@ -2717,7 +2711,6 @@
     function Remove(const Key: Double): TObject;
     function Size: Integer;
     function Values: IJclCollection;
-    //Daniele Teti
     property Items[const Key: Double]: TObject read GetValue write PutValue;
       {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
@@ -2737,7 +2730,6 @@
     function Remove(const Key: Extended): TObject;
     function Size: Integer;
     function Values: IJclCollection;
-    //Daniele Teti
     property Items[const Key: Extended]: TObject read GetValue write PutValue;
       {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
@@ -2767,7 +2759,6 @@
     function Remove(Key: Integer): TObject;
     function Size: Integer;
     function Values: IJclCollection;
-    //Daniele Teti
     property Items[Key: Integer]: TObject read GetValue write PutValue;
       {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
@@ -2787,7 +2778,6 @@
     function Remove(Key: Cardinal): TObject;
     function Size: Integer;
     function Values: IJclCollection;
-    //Daniele Teti
     property Items[Key: Cardinal]: TObject read GetValue write PutValue;
       {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
@@ -2807,7 +2797,6 @@
     function Remove(const Key: Int64): TObject;
     function Size: Integer;
     function Values: IJclCollection;
-    //Daniele Teti
     property Items[const Key: Int64]: TObject read GetValue write PutValue;
       {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
@@ -2828,7 +2817,6 @@
     function Remove(Key: Pointer): TObject;
     function Size: Integer;
     function Values: IJclCollection;
-    //Daniele Teti
     property Items[Key: Pointer]: TObject read GetValue write PutValue;
       {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
@@ -2849,8 +2837,8 @@
     function Remove(Key: TObject): TObject;
     function Size: Integer;
     function Values: IJclCollection;
-    //Daniele Teti
-    property Items[Key: TObject]: TObject read GetValue write PutValue; default;
+    property Items[Key: TObject]: TObject read GetValue write PutValue;
+      {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
 
   {$IFDEF SUPPORTS_GENERICS}
@@ -2873,8 +2861,8 @@
     function Remove(const Key: TKey): TValue;
     function Size: Integer;
     function Values: IJclCollection<TValue>;
-
-    property Items[const Key: TKey]: TValue read GetValue write PutValue; default;
+    property Items[const Key: TKey]: TValue read GetValue write PutValue;
+      {$IFNDEF BUGGY_DEFAULT_INDEXED_PROP} default; {$ENDIF ~BUGGY_DEFAULT_INDEXED_PROP}
   end;
   {$ENDIF SUPPORTS_GENERICS}
 
@@ -3441,13 +3429,13 @@
   end;
 
   {$IFDEF SUPPORTS_GENERICS}
-  IJclSortedMap<K,V> = interface(IJclMap<K,V>)
+  IJclSortedMap<TKey,TValue> = interface(IJclMap<TKey,TValue>)
     ['{C62B75C4-891B-442E-A5D6-9954E75A5C0C}']
-    function FirstKey: K;
-    function HeadMap(const ToKey: K): IJclSortedMap<K,V>;
-    function LastKey: K;
-    function SubMap(const FromKey, ToKey: K): IJclSortedMap<K,V>;
-    function TailMap(const FromKey: K): IJclSortedMap<K,V>;
+    function FirstKey: TKey;
+    function HeadMap(const ToKey: TKey): IJclSortedMap<TKey,TValue>;
+    function LastKey: TKey;
+    function SubMap(const FromKey, ToKey: TKey): IJclSortedMap<TKey,TValue>;
+    function TailMap(const FromKey: TKey): IJclSortedMap<TKey,TValue>;
   end;
   {$ENDIF SUPPORTS_GENERICS}
 
@@ -3482,8 +3470,8 @@
   IJclSingleSortedSet = interface(IJclSingleSet)
     ['{65EDA801-9E04-4119-BF9E-D7DD4AF82144}']
     function HeadSet(const Finish: Single): IJclSingleSortedSet;
-    function SubSet(const Start, Finish: Double): IJclSingleSortedSet;
-    function TailSet(const Start: Double): IJclSingleSortedSet;
+    function SubSet(const Start, Finish: Single): IJclSingleSortedSet;
+    function TailSet(const Start: Single): IJclSingleSortedSet;
   end;
 
   IJclDoubleSortedSet = interface(IJclDoubleSet)
@@ -3542,17 +3530,17 @@
 
   IJclSortedSet = interface(IJclSet)
     ['{A3D23E76-ADE9-446C-9B97-F49FCE895D9F}']
-    function HeadSet(AEndObject: TObject): IJclSortedSet;
+    function HeadSet(Finish: TObject): IJclSortedSet;
     function SubSet(Start, Finish: TObject): IJclSortedSet;
-    function TailSet(AStartObject: TObject): IJclSortedSet;
+    function TailSet(Start: TObject): IJclSortedSet;
   end;
 
   {$IFDEF SUPPORTS_GENERICS}
   IJclSortedSet<T> = interface(IJclSet<T>)
     ['{30F836E3-2FB1-427E-A499-DFAE201633C8}']
-    function HeadSet(const AEndItem: T): IJclSortedSet<T>;
+    function HeadSet(const Finish: T): IJclSortedSet<T>;
     function SubSet(const Start, Finish: T): IJclSortedSet<T>;
-    function TailSet(const AStartItem: T): IJclSortedSet<T>;
+    function TailSet(const Start: T): IJclSortedSet<T>;
   end;
   {$ENDIF SUPPORTS_GENERICS}
 

Copied: trunk/jcl/source/prototypes/JclContainerIntf.pas (from rev 2302, trunk/jcl/source/common/JclContainerIntf.pas)
===================================================================
--- trunk/jcl/source/prototypes/JclContainerIntf.pas	                        (rev 0)
+++ trunk/jcl/source/prototypes/JclContainerIntf.pas	2008-01-14 21:18:16 UTC (rev 2305)
@@ -0,0 +1,1435 @@
+{**************************************************************************************************}
+{                                                                                                  }
+{ Project JEDI Code Library (JCL)                                                                  }
+{                                                                                                  }
+{ The contents of this file are subject to the Mozilla Public License Version 1.1 (the "License"); }
+{ you may not use this file except in compliance with the License. You may obtain a copy of the    }
+{ License at http://www.mozilla.org/MPL/                                                           }
+{                                                                                                  }
+{ Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF   }
+{ ANY KIND, either express or implied. See the License for the specific language governing rights  }
+{ and limitations under the License.                                                               }
+{                                                                                                  }
+{ The Original Code is DCL_intf.pas.                                                               }
+{                                                                                                  }
+{ The Initial Developer of the Original Code is Jean-Philippe BEMPEL aka RDM. Portions created by  }
+{ Jean-Philippe BEMPEL are Copyright (C) Jean-Philippe BEMPEL (rdm_30 att yahoo dott com)          }
+{ All rights reserved.                                                                             }
+{                                                                                                  }
+{ Contributors:                                                                                    }
+{   Robert Marquardt (marquardt)                                                                   }
+{   Robert Rossmair (rrossmair)                                                                    }
+{   Florent Ouchet (outchy)                                                                        }
+{                                                                                                  }
+{**************************************************************************************************}
+{                                                                                                  }
+{ The Delphi Container Library                                                                     }
+{                                                                                                  }
+{**************************************************************************************************}
+{                                                                                                  }
+{ Last modified: $Date::                                                                         $ }
+{ Revision:      $Rev::                                                                          $ }
+{ Author:        $Author::                                                                       $ }
+{                                                                                                  }
+{**************************************************************************************************}
+
+unit JclContainerIntf;
+
+{$I jcl.inc}
+{$I containers\JclContainerIntf.int}
+interface
+
+uses
+  {$IFDEF UNITVERSIONING}
+  JclUnitVersioning,
+  {$ENDIF UNITVERSIONING}
+  Classes,
+  JclBase;
+
+{$IFDEF BCB6}
+{$DEFINE BUGGY_DEFAULT_INDEXED_PROP}
+{$ENDIF BCB6}
+{$IFDEF BCB10}
+{$DEFINE BUGGY_DEFAULT_INDEXED_PROP}
+{$ENDIF BCB10}
+{$IFDEF BCB11}
+{$DEFINE BUGGY_DEFAULT_INDEXED_PROP}
+{$ENDIF BCB11}
+
+const
+  DefaultContainerCapacity = 16;
+
+type
+  IJclLockable = interface
+    ['{524AD65E-AE1B-4BC6-91C8-8181F0198BA9}']
+    procedure ReadLock;
+    procedure ReadUnlock;
+    procedure WriteLock;
+    procedure WriteUnlock;
+  end;
+
+  IJclAbstractIterator = interface{$IFDEF THREADSAFE}(IJclLockable){$ENDIF THREADSAFE}
+    ['{1064D0B4-D9FC-475D-88BE-520490013B46}']
+    procedure Assign(const Source: IJclAbstractIterator);
+    procedure AssignTo(const Dest: IJclAbstractIterator);
+    function GetIteratorReference: TObject;
+  end;
+
+  IJclContainer = interface{$IFDEF THREADSAFE}(IJclLockable){$ENDIF THREADSAFE}
+    ['{C517175A-028E-486A-BF27-5EF7FC3101D9}']
+    procedure Assign(const Source: IJclContainer);
+    procedure AssignTo(const Dest: IJclContainer);
+    function GetAllowDefaultElements: Boolean;
+    function GetContainerReference: TObject;
+    function GetDuplicates: TDuplicates;
+    function GetReadOnly: Boolean;
+    function GetRemoveSingleElement: Boolean;
+    function GetReturnDefaultElements: Boolean;
+    function GetThreadSafe: Boolean;
+    procedure SetAllowDefaultElements(Value: Boolean);
+    procedure SetDuplicates(Value: TDuplicates);
+    procedure SetReadOnly(Value: Boolean);
+    procedure SetRemoveSingleElement(Value: Boolean);
+    procedure SetReturnDefaultElements(Value: Boolean);
+    procedure SetThreadSafe(Value: Boolean);
+    property AllowDefaultElements: Boolean read GetAllowDefaultElements write SetAllowDefaultElements;
+    property Duplicates: TDuplicates read GetDuplicates write SetDuplicates;
+    property ReadOnly: Boolean read GetReadOnly write SetReadOnly;
+    property RemoveSingleElement: Boolean read GetRemoveSingleElement write SetRemoveSingleElement;
+    property ReturnDefaultElements: Boolean read GetReturnDefaultElements write SetReturnDefaultElements;
+    property ThreadSafe: Boolean read GetThreadSafe write SetThreadSafe;
+  end;
+
+  IJclStrContainer = interface(IJclContainer)
+    ['{9753E1D7-F093-4D5C-8B32-40403F6F700E}']
+    function GetCaseSensitive: Boolean;
+    procedure SetCaseSensitive(Value: Boolean);
+    property CaseSensitive: Boolean read GetCaseSensitive write SetCaseSensitive;
+  end;
+
+  TJclAnsiStrEncoding = (seISO {, seUTF8}); // TODO: make JclUnicode compatible with Linux and .NET
+
+  IJclAnsiStrContainer = interface(IJclStrContainer)
+    ['{F8239357-B96F-46F1-A48E-B5DF25B5F1FA}']
+    function GetEncoding: TJclAnsiStrEncoding;
+    procedure SetEncoding(Value: TJclAnsiStrEncoding);
+    property Encoding: TJclAnsiStrEncoding read GetEncoding write SetEncoding;
+  end;
+
+  IJclAnsiStrFlatContainer = interface(IJclAnsiStrContainer)
+    ['{8A45A4D4-6317-4CDF-8314-C3E5CC6899F4}']
+    procedure LoadFromStrings(Strings: TStrings);
+    procedure SaveToStrings(Strings: TStrings);
+    procedure AppendToStrings(Strings: TStrings);
+    procedure AppendFromStrings(Strings: TStrings);
+    function GetAsStrings: TStrings;
+    function GetAsDelimited(const Separator: AnsiString = AnsiLineBreak): AnsiString;
+    procedure AppendDelimited(const AString: AnsiString; const Separator: AnsiString = AnsiLineBreak);
+    procedure LoadDelimited(const AString: AnsiString; const Separator: AnsiString = AnsiLineBreak);
+  end;
+
+  TJclWideStrEncoding = (weUCS2 {, wsUTF16}); // TODO: make JclUnicode compatible with Linux and .NET
+
+  IJclWideStrContainer = interface(IJclStrContainer)
+    ['{875E1AC4-CA22-46BC-8999-048E5B9BF11D}']
+    function GetEncoding: TJclWideStrEncoding;
+    procedure SetEncoding(Value: TJclWideStrEncoding);
+    property Encoding: TJclWideStrEncoding read GetEncoding write SetEncoding;
+  end;
+
+  IJclWideStrFlatContainer = interface(IJclWideStrContainer)
+    ['{5B001B93-CA1C-47A8-98B8-451CCB444930}']
+    {procedure LoadFromStrings(Strings: TWideStrings);
+    procedure SaveToStrings(Strings: TWideStrings);
+    procedure AppendToStrings(Strings: TWideStrings);
+    procedure AppendFromStrings(Strings: TWideStrings);
+    function GetAsStrings: TWideStrings;
+    function GetAsDelimited(const Separator: WideString = WideLineBreak): WideString;
+    procedure AppendDelimited(const AString: WideString; const Separator: WideString = WideLineBreak);
+    procedure LoadDelimited(const AString: WideString; const Separator: WideString = WideLineBreak);}
+  end;
+
+  IJclSingleContainer = interface(IJclContainer)
+    ['{22BE88BD-87D1-4B4D-9FAB-F1B6D555C6A9}']
+    function GetPrecision: Single;
+    procedure SetPrecision(const Value: Single);
+    property Precision: Single read GetPrecision write SetPrecision;
+  end;
+
+  IJclDoubleContainer = interface(IJclContainer)
+    ['{372B9354-DF6D-4CAA-A5A9-C50E1FEE5525}']
+    function GetPrecision: Double;
+    procedure SetPrecision(const Value: Double);
+    property Precision: Double read GetPrecision write SetPrecision;
+  end;
+
+  IJclExtendedContainer = interface(IJclContainer)
+    ['{431A6482-FD5C-45A7-BE53-339A3CF75AC9}']
+    function GetPrecision: Extended;
+    procedure SetPrecision(const Value: Extended);
+    property Precision: Extended read GetPrecision write SetPrecision;
+  end;
+
+  {$IFDEF MATH_EXTENDED_PRECISION}
+  IJclFloatContainer = IJclExtendedContainer;
+  {$ENDIF MATH_EXTENDED_PRECISION}
+  {$IFDEF MATH_DOUBLE_PRECISION}
+  IJclFloatContainer = IJclDoubleContainer;
+  {$ENDIF MATH_DOUBLE_PRECISION}
+  {$IFDEF MATH_SINGLE_PRECISION}
+  IJclFloatContainer = IJclSingleContainer;
+  {$ENDIF MATH_SINGLE_PRECISION}
+
+{$JPPEXPANDMACRO EQUALITYCOMPARER(IJclIntfEqualityComparer,5CC2DF51-BE56-4D02-A171-31BAAC097632,TIntfEqualityCompare,const ,IInterface)}
+
+{$JPPEXPANDMACRO EQUALITYCOMPARER(IJclAnsiStrEqualityComparer,E3DB9016-F0D0-4CE0-B156-4C5DCA47FD3B,TAnsiStrEqualityCompare,const ,AnsiString)}
+
+{$JPPEXPANDMACRO EQUALITYCOMPARER(IJclWideStrEqualityComparer,2E5696C9-8374-4347-9DC9-B3722F47F5FB,TWideStrEqualityCompare,const ,WideString)}
+
+  {$IFDEF CONTAINER_ANSISTR}
+  IJclStrEqualityComparer = IJclAnsiStrEqualityComparer;
+  {$ENDIF CONTAINER_ANSISTR}
+  {$IFDEF CONTAINER_WIDESTR}
+  IJclStrEqualityComparer = IJclWideStrEqualityComparer;
+  {$ENDIF CONTAINER_WIDESTR}
+
+{$JPPEXPANDMACRO EQUALITYCOMPARER(IJclSingleEqualityComparer,4835BC5B-1A87-4864-BFE1-778F3BAF26B1,TSingleEqualityCompare,const ,Single)}
+
+{$JPPEXPANDMACRO EQUALITYCOMPARER(IJclDoubleEqualityComparer,15F0A9F0-D5DC-4978-8CDB-53B6E510262C,TDoubleEqualityCompare,const ,Double)}
+
+{$JPPEXPANDMACRO EQUALITYCOMPARER(IJclExtendedEqualityComparer,149883D5-4138-4570-8C5C-99F186B7E646,TExtendedEqualityCompare,const ,Extended)}
+
+  {$IFDEF MATH_EXTENDED_PRECISION}
+  IJclFloatEqualityComparer = IJclExtendedEqualityComparer;
+  {$ENDIF MATH_EXTENDED_PRECISION}
+  {$IFDEF MATH_DOUBLE_PRECISION}
+  IJclFloatEqualityComparer = IJclDoubleEqualityComparer;
+  {$ENDIF MATH_DOUBLE_PRECISION}
+  {$IFDEF MATH_SINGLE_PRECISION}
+  IJclFloatEqualityComparer = IJclSingleEqualityComparer;
+  {$ENDIF MATH_SINGLE_PRECISION}
+
+{$JPPEXPANDMACRO EQUALITYCOMPARER(IJclIntegerEqualityComparer,AABC35E6-A779-4A44-B748-27BFCB34FDFB,TIntegerEqualityCompare,,Integer)}
+
+{$JPPEXPANDMACRO EQUALITYCOMPARER(IJclCardinalEqualityComparer,B2DECF81-6ECE-4D9F-80E1-C8C884DB407C,TCardinalEqualityCompare,,Cardinal)}
+
+{$JPPEXPANDMACRO EQUALITYCOMPARER(IJclInt64EqualityComparer,8B2825E2-0C81-42BA-AC0D-104344CE7E56,TInt64EqualityCompare,const ,Int64)}
+
+  {$IFNDEF CLR}
+{$JPPEXPANDMACRO EQUALITYCOMPARER(IJclPtrEqualityComparer,C6B7CBF9-ECD9-4D70-85CC-4E2367A1D806,TPtrEqualityCompare,,Pointer)}
+  {$ENDIF ~CLR}
+
+{$JPPEXPANDMACRO EQUALITYCOMPARER(IJclEqualityComparer,82C67986-8365-44AB-8D56-7B0CF4F6B918,TEqualityCompare,,TObject)}
+
+  {$IFDEF SUPPORTS_GENERICS}
+{$JPPEXPANDMACRO EQUALITYCOMPARER(IJclEqualityComparer<T>,4AF79AD6-D9F4-424B-BEAA-68857F9222B4,TEqualityCompare<T>,const ,T)}
+  {$ENDIF SUPPORTS_GENERICS}
+
+{$JPPEXPANDMACRO COMPARER(IJclIntfComparer,EB41B843-184B-420D-B5DA-27D055B4CD55,TIntfCompare,const ,IInterface)}
+
+{$JPPEXPANDMACRO COMPARER(IJclAnsiStrComparer,09063CBB-9226-4734-B2A0-A178C2343176,TAnsiStrCompare,const ,AnsiString)}
+
+{$JPPEXPANDMACRO COMPARER(IJclWideStrComparer,7A24AEDA-25B1-4E73-B2E9-5D74011E4C9C,TWideStrCompare,const ,WideString)}
+
+  {$IFDEF CONTAINER_ANSISTR}
+  IJclStrComparer = IJclAnsiStrComparer;
+  {$ENDIF CONTAINER_ANSISTR}
+  {$IFDEF CONTAINER_WIDESTR}
+  IJclStrComparer = IJclWideStrComparer;
+  {$ENDIF CONTAINER_WIDESTR}
+
+{$JPPEXPANDMACRO COMPARER(IJclSingleComparer,008225CE-075E-4450-B9DE-9863CB6D347C,TSingleCompare,const ,Single)}
+
+{$JPPEXPANDMACRO COMPARER(IJclDoubleComparer,BC245D7F-7EB9-43D0-81B4-EE215486A5AA,TDoubleCompare,const ,Double)}
+
+{$JPPEXPANDMACRO COMPARER(IJclExtendedComparer,92657C66-C18D-4BF8-A538-A3B0140320BB,TExtendedCompare,const ,Extended)}
+
+  {$IFDEF MATH_EXTENDED_PRECISION}
+  IJclFloatComparer = IJclExtendedComparer;
+  {$ENDIF MATH_EXTENDED_PRECISION}
+  {$IFDEF MATH_DOUBLE_PRECISION}
+  IJclFloatComparer = IJclDoubleComparer;
+  {$ENDIF MATH_DOUBLE_PRECISION}
+  {$IFDEF MATH_SINGLE_PRECISION}
+  IJclFloatComparer = IJclSingleComparer;
+  {$ENDIF MATH_SINGLE_PRECISION}
+
+{$JPPEXPANDMACRO COMPARER(IJclIntegerComparer,362C3A6A-CBC1-4D5F-8652-158913DC9865,TIntegerCompare,,Integer)}
+
+{$JPPEXPANDMACRO COMPARER(IJclCardinalComparer,56E44725-00B9-4530-8CC2-72DCA9171EE0,TCardinalCompare,,Cardinal)}
+
+{$JPPEXPANDMACRO COMPARER(IJclInt64Comparer,87C935BF-3A42-4F1F-A474-9C823939EE1C,TInt64Compare,const ,Int64)}
+
+  {$IFNDEF CLR}
+{$JPPEXPANDMACRO COMPARER(IJclPtrComparer,85557D4C-A036-477E-BA73-B5EEF43A8696,TPtrCompare,,Pointer)}
+  {$ENDIF ~CLR}
+
+{$JPPEXPANDMACRO COMPARER(IJclComparer,7B376028-56DC-4C4A-86A9-1AC19E3EDF75,TCompare,,TObject)}
+
+  {$IFDEF SUPPORTS_GENERICS}
+{$JPPEXPANDMACRO COMPARER(IJclComparer<T>,830AFC8C-AA06-46F5-AABD-8EB46B2A9986,TCompare<T>,const ,T)}
+  {$ENDIF SUPPORTS_GENERICS}
+
+{$JPPEXPANDMACRO HASHCONVERTER(IJclIntfHashConverter,7BAA0791-3B45-4D0F-9CD8-D13B81694786,TIntfHashConvert,const ,AInterface,IInterface)}
+
+{$JPPEXPANDMACRO HASHCONVERTER(IJclAnsiStrHashConverter,9841014E-8A31-4C79-8AD5-EB03C4E85533,TAnsiStrHashConvert,const ,AString,AnsiString)}
+
+{$JPPEXPANDMACRO HASHCONVERTER(IJclWideStrHashConverter,2584118F-19AE-443E-939B-0DB18BCD0117,TWideStrHashConvert,const ,AString,WideString)}
+
+  {$IFDEF CONTAINER_ANSISTR}
+  IJclStrHashConverter = IJclAnsiStrHashConverter;
+  {$ENDIF CONTAINER_ANSISTR}
+  {$IFDEF CONTAINER_WIDESTR}
+  IJclStrHashConverter = IJclWideStrHashConverter;
+  {$ENDIF CONTAINER_WIDESTR}
+
+{$JPPEXPANDMACRO HASHCONVERTER(IJclSingleHashConverter,20F0E481-F1D2-48B6-A95D-FBB56AF119F5,TSingleHashConvert,const ,AValue,Single)}
+
+{$JPPEXPANDMACRO HASHCONVERTER(IJclDoubleHashConverter,193A2881-535B-4AF4-B0C3-6845A2800F80,TDoubleHashConvert,const ,AValue,Double)}
+
+{$JPPEXPANDMACRO HASHCONVERTER(IJclExtendedHashConverter,77CECDB9-2774-4FDC-8E5A-A80325626434,TExtendedHashConvert,const ,AValue,Extended)}
+
+  {$IFDEF MATH_EXTENDED_PRECISION}
+  IJclFloatHashConverter = IJclExtendedHashConverter;
+  {$ENDIF MATH_EXTENDED_PRECISION}
+  {$IFDEF MATH_DOUBLE_PRECISION}
+  IJclFloatHashConverter = IJclDoubleHashConverter;
+  {$ENDIF MATH_DOUBLE_PRECISION}
+  {$IFDEF MATH_SINGLE_PRECISION}
+  IJclFloatHashConverter = IJclSingleHashConverter;
+  {$ENDIF MATH_SINGLE_PRECISION}
+
+{$JPPEXPANDMACRO HASHCONVERTER(IJclIntegerHashConverter,92C540B2-C16C-47E4-995A-644BE71878B1,TIntegerHashConvert,,AValue,Integer)}
+
+{$JPPEXPANDMACRO HASHCONVERTER(IJclCardinalHashConverter,2DF04C8A-16B8-4712-BC5D-AD35014EC9F7,TCardinalHashConvert,,AValue,Cardinal)}
+
+{$JPPEXPANDMACRO HASHCONVERTER(IJclInt64HashConverter,96CF2A71-9185-4E26-B283-457ABC3584E7,TInt64HashConvert,const ,AValue,Int64)}
+
+  {$IFNDEF CLR}
+{$JPPEXPANDMACRO HASHCONVERTER(IJclPtrHashConverter,D704CC67-CFED-44E6-9504-65D5E468FCAF,TPtrHashConvert,,Ptr,Pointer)}
+  {$ENDIF ~CLR}
+
+{$JPPEXPANDMACRO HASHCONVERTER(IJclHashConverter,2D0DD6F4-162E-41D6-8A34-489E7EACABCD,THashConvert,,AObject,TObject)}
+
+  {$IFDEF SUPPORTS_GENERICS}
+{$JPPEXPANDMACRO HASHCONVERTER(IJclHashConverter<T>,300AEA0E-7433-4C3E-99A6-E533212ACF42,THashConvert<T>,const ,AItem,T)}
+  {$ENDIF SUPPORTS_GENERICS}
+
+  IJclIntfCloneable = interface
+    ['{BCF77740-FB60-4306-9BD1-448AADE5FF4E}']
+    function Clone: IInterface;
+  end;
+
+  IJclCloneable = interface
+    ['{D224AE70-2C93-4998-9479-1D513D75F2B2}']
+    function Clone: TObject;
+  end;
+
+  TJclAutoPackStrategy = (apsDisabled, apsAgressive, apsProportional, apsIncremental);
+
+  // parameter signification depends on strategy
+  //  - Disabled = unused (arrays are never packed)
+  //  - Agressive = unused (arrays are always packed)
+  //  - Proportional = ratio of empty slots before the array is packed
+  //    number of empty slots is computed by this formula: Capacity div Parameter
+  //  - Incremental = amount of empty slots before the array is packed
+
+  IJclPackable = interface
+    ['{03802D2B-E0AB-4300-A777-0B8A2BD993DF}']
+    function CalcGrowCapacity(ACapacity, ASize: Integer): Integer;
+    function GetAutoPackParameter: Integer;
+    function GetAutoPackStrategy: TJclAutoPackStrategy;
+    function GetCapacity: Integer;
+    procedure Pack; // reduce used memory by eliminating empty storage area (force)
+    procedure SetAutoPackParameter(Value: Integer);
+    procedure SetAutoPackStrategy(Value: TJclAutoPackStrategy);
+    procedure SetCapacity(Value: Integer);
+    property AutoPackParameter: Integer read GetAutoPackParameter write SetAutoPackParameter;
+    property AutoPackStrategy: TJclAutoPackStrategy read GetAutoPackStrategy write SetAutoPackStrategy;
+    property Capacity: Integer read GetCapacity write SetCapacity;
+  end;
+
+  TJclAutoGrowStrategy = (agsDisabled, agsAgressive, agsProportional, agsIncremental);
+
+  // parameter signification depends on strategy
+  //  - Disabled = unused (arrays never grow)
+  //  - Agressive = unused (arrays always grow by 1 element)
+  //  - Proportional = ratio of empty slots to add to the array
+  //    number of empty slots is computed by this formula: Capacity div Parameter
+  //  - Incremental = amount of empty slots to add to the array
+
+  IJclGrowable = interface(IJclPackable)
+    ['{C71E8586-5688-444C-9BDD-9969D988123B}']
+    function CalcPackCapacity(ACapacity, ASize: Integer): Integer;
+    function GetAutoGrowParameter: Integer;
+    function GetAutoGrowStrategy: TJclAutoGrowStrategy;
+    procedure Grow;
+    procedure SetAutoGrowParameter(Value: Integer);
+    procedure SetAutoGrowStrategy(Value: TJclAutoGrowStrategy);
+    property AutoGrowParameter: Integer read GetAutoGrowParameter write SetAutoGrowParameter;
+    property AutoGrowStrategy: TJclAutoGrowStrategy read GetAutoGrowStrategy write SetAutoGrowStrategy;
+  end;
+
+  IJclObjectOwner = interface
+    ['{5157EA13-924E-4A56-995D-36956441025C}']
+    function FreeObject(var AObject: TObject): TObject;
+    function GetOwnsObjects: Boolean;
+    property OwnsObjects: Boolean read GetOwnsObjects;
+  end;
+
+  IJclKeyOwner = interface
+    ['{8BE209E6-2F85-44FD-B0CD-A8363C95349A}']
+    function FreeKey(var Key: TObject): TObject;
+    function GetOwnsKeys: Boolean;
+    property OwnsKeys: Boolean read GetOwnsKeys;
+  end;
+
+  IJclValueOwner = interface
+    ['{3BCD98CE-7056-416A-A9E7-AE3AB2A62E54}']
+    function FreeValue(var Value: TObject): TObject;
+    function GetOwnsValues: Boolean;
+    property OwnsValues: Boolean read GetOwnsValues;
+  end;
+
+  {$IFDEF SUPPORTS_GENERICS}
+  IJclItemOwner<T> = interface
+    ['{0CC220C1-E705-4B21-9F53-4AD340952165}']
+    function FreeItem(var AItem: T): T;
+    function GetOwnsItems: Boolean;
+    property OwnsItems: Boolean read GetOwnsItems;
+  end;
+
+  IJclPairOwner<TKey, TValue> = interface
+    ['{321C1FF7-AA2E-4229-966A-7EC6417EA16D}']
+    function FreeKey(var Key: TKey): TKey;
+    function FreeValue(var Value: TValue): TValue;
+    function GetOwnsKeys: Boolean;
+    function GetOwnsValues: Boolean;
+    property OwnsKeys: Boolean read GetOwnsKeys;
+    property OwnsValues: Boolean read GetOwnsValues;
+  end;
+  {$ENDIF SUPPORTS_GENERICS}
+
+{$JPPEXPANDMACRO ITERATOR(IJclIntfIterator,IJclAbstractIterator,E121A98A-7C43-4587-806B-9189E8B2F106,const ,AInterface,IInterface,GetObject,SetObject)}
+
+{$JPPEXPANDMACRO ITERATOR(IJclAnsiStrIterator,IJclAbstractIterator,D5D4B681-F902-49C7-B9E1-73007C9D64F0,const ,AString,AnsiString,GetString,SetString)}
+
+{$JPPEXPANDMACRO ITERATOR(IJclWideStrIterator,IJclAbstractIterator,F03BC7D4-CCDA-4C4A-AF3A-E51FDCDE8ADE,const ,AString,WideString,GetString,SetString)}
+
+  {$IFDEF CONTAINER_ANSISTR}
+  IJclStrIterator = IJclAnsiStrIterator;
+  {$ENDIF CONTAINER_ANSISTR}
+  {$IFDEF CONTAINER_WIDESTR}
+  IJclStrIterator = IJclWideStrIterator;
+  {$ENDIF CONTAINER_WIDESTR}
+
+{$JPPEXPANDMACRO ITERATOR(IJclSingleIterator,IJclAbstractIterator,FD1124F8-CB2B-4AD7-B12D-C05702F4204B,const ,AValue,Single,GetValue,SetValue)}
+
+{$JPPEXPANDMACRO ITERATOR(IJclDoubleIterator,IJclAbstractIterator,004C154A-281C-4DA7-BF64-F3EE80ACF640,const ,AValue,Double,GetValue,SetValue)}
+
+{$JPPEXPANDMACRO ITERATOR(IJclExtendedIterator,IJclAbstractIterator,B89877A5-DED4-4CD9-AB90-C7D062111DE0,const ,AValue,Extended,GetValue,SetValue)}
+
+  {$IFDEF MATH_EXTENDED_PRECISION}
+  IJclFloatIterator = IJclExtendedIterator;
+  {$ENDIF MATH_EXTENDED_PRECISION}
+  {$IFDEF MATH_DOUBLE_PRECISION}
+  IJclFloatIterator = IJclDoubleIterator;
+  {$ENDIF MATH_DOUBLE_PRECISION}
+  {$IFDEF MATH_SINGLE_PRECISION}
+  IJclFloatIterator = IJclSingleIterator;
+  {$ENDIF MATH_SINGLE_PRECISION}
+
+{$JPPEXPANDMACRO ITERATOR(IJclIntegerIterator,IJclAbstractIterator,1406A991-4574-48A1-83FE-2EDCA03908BE,,AValue,Integer,GetValue,SetValue)}
+
+{$JPPEXPANDMACRO ITERATOR(IJclCardinalIterator,IJclAbstractIterator,72847A34-C8C4-4592-9447-CEB8161E33AD,,AValue,Cardinal,GetValue,SetValue)}
+
+{$JPPEXPANDMACRO ITERATOR(IJclInt64Iterator,IJclAbstractIterator,573E5A51-BF76-43D7-9F93-46305BED20A8,const ,AValue,Int64,GetValue,SetValue)}
+
+  {$IFNDEF CLR}
+{$JPPEXPANDMACRO ITERATOR(IJclPtrIterator,IJclAbstractIterator,62B5501C-07AA-4D00-A85B-713B39912CDF,,APtr,Pointer,GetPtr,SetPtr)}
+  {$ENDIF ~CLR}
+
+{$JPPEXPANDMACRO ITERATOR(IJclIterator,IJclAbstractIterator,997DF9B7-9AA2-4239-8B94-14DFFD26D790,,AObject,TObject,GetObject,SetObject)}
+
+  {$IFDEF SUPPORTS_GENERICS}
+{$JPPEXPANDMACRO ITERATOR(IJclIterator<T>,IJclAbstractIterator,6E8547A4-5B5D-4831-8AE3-9C6D04071B11,const ,AItem,T,GetItem,SetItem)}
+  {$ENDIF SUPPORTS_GENERICS}
+
+{$JPPEXPANDMACRO TREEITERATOR(IJclIntfTreeIterator,IJclIntfIterator,C97379BF-C6A9-4A90-9D7A-152E9BAD314F,const ,AInterface,IInterface)}
+
+{$JPPEXPANDMACRO TREEITERATOR(IJclAnsiStrTreeIterator,IJclAnsiStrIterator,66BC5C76-758C-4E72-ABF1-EB02CF851C6D,const ,AString,AnsiString)}
+
+{$JPPEXPANDMACRO TREEITERATOR(IJclWideStrTreeIterator,IJclWideStrIterator,B3168A3B-5A90-4ABF-855F-3D2B3AB6EE7F,const ,AString,WideString)}
+
+  {$IFDEF CONTAINER_ANSISTR}
+  IJclStrTreeIterator = IJclAnsiStrTreeIterator;
+  {$ENDIF CONTAINER_ANSISTR}
+  {$IFDEF CONTAINER_WIDESTR}
+  IJclStrTreeIterator = IJclWideStrTreeIterator;
+  {$ENDIF CONTAINER_WIDESTR}
+
+{$JPPEXPANDMACRO TREEITERATOR(IJclSingleTreeIterator,IJclSingleIterator,17BFDE9D-DBF7-4DC8-AC74-919C717B4726,const ,AValue,Single)}
+
+{$JPPEXPANDMACRO TREEITERATOR(IJclDoubleTreeIterator,IJclDoubleIterator,EB39B84E-D3C5-496E-A521-B8BF24579252,const ,AValue,Double)}
+
+{$JPPEXPANDMACRO TREEITERATOR(IJclExtendedTreeIterator,IJclExtendedIterator,1B40A544-FC5D-454C-8E42-CE17B015E65C,const ,AValue,Extended)}
+
+  {$IFDEF MATH_EXTENDED_PRECISION}
+  IJclFloatTreeIterator = IJclExtendedTreeIterator;
+  {$ENDIF MATH_EXTENDED_PRECISION}
+  {$IFDEF MATH_DOUBLE_PRECISION}
+  IJclFloatTreeIterator = IJclDoubleTreeIterator;
+  {$ENDIF MATH_DOUBLE_PRECISION}
+  {$IFDEF MATH_SINGLE_PRECISION}
+  IJclFloatTreeIterator = IJclSingleTreeIterator;
+  {$ENDIF MATH_SINGLE_PRECISION}
+
+{$JPPEXPANDMACRO TREEITERATOR(IJclIntegerTreeIterator,IJclIntegerIterator,88EDC5C5-CA41-41AF-9838-AA19D07E69F5,,AValue,Integer)}
+
+{$JPPEXPANDMACRO TREEITERATOR(IJclCardinalTreeIterator,IJclCardinalIterator,FDBF493F-F79D-46EB-A59D-7193B6E6A860,,AValue,Cardinal)}
+
+{$JPPEXPANDMACRO TREEITERATOR(IJclInt64TreeIterator,IJclInt64Iterator,C5A5E504-E19B-43AC-90B9-E4B8984BFA23,const ,AValue,Int64)}
+
+  {$IFNDEF CLR}
+{$JPPEXPANDMACRO TREEITERATOR(IJclPtrTreeIterator,IJclPtrIterator,ED4C08E6-60FC-4ED3-BD19-E6605B9BD943,,APtr,Pointer)}
+  {$ENDIF ~CLR}
+
+{$JPPEXPANDMACRO TREEITERATOR(IJclTreeIterator,IJclIterator,8B4863B0-B6B9-426E-B5B8-7AF71D264237,,AObject,TObject)}
+
+  {$IFDEF SUPPORTS_GENERICS}
+{$JPPEXPANDMACRO TREEITERATOR(IJclTreeIterator<T>,IJclIterator<T>,29A06DA4-D93A-40A5-8581-0FE85BC8384B,const ,AItem,T)}
+  {$ENDIF SUPPORTS_GENERICS}
+
+{$JPPEXPANDMACRO BINTREEITERATOR(IJclIntfBinaryTreeIterator,IJclIntfTreeIterator,8BE874B2-0075-4EE0-8F49-665FC894D923,IInterface)}
+
+{$JPPEXPANDMACRO BINTREEITERATOR(IJclAnsiStrBinaryTreeIterator,IJclAnsiStrTreeIterator,34A4A300-042C-43A9-AC23-8FC1B76BFB25,AnsiString)}
+
+{$JPPEXPANDMACRO BINTREEITERATOR(IJclWideStrBinaryTreeIterator,IJclWideStrTreeIterator,17C08EB9-6880-469E-878A-8F5EBFE905B1,WideString)}
+
+  {$IFDEF CONTAINER_ANSISTR}
+  IJclStrBinaryTreeIterator = IJclAnsiStrBinaryTreeIterator;
+  {$ENDIF CONTAINER_ANSISTR}
+  {$IFDEF CONTAINER_WIDESTR}
+  IJclStrBinaryTreeIterator = IJclWideStrBinaryTreeIterator;
+  {$ENDIF CONTAINER_WIDESTR}
+
+{$JPPEXPANDMACRO BINTREEITERATOR(IJclSingleBinaryTreeIterator,IJclSingleTreeIterator,BC6FFB13-FA1C-4077-8273-F25A3119168B,Single)}
+
+{$JPPEXPANDMACRO BINTREEITERATOR(IJclDoubleBinaryTreeIterator,IJclDoubleTreeIterator,CE48083C-D60C-4315-BC14-8CE77AC3269E,Double)}
+
+{$JPPEXPANDMACRO BINTREEITERATOR(IJclExtendedBinaryTreeIterator,IJclExtendedTreeIterator,8A9FAE2A-5EF5-4165-8E8D-51F2102A4580,Extended)}
+
+  {$IFDEF MATH_EXTENDED_PRECISION}
+  IJclFloatBinaryTreeIterator = IJclExtendedBinaryTreeIterator;
+  {$ENDIF MATH_EXTENDED_PRECISION}
+  {$IFDEF MATH_DOUBLE_PRECISION}
+  IJclFloatBinaryTreeIterator = IJclDoubleBinaryTreeIterator;
+  {$ENDIF MATH_DOUBLE_PRECISION}
+  {$IFDEF MATH_SINGLE_PRECISION}
+  IJclFloatBinaryTreeIterator = IJclSingleBinaryTreeIterator;
+  {$ENDIF MATH_SINGLE_PRECISION}
+
+{$JPPEXPANDMACRO BINTREEITERATOR(IJclIntegerBinaryTreeIterator,IJclIntegerTreeIterator,FE2BF57D-D10D-4B0C-903D-BB61700FBA0A,Integer)}
+
+{$JPPEXPANDMACRO BINTREEITERATOR(IJclCardinalBinaryTreeIterator,IJclCardinalTreeIterator,AAA358F5-95A1-480F-8E2A-09028BA6C397,Cardinal)}
+
+{$JPPEXPANDMACRO BINTREEITERATOR(IJclInt64BinaryTreeIterator,IJclInt64TreeIterator,5605E164-5CDD-40B1-9323-DE1CB584E289,Int64)}
+
+  {$IFNDEF CLR}
+{$JPPEXPANDMACRO BINTREEITERATOR(IJclPtrBinaryTreeIterator,IJclPtrTreeIterator,75D3DF0D-C491-43F7-B078-E658197E8051,Pointer)}
+  {$ENDIF ~CLR}
+
+{$JPPEXPANDMACRO BINTREEITERATOR(IJclBinaryTreeIterator,IJclTreeIterator,821DE28D-631C-4F23-A0B2-CC0F35B4C64D,TObject)}
+
+  {$IFDEF SUPPORTS_GENERICS}
+{$JPPEXPANDMACRO BINTREEITERATOR(IJclBinaryTreeIterator<T>,IJclTreeIterator<T>,0CF5B0FC-C644-458C-BF48-2E093DAFEC26,T)}
+  {$ENDIF SUPPORTS_GENERICS}
+
+{$JPPEXPANDMACRO COLLECTION(IJclIntfCollection,IJclContainer,8E178463-4575-487A-B4D5-DC2AED3C7ACA,const ,AInterface,IInterface,IJclIntfIterator)}
+
+{$JPPEXPANDMACRO COLLECTION(IJclAnsiStrCollection,IJclAnsiStrFlatContainer,3E3CFC19-E8AF-4DD7-91FA-2DF2895FC7B9,const ,AString,AnsiString,IJclAnsiStrIterator)}
+
+{$JPPEXPANDMACRO COLLECTION(IJclWideStrCollection,IJclWideStrFlatContainer,CDCC0F94-4DD0-4F25-B441-6AE55D5C7466,const ,AString,WideString,IJclWideStrIterator)}
+
+  {$IFDEF CONTAINER_ANSISTR}
+  IJclStrCollection = IJclAnsiStrCollection;
+  {$ENDIF CONTAINER_ANSISTR}
+  {$IFDEF CONTAINER_WIDESTR}
+  IJclStrCollection = IJclWideStrCollection;
+  {$ENDIF CONTAINER_WIDESTR}
+
+{$JPPEXPANDMACRO COLLECTION(IJclSingleCollection,IJclSingleContainer,1D34D474-6588-441E-B2B3-8C021A37ED89,const ,AValue,Single,IJclSingleIterator)}
+
+{$JPPEXPANDMACRO COLLECTION(IJclDoubleCollection,IJclDoubleContainer,E54C7717-C33A-4F1B-860C-4F60F303EAD3,const ,AValue,Double,IJclDoubleIterator)}
+
+{$JPPEXPANDMACRO COLLECTION(IJclExtendedCollection,IJclExtendedContainer,2A1341CB-B997-4E3B-B1CA-6D60AE853C55,const ,AValue,Extended,IJclExtendedIterator)}
+
+  {$IFDEF MATH_EXTENDED_PRECISION}
+  IJclFloatCollection = IJclExtendedCollection;
+  {$ENDIF MATH_EXTENDED_PRECISION}
+  {$IFDEF MATH_DOUBLE_PRECISION}
+  IJclFloatCollection = IJclDoubleCollection;
+  {$ENDIF MATH_DOUBLE_PRECISION}
+  {$IFDEF MATH_SINGLE_PRECISION}
+  IJclFloatCollection = IJclSingleCollection;
+  {$ENDIF MATH_SINGLE_PRECISION}
+
+{$JPPEXPANDMACRO COLLECTION(IJclIntegerCollection,IJclContainer,AF69890D-22D1-4D89-8FFD-5FAD7E0638BA,,AValue,Integer,IJclIntegerIterator)}
+
+{$JPPEXPANDMACRO COLLECTION(IJclCardinalCollection,IJclContainer,CFBD0344-58C8-4FA2-B4D7-D21D77DFBF80,,AValue,Cardinal,IJclCardinalIterator)}
+
+{$JPPEXPANDMACRO COLLECTION(IJclInt64Collection,IJclContainer,93A45BDE-3C4C-48D6-9874-5322914DFDDA,const ,AValue,Int64,IJclInt64Iterator)}
+
+  {$IFNDEF CLR}
+{$JPPEXPANDMACRO COLLECTION(IJclPtrCollection,IJclContainer,02E909A7-5B1D-40D4-82EA-A0CD97D5C811,,APtr,Pointer,IJclPtrIterator)}
+  {$ENDIF ~CLR}
+
+{$JPPEXPANDMACRO COLLECTION(IJclCollection,IJclContainer,58947EF1-CD21-4DD1-AE3D-225C3AAD7EE5,,AObject,TObject,IJclIterator)}
+
+  {$IFDEF SUPPORTS_GENERICS}
+{$JPPEXPANDMACRO COLLECTION(IJclCollection<T>,IJclContainer,67EE8AF3-19B0-4DCA-A730-3C9B261B8EC5,const ,AItem,T,IJclIterator<T>)}
+  {$ENDIF SUPPORTS_GENERICS}
+
+{$JPPEXPANDMACRO LIST(IJclIntfList,IJclIntfCollection,E14EDA4B-1DAA-4013-9E6C-CDCB365C7CF9,const ,AInterface,IInterface,GetObject,SetObject,Objects)}
+
+{$JPPEXPANDMACRO LIST(IJclAnsiStrList,IJclAnsiStrCollection,07DD7644-EAC6-4059-99FC-BEB7FBB73186,const ,AString,AnsiString,GetString,SetString,Strings)}
+
+{$JPPEXPANDMACRO LIST(IJclWideStrList,IJclWideStrCollection,C9955874-6AC0-4CE0-8CC0-606A3F1702C6,const ,AString,WideString,GetString,SetString,Strings)}
+
+  {$IFDEF CONTAINER_ANSISTR}
+  IJclStrList = IJclAnsiStrList;
+  {$ENDIF CONTAINER_ANSISTR}
+  {$IFDEF CONTAINER_WIDESTR}
+  IJclStrList = IJclWideStrList;
+  {$ENDIF CONTAINER_WIDESTR}
+
+{$JPPEXPANDMACRO LIST(IJclSingleList,IJclSingleCollection,D081324C-70A4-4AAC-BA42-7557F0262826,const ,AValue,Single,GetValue,SetValue,Values)}
+
+{$JPPEXPANDMACRO LIST(IJclDoubleList,IJclDoubleCollection,ECA58515-3903-4312-9486-3214E03F35AB,const ,AValue,Double,GetValue,SetValue,Values)}
+
+{$JPPEXPANDMACRO LIST(IJclExtendedList,IJclExtendedCollection,7463F954-F8DF-4B02-A284-FCB98746248E,const ,AValue,Extended,GetValue,SetValue,Values)}
+
+  {$IFDEF MATH_EXTENDED_PRECISION}
+  IJclFloatList = IJclExtendedList;
+  {$ENDIF MATH_EXTENDED_PRECISION}
+  {$IFDEF MATH_DOUBLE_PRECISION}
+  IJclFloatList = IJclDoubleList;
+  {$ENDIF MATH_DOUBLE_PRECISION}
+  {$IFDEF MATH_SINGLE_PRECISION}
+  IJclFloatList = IJclSingleList;
+  {$ENDIF MATH_SINGLE_PRECISION}
+
+{$JPPEXPANDMACRO LIST(IJclIntegerList,IJclIntegerCollection,339BE91B-557D-4CE0-A854-1CBD4FE31725,,AValue,Integer,GetValue,SetValue,Values)}
+
+{$JPPEXPANDMACRO LIST(IJclCardinalList,IJclCardinalCollection,02B09EA8-DE6F-4A18-AA57-C3533E6AC4E3,,AValue,Cardinal,GetValue,SetValue,Values)}
+
+{$JPPEXPANDMACRO LIST(IJclInt64List,IJclInt64Collection,E8D49200-91D3-4BD0-A59B-B93EC7E2074B,const ,AValue,Int64,GetValue,SetValue,Values)}
+
+  {$IFNDEF CLR}
+{$JPPEXPANDMACRO LIST(IJclPtrList,IJclPtrCollection,2CF5CF1F-C012-480C-A4CE-38BDAFB15D05,,APtr,Pointer,GetPtr,SetPtr,Pointers)}
+  {$ENDIF ~CLR}
+
+{$JPPEXPANDMACRO LIST(IJclList,IJclCollection,8ABC70AC-5C06-43EA-AFE0-D066379BCC28,,AObject,TObject,GetObject,SetObject,Objects)}
+
+  {$IFDEF SUPPORTS_GENERICS}
+{$JPPEXPANDMACRO LIST(IJclList<T>,IJclCollection<T>,3B4BE3D7-8FF7-4163-91DF-3F73AE6935E7,const ,AItem,T,GetItem,SetItem,Items)}
+  {$ENDIF SUPPORTS_GENERICS}
+
+{$JPPEXPANDMACRO ARRAY(IJclIntfArray,IJclIntfList,B055B427-7817-43FC-97D4-AD1845643D63,const ,AInterface,IInterface,GetObject,SetObject,Objects)}
+
+{$JPPEXPANDMACRO ARRAY(IJclAnsiStrArray,IJclAnsiStrList,4953EA83-9288-4537-9D10-544D1C992B62,const ,AString,AnsiString,GetString,SetString,Strings)}
+
+{$JPPEXPANDMACRO ARRAY(IJclWideStrArray,IJclWideStrList,3CE09F9A-5CB4-4867-80D5-C2313D278D69,const ,AString,WideString,GetString,SetString,Strings)}
+
+  {$IFDEF CONTAINER_ANSISTR}
+  IJclStrArray = IJclAnsiStrArray;
+  {$ENDIF CONTAINER_ANSISTR}
+  {$IFDEF CONTAINER_WIDESTR}
+  IJclStrArray = IJclWideStrArray;
+  {$ENDIF CONTAINER_WIDESTR}
+
+{$JPPEXPANDMACRO ARRAY(IJclSingleArray,IJclSingleList,B96E2A4D-D750-4B65-B975-C619A05A29F6,const ,AValue,Single,GetValue,SetValue,Values)}
+
+{$JPPEXPANDMACRO ARRAY(IJclDoubleArray,IJclDoubleList,67E66324-9757-4E85-8ECD-53396910FB39,const ,AValue,Double,GetValue,SetValue,Values)}
+
+{$JPPEXPANDMACRO ARRAY(IJclExtendedArray,IJclExtendedList,D43E8D18-26B3-41A2-8D52-ED7EA2FE1AB7,const ,AValue,Extended,GetValue,SetValue,Values)}
+
+  {$IFDEF MATH_EXTENDED_PRECISION}
+  IJclFloatArray = IJclExtendedArray;
+  {$ENDIF MATH_EXTENDED_PRECISION}
+  {$IFDEF MATH_DOUBLE_PRECISION}
+  IJclFloatArray = IJclDoubleArray;
+  {$ENDIF MATH_DOUBLE_PRECISION}
+  {$IFDEF MATH_SINGLE_PRECISION}
+  IJclFloatArray = IJclSingleArray;
+  {$ENDIF MATH_SINGLE_PRECISION}
+
+{$JPPEXPANDMACRO ARRAY(IJclIntegerArray,IJclIntegerList,2B7C8B33-C0BD-4EC3-9764-63866E174781,,AValue,Integer,GetValue,SetValue,Values)}
+
+{$JPPEXPANDMACRO ARRAY(IJclCardinalArray,IJclCardinalList,C451F2F8-65C6-4C29-99A0-CC9C15356418,,AValue,Cardinal,GetValue,SetValue,Values)}
+
+{$JPPEXPANDMACRO ARRAY(IJclInt64Array,IJclInt64List,D947C43D-2D04-442A-A707-39EDE7D96FC9,const ,AValue,Int64,GetValue,SetValue,Values)}
+
+  {$IFNDEF CLR}
+{$JPPEXPANDMACRO ARRAY(IJclPtrArray,IJclPtrList,D43E8D18-26B3-41A2-8D52-ED7EA2FE1AB7,,APtr,Pointer,GetPtr,SetPtr,Pointers)}
+  {$ENDIF ~CLR}
+
+{$JPPEXPANDMACRO ARRAY(IJclArray,IJclList,A69F6D35-54B2-4361-852E-097ED75E648A,,AObject,TObject,GetObject,SetObject,Objects)}
+
+  {$IFDEF SUPPORTS_GENERICS}
+{$JPPEXPANDMACRO ARRAY(IJclArray<T>,IJclList<T>,38810C13-E35E-428A-B84F-D25FB994BE8E,const ,AItem,T,GetItem,SetItem,Items)}
+  {$ENDIF SUPPORTS_GENERICS}
+
+{$JPPEXPANDMACRO SET(IJclIntfSet,IJclIntfCollection,E2D28852-9774-49B7-A739-5DBA2B705924)}
+
+{$JPPEXPANDMACRO SET(IJclAnsiStrSet,IJclAnsiStrCollection,72204D85-2B68-4914-B9F2-09E5180C12E9)}
+
+{$JPPEXPANDMACRO SET(IJclWideStrSet,IJclWideStrCollection,08009E0A-ABDD-46AB-8CEE-407D4723E17C)}
+
+  {$IFDEF CONTAINER_ANSISTR}
+  IJclStrSet = IJclAnsiStrSet;
+  {$ENDIF CONTAINER_ANSISTR}
+  {$IFDEF CONTAINER_WIDESTR}
+  IJclStrSet = IJclWideStrSet;
+  {$ENDIF CONTAINER_WIDESTR}
+
+{$JPPEXPANDMACRO SET(IJclSingleSet,IJclSingleCollection,36E34A78-6A29-4503-97D5-4BF53538CEC0)}
+
+{$JPPEXPANDMACRO SET(IJclDoubleSet,IJclDoubleCollection,4E1E4847-E934-4811-A26C-5FC8E772A623)}
+
+{$JPPEXPANDMACRO SET(IJclExtendedSet,IJclExtendedCollection,3B9CF52D-1C49-4388-A7B3-9BEE1821FFD4)}
+
+  {$IFDEF MATH_EXTENDED_PRECISION}
+  IJclFloatSet = IJclExtendedSet;
+  {$ENDIF MATH_EXTENDED_PRECISION}
+  {$IFDEF MATH_DOUBLE_PRECISION}
+  IJclFloatSet = IJclDoubleSet;
+  {$ENDIF MATH_DOUBLE_PRECISION}
+  {$IFDEF MATH_SINGLE_PRECISION}
+  IJclFloatSet = IJclSingleSet;
+  {$ENDIF MATH_SINGLE_PRECISION}
+
+{$JPPEXPANDMACRO SET(IJclIntegerSet,IJclIntegerCollection,5E4D29AF-F508-465B-9008-D11FF82F25FE)}
+
+{$JPPEXPANDMACRO SET(IJclCardinalSet,IJclCardinalCollection,09858637-CE8F-42E6-97E0-2786CD68387B)}
+
+{$JPPEXPANDMACRO SET(IJclInt64Set,IJclInt64Collection,ACB3127A-48EE-4F9F-B988-6AE9057780E9)}
+
+  {$IFNDEF CLR}
+{$JPPEXPANDMACRO SET(IJclPtrSet,IJclPtrCollection,26717C68-4F83-4CCB-973A-7324FBD09632)}
+  {$ENDIF ~CLR}
+
+{$JPPEXPANDMACRO SET(IJclSet,IJclCollection,0B7CDB90-8588-4260-A54C-D87101C669EA)}
+
+  {$IFDEF SUPPORTS_GENERICS}
+{$JPPEXPANDMACRO SET(IJclSet<T>,IJclCollection<T>,0B7CDB90-8588-4260-A54C-D87101C669EA)}
+  {$ENDIF SUPPORTS_GENERICS}
+
+  TJclTraverseOrder = (toPreOrder, toOrder, toPostOrder);
+
+{$JPPEXPANDMACRO TREE(IJclIntfTree,IJclIntfCollection,5A21688F-113D-41B4-A17C-54BDB0BD6559,IJclIntfTreeIterator)}
+
+{$JPPEXPANDMACRO TREE(IJclAnsiStrTree,IJclAnsiStrCollection,1E1896C0-0497-47DF-83AF-A9422084636C,IJclAnsiStrTreeIterator)}
+
+{$JPPEXPANDMACRO TREE(IJclWideStrTree,IJclWideStrCollection,E325615A-7A20-4788-87FA-9051002CCD91,IJclWideStrTreeIterator)}
+
+  {$IFDEF CONTAINER_ANSISTR}
+  IJclStrTree = IJclAnsiStrTree;
+  {$ENDIF CONTAINER_ANSISTR}
+  {$IFDEF CONTAINER_WIDESTR}
+  IJclStrTree = IJclWideStrTree;
+  {$ENDIF CONTAINER_WIDESTR}
+
+{$JPPEXPANDMACRO TREE(IJclSingleTree,IJclSingleCollection,A90A51BC-EBD7-40D3-B0A0-C9987E7A83D0,IJclSingleTreeIterator)}
+
+{$JPPEXPANDMACRO TREE(IJclDoubleTree,IJclDoubleCollection,69DA85B1-A0DD-407B-B5CF-5EB7C6D4B82D,IJclDoubleTreeIterator)}
+
+{$JPPEXPANDMACRO TREE(IJclExtendedTree,IJclExtendedCollection,9ACCCAFD-B617-43DC-AAF9-916BE324A17E,IJclExtendedTreeIterator)}
+
+  {$IFDEF MATH_EXTENDED_PRECISION}
+  IJclFloatTree = IJclExtendedTree;
+  {$ENDIF MATH_EXTENDED_PRECISION}
+  {$IFDEF MATH_DOUBLE_PRECISION}
+  IJclFloatTree = IJclDoubleTree;
+  {$ENDIF MATH_DOUBLE_PRECISION}
+  {$IFDEF MATH_SINGLE_PRECISION}
+  IJclFloatTree = IJclSingleTree;
+  {$ENDIF MATH_SINGLE_PRECISION}
+
+{$JPPEXPANDMACRO TREE(IJclIntegerTree,IJclIntegerCollection,40A6F934-E5F3-4C74-AC02-227035C8C3C6,IJclIntegerTreeIterator)}
+
+{$JPPEXPANDMACRO TREE(IJclCardinalTree,IJclCardinalCollection,6C76C668-50C8-42A2-B72B-79BF102E270D,IJclCardinalTreeIterator)}
+
+{$JPPEXPANDMACRO TREE(IJclInt64Tree,IJclInt64Collection,1925B973-8B75-4A79-A993-DF2598FF19BE,IJclInt64TreeIterator)}
+
+  {$IFNDEF CLR}
+{$JPPEXPANDMACRO TREE(IJclPtrTree,IJclPtrCollection,2C1ACA3E-3F23-4E3C-984D-151CF9776E14,IJclPtrTreeIterator)}
+  {$ENDIF ~CLR}
+
+{$JPPEXPANDMACRO TREE(IJclTree,IJclCollection,B0C658CC-FEF5-4178-A4C5-442C0DEDE207,IJclTreeIterator)}
+
+  {$IFDEF SUPPORTS_GENERIC...
 
[truncated message content]

[Jcl-checkins-diff] SF.net SVN: jcl: [2304] trunk/jcl/packages

From: <ou...@us...> - 2008-01-13 18:55:54

Revision: 2304
          http://jcl.svn.sourceforge.net/jcl/?rev=2304&view=rev
Author:   outchy
Date:     2008-01-13 10:55:51 -0800 (Sun, 13 Jan 2008)

Log Message:
-----------
updated copyright year to 2008.

Modified Paths:
--------------
    trunk/jcl/packages/c5/JclBaseExpertC50.rc
    trunk/jcl/packages/c5/JclBaseExpertC50.res
    trunk/jcl/packages/c5/JclC50.rc
    trunk/jcl/packages/c5/JclC50.res
    trunk/jcl/packages/c5/JclDebugExpertC50.RES
    trunk/jcl/packages/c5/JclDebugExpertC50.rc
    trunk/jcl/packages/c5/JclDebugExpertDLLC50.rc
    trunk/jcl/packages/c5/JclDebugExpertDLLC50.res
    trunk/jcl/packages/c5/JclFavoriteFoldersExpertC50.rc
    trunk/jcl/packages/c5/JclFavoriteFoldersExpertC50.res
    trunk/jcl/packages/c5/JclFavoriteFoldersExpertDLLC50.rc
    trunk/jcl/packages/c5/JclFavoriteFoldersExpertDLLC50.res
    trunk/jcl/packages/c5/JclProjectAnalysisExpertC50.RES
    trunk/jcl/packages/c5/JclProjectAnalysisExpertC50.rc
    trunk/jcl/packages/c5/JclProjectAnalysisExpertDLLC50.rc
    trunk/jcl/packages/c5/JclProjectAnalysisExpertDLLC50.res
    trunk/jcl/packages/c5/JclRepositoryExpertC50.rc
    trunk/jcl/packages/c5/JclRepositoryExpertC50.res
    trunk/jcl/packages/c5/JclRepositoryExpertDLLC50.rc
    trunk/jcl/packages/c5/JclRepositoryExpertDLLC50.res
    trunk/jcl/packages/c5/JclSIMDViewExpertC50.rc
    trunk/jcl/packages/c5/JclSIMDViewExpertC50.res
    trunk/jcl/packages/c5/JclSIMDViewExpertDLLC50.rc
    trunk/jcl/packages/c5/JclSIMDViewExpertDLLC50.res
    trunk/jcl/packages/c5/JclThreadNameExpertC50.RES
    trunk/jcl/packages/c5/JclThreadNameExpertC50.rc
    trunk/jcl/packages/c5/JclThreadNameExpertDLLC50.rc
    trunk/jcl/packages/c5/JclThreadNameExpertDLLC50.res
    trunk/jcl/packages/c5/JclUsesExpertC50.RES
    trunk/jcl/packages/c5/JclUsesExpertC50.rc
    trunk/jcl/packages/c5/JclUsesExpertDLLC50.rc
    trunk/jcl/packages/c5/JclUsesExpertDLLC50.res
    trunk/jcl/packages/c5/JclVersionControlExpertC50.rc
    trunk/jcl/packages/c5/JclVersionControlExpertC50.res
    trunk/jcl/packages/c5/JclVersionControlExpertDLLC50.rc
    trunk/jcl/packages/c5/JclVersionControlExpertDLLC50.res
    trunk/jcl/packages/c5/template.rc
    trunk/jcl/packages/c6/Jcl.RES
    trunk/jcl/packages/c6/Jcl.rc
    trunk/jcl/packages/c6/JclBaseExpert.rc
    trunk/jcl/packages/c6/JclBaseExpert.res
    trunk/jcl/packages/c6/JclDebugExpert.RES
    trunk/jcl/packages/c6/JclDebugExpert.rc
    trunk/jcl/packages/c6/JclDebugExpertDLL.rc
    trunk/jcl/packages/c6/JclDebugExpertDLL.res
    trunk/jcl/packages/c6/JclFavoriteFoldersExpert.RES
    trunk/jcl/packages/c6/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.res
    trunk/jcl/packages/c6/JclProjectAnalysisExpert.RES
    trunk/jcl/packages/c6/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/c6/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/c6/JclProjectAnalysisExpertDLL.res
    trunk/jcl/packages/c6/JclRepositoryExpert.rc
    trunk/jcl/packages/c6/JclRepositoryExpert.res
    trunk/jcl/packages/c6/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/c6/JclRepositoryExpertDLL.res
    trunk/jcl/packages/c6/JclSIMDViewExpert.rc
    trunk/jcl/packages/c6/JclSIMDViewExpert.res
    trunk/jcl/packages/c6/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/c6/JclSIMDViewExpertDLL.res
    trunk/jcl/packages/c6/JclThreadNameExpert.RES
    trunk/jcl/packages/c6/JclThreadNameExpert.rc
    trunk/jcl/packages/c6/JclThreadNameExpertDLL.rc
    trunk/jcl/packages/c6/JclThreadNameExpertDLL.res
    trunk/jcl/packages/c6/JclUsesExpert.RES
    trunk/jcl/packages/c6/JclUsesExpert.rc
    trunk/jcl/packages/c6/JclUsesExpertDLL.rc
    trunk/jcl/packages/c6/JclUsesExpertDLL.res
    trunk/jcl/packages/c6/JclVClx.RES
    trunk/jcl/packages/c6/JclVClx.rc
    trunk/jcl/packages/c6/JclVcl.RES
    trunk/jcl/packages/c6/JclVcl.rc
    trunk/jcl/packages/c6/JclVersionControlExpert.rc
    trunk/jcl/packages/c6/JclVersionControlExpert.res
    trunk/jcl/packages/c6/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/c6/JclVersionControlExpertDLL.res
    trunk/jcl/packages/c6/template.rc
    trunk/jcl/packages/cs1/Jcl.RES
    trunk/jcl/packages/cs1/Jcl.bdsproj
    trunk/jcl/packages/cs1/Jcl.rc
    trunk/jcl/packages/cs1/JclBaseExpert.RES
    trunk/jcl/packages/cs1/JclBaseExpert.bdsproj
    trunk/jcl/packages/cs1/JclBaseExpert.rc
    trunk/jcl/packages/cs1/JclFavoriteFoldersExpertDLL.RES
    trunk/jcl/packages/cs1/JclFavoriteFoldersExpertDLL.bdsproj
    trunk/jcl/packages/cs1/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/cs1/JclVersionControlExpertDLL.bdsproj
    trunk/jcl/packages/cs1/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/cs1/JclVersionControlExpertDLL.res
    trunk/jcl/packages/cs1/template.bdsproj
    trunk/jcl/packages/cs1/template.rc
    trunk/jcl/packages/d10/Jcl.bdsproj
    trunk/jcl/packages/d10/Jcl.rc
    trunk/jcl/packages/d10/Jcl.res
    trunk/jcl/packages/d10/JclBaseExpert.bdsproj
    trunk/jcl/packages/d10/JclBaseExpert.rc
    trunk/jcl/packages/d10/JclBaseExpert.res
    trunk/jcl/packages/d10/JclDebugExpert.bdsproj
    trunk/jcl/packages/d10/JclDebugExpert.rc
    trunk/jcl/packages/d10/JclDebugExpert.res
    trunk/jcl/packages/d10/JclDebugExpertDLL.bdsproj
    trunk/jcl/packages/d10/JclDebugExpertDLL.rc
    trunk/jcl/packages/d10/JclDebugExpertDLL.res
    trunk/jcl/packages/d10/JclFavoriteFoldersExpert.bdsproj
    trunk/jcl/packages/d10/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/d10/JclFavoriteFoldersExpert.res
    trunk/jcl/packages/d10/JclFavoriteFoldersExpertDLL.bdsproj
    trunk/jcl/packages/d10/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d10/JclFavoriteFoldersExpertDLL.res
    trunk/jcl/packages/d10/JclProjectAnalysisExpert.RES
    trunk/jcl/packages/d10/JclProjectAnalysisExpert.bdsproj
    trunk/jcl/packages/d10/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/d10/JclProjectAnalysisExpertDLL.bdsproj
    trunk/jcl/packages/d10/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/d10/JclProjectAnalysisExpertDLL.res
    trunk/jcl/packages/d10/JclRepositoryExpert.bdsproj
    trunk/jcl/packages/d10/JclRepositoryExpert.rc
    trunk/jcl/packages/d10/JclRepositoryExpert.res
    trunk/jcl/packages/d10/JclRepositoryExpertDLL.bdsproj
    trunk/jcl/packages/d10/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/d10/JclRepositoryExpertDLL.res
    trunk/jcl/packages/d10/JclSIMDViewExpert.bdsproj
    trunk/jcl/packages/d10/JclSIMDViewExpert.rc
    trunk/jcl/packages/d10/JclSIMDViewExpert.res
    trunk/jcl/packages/d10/JclSIMDViewExpertDLL.bdsproj
    trunk/jcl/packages/d10/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/d10/JclSIMDViewExpertDLL.res
    trunk/jcl/packages/d10/JclThreadNameExpert.bdsproj
    trunk/jcl/packages/d10/JclThreadNameExpert.rc
    trunk/jcl/packages/d10/JclThreadNameExpert.res
    trunk/jcl/packages/d10/JclThreadNameExpertDLL.bdsproj
    trunk/jcl/packages/d10/JclThreadNameExpertDLL.rc
    trunk/jcl/packages/d10/JclThreadNameExpertDLL.res
    trunk/jcl/packages/d10/JclVcl.bdsproj
    trunk/jcl/packages/d10/JclVcl.rc
    trunk/jcl/packages/d10/JclVcl.res
    trunk/jcl/packages/d10/JclVersionControlExpert.bdsproj
    trunk/jcl/packages/d10/JclVersionControlExpert.rc
    trunk/jcl/packages/d10/JclVersionControlExpert.res
    trunk/jcl/packages/d10/JclVersionControlExpertDLL.bdsproj
    trunk/jcl/packages/d10/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d10/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d10/template.bdsproj
    trunk/jcl/packages/d10/template.rc
    trunk/jcl/packages/d10.net/Jedi.Jcl.bdsproj
    trunk/jcl/packages/d10.net/Jedi.Jcl.dpr
    trunk/jcl/packages/d10.net/template.bdsproj
    trunk/jcl/packages/d10.net/template.dpr
    trunk/jcl/packages/d11/Jcl.dproj
    trunk/jcl/packages/d11/Jcl.rc
    trunk/jcl/packages/d11/Jcl.res
    trunk/jcl/packages/d11/JclBaseExpert.dproj
    trunk/jcl/packages/d11/JclBaseExpert.rc
    trunk/jcl/packages/d11/JclBaseExpert.res
    trunk/jcl/packages/d11/JclDebugExpert.dproj
    trunk/jcl/packages/d11/JclDebugExpert.rc
    trunk/jcl/packages/d11/JclDebugExpert.res
    trunk/jcl/packages/d11/JclDebugExpertDLL.dproj
    trunk/jcl/packages/d11/JclDebugExpertDLL.rc
    trunk/jcl/packages/d11/JclDebugExpertDLL.res
    trunk/jcl/packages/d11/JclFavoriteFoldersExpert.dproj
    trunk/jcl/packages/d11/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/d11/JclFavoriteFoldersExpert.res
    trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.dproj
    trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d11/JclFavoriteFoldersExpertDLL.res
    trunk/jcl/packages/d11/JclProjectAnalysisExpert.dproj
    trunk/jcl/packages/d11/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/d11/JclProjectAnalysisExpert.res
    trunk/jcl/packages/d11/JclProjectAnalysisExpertDLL.dproj
    trunk/jcl/packages/d11/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/d11/JclProjectAnalysisExpertDLL.res
    trunk/jcl/packages/d11/JclRepositoryExpert.dproj
    trunk/jcl/packages/d11/JclRepositoryExpert.rc
    trunk/jcl/packages/d11/JclRepositoryExpert.res
    trunk/jcl/packages/d11/JclRepositoryExpertDLL.dproj
    trunk/jcl/packages/d11/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/d11/JclRepositoryExpertDLL.res
    trunk/jcl/packages/d11/JclSIMDViewExpert.dproj
    trunk/jcl/packages/d11/JclSIMDViewExpert.rc
    trunk/jcl/packages/d11/JclSIMDViewExpert.res
    trunk/jcl/packages/d11/JclSIMDViewExpertDLL.dproj
    trunk/jcl/packages/d11/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/d11/JclSIMDViewExpertDLL.res
    trunk/jcl/packages/d11/JclThreadNameExpert.dproj
    trunk/jcl/packages/d11/JclThreadNameExpert.rc
    trunk/jcl/packages/d11/JclThreadNameExpert.res
    trunk/jcl/packages/d11/JclThreadNameExpertDLL.dproj
    trunk/jcl/packages/d11/JclThreadNameExpertDLL.rc
    trunk/jcl/packages/d11/JclThreadNameExpertDLL.res
    trunk/jcl/packages/d11/JclVcl.dproj
    trunk/jcl/packages/d11/JclVcl.rc
    trunk/jcl/packages/d11/JclVcl.res
    trunk/jcl/packages/d11/JclVersionControlExpert.dproj
    trunk/jcl/packages/d11/JclVersionControlExpert.rc
    trunk/jcl/packages/d11/JclVersionControlExpert.res
    trunk/jcl/packages/d11/JclVersionControlExpertDLL.dproj
    trunk/jcl/packages/d11/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d11/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d11/template.dproj
    trunk/jcl/packages/d11/template.rc
    trunk/jcl/packages/d11.net/Jedi.Jcl.dpk
    trunk/jcl/packages/d11.net/Jedi.Jcl.dproj
    trunk/jcl/packages/d11.net/template.dpk
    trunk/jcl/packages/d11.net/template.dproj
    trunk/jcl/packages/d5/JclBaseExpertD50.rc
    trunk/jcl/packages/d5/JclBaseExpertD50.res
    trunk/jcl/packages/d5/JclD50.RES
    trunk/jcl/packages/d5/JclD50.rc
    trunk/jcl/packages/d5/JclDebugExpertD50.RES
    trunk/jcl/packages/d5/JclDebugExpertD50.rc
    trunk/jcl/packages/d5/JclDebugExpertDLLD50.RES
    trunk/jcl/packages/d5/JclDebugExpertDLLD50.rc
    trunk/jcl/packages/d5/JclFavoriteFoldersExpertD50.RES
    trunk/jcl/packages/d5/JclFavoriteFoldersExpertD50.rc
    trunk/jcl/packages/d5/JclFavoriteFoldersExpertDLLD50.RES
    trunk/jcl/packages/d5/JclFavoriteFoldersExpertDLLD50.rc
    trunk/jcl/packages/d5/JclProjectAnalysisExpertD50.RES
    trunk/jcl/packages/d5/JclProjectAnalysisExpertD50.rc
    trunk/jcl/packages/d5/JclProjectAnalysisExpertDLLD50.RES
    trunk/jcl/packages/d5/JclProjectAnalysisExpertDLLD50.rc
    trunk/jcl/packages/d5/JclRepositoryExpertD50.rc
    trunk/jcl/packages/d5/JclRepositoryExpertD50.res
    trunk/jcl/packages/d5/JclRepositoryExpertDLLD50.rc
    trunk/jcl/packages/d5/JclRepositoryExpertDLLD50.res
    trunk/jcl/packages/d5/JclSIMDViewExpertD50.RES
    trunk/jcl/packages/d5/JclSIMDViewExpertD50.rc
    trunk/jcl/packages/d5/JclSIMDViewExpertDLLD50.RES
    trunk/jcl/packages/d5/JclSIMDViewExpertDLLD50.rc
    trunk/jcl/packages/d5/JclThreadNameExpertD50.RES
    trunk/jcl/packages/d5/JclThreadNameExpertD50.rc
    trunk/jcl/packages/d5/JclThreadNameExpertDLLD50.RES
    trunk/jcl/packages/d5/JclThreadNameExpertDLLD50.rc
    trunk/jcl/packages/d5/JclUsesExpertD50.RES
    trunk/jcl/packages/d5/JclUsesExpertD50.rc
    trunk/jcl/packages/d5/JclUsesExpertDLLD50.RES
    trunk/jcl/packages/d5/JclUsesExpertDLLD50.rc
    trunk/jcl/packages/d5/JclVersionControlExpertD50.rc
    trunk/jcl/packages/d5/JclVersionControlExpertD50.res
    trunk/jcl/packages/d5/JclVersionControlExpertDLLD50.rc
    trunk/jcl/packages/d5/JclVersionControlExpertDLLD50.res
    trunk/jcl/packages/d5/template.rc
    trunk/jcl/packages/d6/Jcl.rc
    trunk/jcl/packages/d6/Jcl.res
    trunk/jcl/packages/d6/JclBaseExpert.rc
    trunk/jcl/packages/d6/JclBaseExpert.res
    trunk/jcl/packages/d6/JclDebugExpert.rc
    trunk/jcl/packages/d6/JclDebugExpert.res
    trunk/jcl/packages/d6/JclDebugExpertDLL.RES
    trunk/jcl/packages/d6/JclDebugExpertDLL.rc
    trunk/jcl/packages/d6/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/d6/JclFavoriteFoldersExpert.res
    trunk/jcl/packages/d6/JclFavoriteFoldersExpertDLL.RES
    trunk/jcl/packages/d6/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d6/JclProjectAnalysisExpert.RES
    trunk/jcl/packages/d6/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/d6/JclProjectAnalysisExpertDLL.RES
    trunk/jcl/packages/d6/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/d6/JclRepositoryExpert.rc
    trunk/jcl/packages/d6/JclRepositoryExpert.res
    trunk/jcl/packages/d6/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/d6/JclRepositoryExpertDLL.res
    trunk/jcl/packages/d6/JclSIMDViewExpert.rc
    trunk/jcl/packages/d6/JclSIMDViewExpert.res
    trunk/jcl/packages/d6/JclSIMDViewExpertDLL.RES
    trunk/jcl/packages/d6/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/d6/JclThreadNameExpert.rc
    trunk/jcl/packages/d6/JclThreadNameExpert.res
    trunk/jcl/packages/d6/JclThreadNameExpertDLL.RES
    trunk/jcl/packages/d6/JclThreadNameExpertDLL.rc
    trunk/jcl/packages/d6/JclUsesExpert.rc
    trunk/jcl/packages/d6/JclUsesExpert.res
    trunk/jcl/packages/d6/JclUsesExpertDLL.RES
    trunk/jcl/packages/d6/JclUsesExpertDLL.rc
    trunk/jcl/packages/d6/JclVClx.rc
    trunk/jcl/packages/d6/JclVClx.res
    trunk/jcl/packages/d6/JclVcl.rc
    trunk/jcl/packages/d6/JclVcl.res
    trunk/jcl/packages/d6/JclVersionControlExpert.rc
    trunk/jcl/packages/d6/JclVersionControlExpert.res
    trunk/jcl/packages/d6/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d6/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d6/template.rc
    trunk/jcl/packages/d7/Jcl.rc
    trunk/jcl/packages/d7/Jcl.res
    trunk/jcl/packages/d7/JclBaseExpert.rc
    trunk/jcl/packages/d7/JclBaseExpert.res
    trunk/jcl/packages/d7/JclDebugExpert.rc
    trunk/jcl/packages/d7/JclDebugExpert.res
    trunk/jcl/packages/d7/JclDebugExpertDLL.RES
    trunk/jcl/packages/d7/JclDebugExpertDLL.rc
    trunk/jcl/packages/d7/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/d7/JclFavoriteFoldersExpert.res
    trunk/jcl/packages/d7/JclFavoriteFoldersExpertDLL.RES
    trunk/jcl/packages/d7/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d7/JclProjectAnalysisExpert.RES
    trunk/jcl/packages/d7/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/d7/JclProjectAnalysisExpertDLL.RES
    trunk/jcl/packages/d7/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/d7/JclRepositoryExpert.rc
    trunk/jcl/packages/d7/JclRepositoryExpert.res
    trunk/jcl/packages/d7/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/d7/JclRepositoryExpertDLL.res
    trunk/jcl/packages/d7/JclSIMDViewExpert.rc
    trunk/jcl/packages/d7/JclSIMDViewExpert.res
    trunk/jcl/packages/d7/JclSIMDViewExpertDLL.RES
    trunk/jcl/packages/d7/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/d7/JclThreadNameExpert.rc
    trunk/jcl/packages/d7/JclThreadNameExpert.res
    trunk/jcl/packages/d7/JclThreadNameExpertDLL.RES
    trunk/jcl/packages/d7/JclThreadNameExpertDLL.rc
    trunk/jcl/packages/d7/JclUsesExpert.rc
    trunk/jcl/packages/d7/JclUsesExpert.res
    trunk/jcl/packages/d7/JclUsesExpertDLL.RES
    trunk/jcl/packages/d7/JclUsesExpertDLL.rc
    trunk/jcl/packages/d7/JclVClx.rc
    trunk/jcl/packages/d7/JclVClx.res
    trunk/jcl/packages/d7/JclVcl.rc
    trunk/jcl/packages/d7/JclVcl.res
    trunk/jcl/packages/d7/JclVersionControlExpert.rc
    trunk/jcl/packages/d7/JclVersionControlExpert.res
    trunk/jcl/packages/d7/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d7/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d7/template.rc
    trunk/jcl/packages/d8/Jcl.RES
    trunk/jcl/packages/d8/Jcl.bdsproj
    trunk/jcl/packages/d8/Jcl.rc
    trunk/jcl/packages/d8/JclBaseExpert.RES
    trunk/jcl/packages/d8/JclBaseExpert.bdsproj
    trunk/jcl/packages/d8/JclBaseExpert.rc
    trunk/jcl/packages/d8/JclFavoriteFoldersExpertDLL.RES
    trunk/jcl/packages/d8/JclFavoriteFoldersExpertDLL.bdsproj
    trunk/jcl/packages/d8/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d8/JclVersionControlExpertDLL.bdsproj
    trunk/jcl/packages/d8/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d8/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d8/template.bdsproj
    trunk/jcl/packages/d8/template.rc
    trunk/jcl/packages/d9/Jcl.RES
    trunk/jcl/packages/d9/Jcl.bdsproj
    trunk/jcl/packages/d9/Jcl.rc
    trunk/jcl/packages/d9/JclBaseExpert.bdsproj
    trunk/jcl/packages/d9/JclBaseExpert.rc
    trunk/jcl/packages/d9/JclBaseExpert.res
    trunk/jcl/packages/d9/JclDebugExpert.RES
    trunk/jcl/packages/d9/JclDebugExpert.bdsproj
    trunk/jcl/packages/d9/JclDebugExpert.rc
    trunk/jcl/packages/d9/JclDebugExpertDLL.RES
    trunk/jcl/packages/d9/JclDebugExpertDLL.bdsproj
    trunk/jcl/packages/d9/JclDebugExpertDLL.rc
    trunk/jcl/packages/d9/JclFavoriteFoldersExpert.bdsproj
    trunk/jcl/packages/d9/JclFavoriteFoldersExpert.rc
    trunk/jcl/packages/d9/JclFavoriteFoldersExpert.res
    trunk/jcl/packages/d9/JclFavoriteFoldersExpertDLL.RES
    trunk/jcl/packages/d9/JclFavoriteFoldersExpertDLL.bdsproj
    trunk/jcl/packages/d9/JclFavoriteFoldersExpertDLL.rc
    trunk/jcl/packages/d9/JclProjectAnalysisExpert.RES
    trunk/jcl/packages/d9/JclProjectAnalysisExpert.bdsproj
    trunk/jcl/packages/d9/JclProjectAnalysisExpert.rc
    trunk/jcl/packages/d9/JclProjectAnalysisExpertDLL.RES
    trunk/jcl/packages/d9/JclProjectAnalysisExpertDLL.bdsproj
    trunk/jcl/packages/d9/JclProjectAnalysisExpertDLL.rc
    trunk/jcl/packages/d9/JclRepositoryExpert.bdsproj
    trunk/jcl/packages/d9/JclRepositoryExpert.rc
    trunk/jcl/packages/d9/JclRepositoryExpert.res
    trunk/jcl/packages/d9/JclRepositoryExpertDLL.bdsproj
    trunk/jcl/packages/d9/JclRepositoryExpertDLL.rc
    trunk/jcl/packages/d9/JclRepositoryExpertDLL.res
    trunk/jcl/packages/d9/JclSIMDViewExpert.bdsproj
    trunk/jcl/packages/d9/JclSIMDViewExpert.rc
    trunk/jcl/packages/d9/JclSIMDViewExpertDLL.RES
    trunk/jcl/packages/d9/JclSIMDViewExpertDLL.bdsproj
    trunk/jcl/packages/d9/JclSIMDViewExpertDLL.rc
    trunk/jcl/packages/d9/JclSimdViewExpert.RES
    trunk/jcl/packages/d9/JclThreadNameExpert.RES
    trunk/jcl/packages/d9/JclThreadNameExpert.bdsproj
    trunk/jcl/packages/d9/JclThreadNameExpert.rc
    trunk/jcl/packages/d9/JclThreadNameExpertDLL.RES
    trunk/jcl/packages/d9/JclThreadNameExpertDLL.bdsproj
    trunk/jcl/packages/d9/JclThreadNameExpertDLL.rc
    trunk/jcl/packages/d9/JclVcl.RES
    trunk/jcl/packages/d9/JclVcl.bdsproj
    trunk/jcl/packages/d9/JclVcl.rc
    trunk/jcl/packages/d9/JclVersionControlExpert.bdsproj
    trunk/jcl/packages/d9/JclVersionControlExpert.rc
    trunk/jcl/packages/d9/JclVersionControlExpert.res
    trunk/jcl/packages/d9/JclVersionControlExpertDLL.bdsproj
    trunk/jcl/packages/d9/JclVersionControlExpertDLL.rc
    trunk/jcl/packages/d9/JclVersionControlExpertDLL.res
    trunk/jcl/packages/d9/template.bdsproj
    trunk/jcl/packages/d9/template.rc
    trunk/jcl/packages/d9.net/Jedi.Jcl.bdsproj
    trunk/jcl/packages/d9.net/Jedi.Jcl.dpr
    trunk/jcl/packages/d9.net/template.bdsproj
    trunk/jcl/packages/d9.net/template.dpr
    trunk/jcl/packages/k3/Jcl.rc
    trunk/jcl/packages/k3/Jcl.res
    trunk/jcl/packages/k3/JclVClx.rc
    trunk/jcl/packages/k3/JclVClx.res
    trunk/jcl/packages/k3/template.rc

Modified: trunk/jcl/packages/c5/JclBaseExpertC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclBaseExpertC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclBaseExpertC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Package containing common units for JCL Experts\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclBaseExpertC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclBaseExpertC50C50.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclBaseExpertC50.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JEDI Code Library RTL package\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclC50C50.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclC50.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclDebugExpertC50.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclDebugExpertC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclDebugExpertC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclDebugExpertC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Debug IDE extension\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclDebugExpertC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclDebugExpertC50C50.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclDebugExpertDLLC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclDebugExpertDLLC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclDebugExpertDLLC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Debug IDE extension\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclDebugExpertDLLC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclDebugExpertDLLC50C50.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclDebugExpertDLLC50.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclFavoriteFoldersExpertC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclFavoriteFoldersExpertC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclFavoriteFoldersExpertC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Open and Save IDE dialogs with favorite folders\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclFavoriteFoldersExpertC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclFavoriteFoldersExpertC50C50.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclFavoriteFoldersExpertC50.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclFavoriteFoldersExpertDLLC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclFavoriteFoldersExpertDLLC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclFavoriteFoldersExpertDLLC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Open and Save IDE dialogs with favorite folders\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclFavoriteFoldersExpertDLLC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclFavoriteFoldersExpertDLLC50C50.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclFavoriteFoldersExpertDLLC50.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclProjectAnalysisExpertC50.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclProjectAnalysisExpertC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclProjectAnalysisExpertC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclProjectAnalysisExpertC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Project Analyzer\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclProjectAnalysisExpertC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclProjectAnalysisExpertC50C50.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclProjectAnalysisExpertDLLC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclProjectAnalysisExpertDLLC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclProjectAnalysisExpertDLLC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Project Analyzer\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclProjectAnalysisExpertDLLC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclProjectAnalysisExpertDLLC50C50.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclProjectAnalysisExpertDLLC50.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclRepositoryExpertC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclRepositoryExpertC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclRepositoryExpertC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Package containing repository wizards\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclRepositoryExpertC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclRepositoryExpertC50C50.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclRepositoryExpertC50.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclRepositoryExpertDLLC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclRepositoryExpertDLLC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclRepositoryExpertDLLC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Package containing repository wizards\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclRepositoryExpertDLLC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclRepositoryExpertDLLC50C50.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclRepositoryExpertDLLC50.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclSIMDViewExpertC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclSIMDViewExpertC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclSIMDViewExpertC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Debug Window of XMM registers\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclSIMDViewExpertC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclSIMDViewExpertC50C50.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclSIMDViewExpertC50.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclSIMDViewExpertDLLC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclSIMDViewExpertDLLC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclSIMDViewExpertDLLC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Debug Window of XMM registers\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclSIMDViewExpertDLLC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclSIMDViewExpertDLLC50C50.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclSIMDViewExpertDLLC50.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclThreadNameExpertC50.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclThreadNameExpertC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclThreadNameExpertC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclThreadNameExpertC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Thread Name IDE expert\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclThreadNameExpertC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclThreadNameExpertC50C50.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclThreadNameExpertDLLC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclThreadNameExpertDLLC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclThreadNameExpertDLLC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Thread Name IDE expert\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclThreadNameExpertDLLC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclThreadNameExpertDLLC50C50.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclThreadNameExpertDLLC50.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclUsesExpertC50.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclUsesExpertC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclUsesExpertC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclUsesExpertC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Uses Wizard\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclUsesExpertC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclUsesExpertC50C50.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclUsesExpertDLLC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclUsesExpertDLLC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclUsesExpertDLLC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Uses Wizard\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclUsesExpertDLLC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclUsesExpertDLLC50C50.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclUsesExpertDLLC50.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclVersionControlExpertC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclVersionControlExpertC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclVersionControlExpertC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Integration of version control systems in the IDE\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclVersionControlExpertC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclVersionControlExpertC50C50.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclVersionControlExpertC50.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclVersionControlExpertDLLC50.rc
===================================================================
--- trunk/jcl/packages/c5/JclVersionControlExpertDLLC50.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/JclVersionControlExpertDLLC50.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Integration of version control systems in the IDE\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclVersionControlExpertDLLC50\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclVersionControlExpertDLLC50C50.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c5/JclVersionControlExpertDLLC50.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/template.rc
===================================================================
--- trunk/jcl/packages/c5/template.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c5/template.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "%DESCRIPTION%\0"
               VALUE "FileVersion", "%VERSION_MAJOR_NUMBER%.%VERSION_MINOR_NUMBER%.%RELEASE_NUMBER%.%BUILD_NUMBER%\0"
               VALUE "InternalName", "%NAME%\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "%NAME%C50%BINEXTENSION%\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "%VERSION_MAJOR_NUMBER%.%VERSION_MINOR_NUMBER% Build %BUILD_NUMBER%\0"

Modified: trunk/jcl/packages/c6/Jcl.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/Jcl.rc
===================================================================
--- trunk/jcl/packages/c6/Jcl.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/Jcl.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JEDI Code Library RTL package\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "Jcl\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclBaseExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclBaseExpert.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclBaseExpert.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Package containing common units for JCL Experts\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclBaseExpert\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclBaseExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclBaseExpert.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclDebugExpert.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclDebugExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclDebugExpert.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclDebugExpert.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Debug IDE extension\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclDebugExpert\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclDebugExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclDebugExpertDLL.rc
===================================================================
--- trunk/jcl/packages/c6/JclDebugExpertDLL.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclDebugExpertDLL.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Debug IDE extension\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclDebugExpertDLL\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclDebugExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclDebugExpertDLL.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclFavoriteFoldersExpert.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclFavoriteFoldersExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclFavoriteFoldersExpert.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclFavoriteFoldersExpert.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Open and Save IDE dialogs with favorite folders\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclFavoriteFoldersExpert\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclFavoriteFoldersExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.rc
===================================================================
--- trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Open and Save IDE dialogs with favorite folders\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclFavoriteFoldersExpertDLL\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclFavoriteFoldersExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclFavoriteFoldersExpertDLL.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclProjectAnalysisExpert.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclProjectAnalysisExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclProjectAnalysisExpert.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclProjectAnalysisExpert.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Project Analyzer\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclProjectAnalysisExpert\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclProjectAnalysisExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclProjectAnalysisExpertDLL.rc
===================================================================
--- trunk/jcl/packages/c6/JclProjectAnalysisExpertDLL.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclProjectAnalysisExpertDLL.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Project Analyzer\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclProjectAnalysisExpertDLL\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclProjectAnalysisExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclProjectAnalysisExpertDLL.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclRepositoryExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclRepositoryExpert.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclRepositoryExpert.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Package containing repository wizards\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclRepositoryExpert\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclRepositoryExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclRepositoryExpert.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclRepositoryExpertDLL.rc
===================================================================
--- trunk/jcl/packages/c6/JclRepositoryExpertDLL.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclRepositoryExpertDLL.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Package containing repository wizards\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclRepositoryExpertDLL\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclRepositoryExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclRepositoryExpertDLL.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclSIMDViewExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclSIMDViewExpert.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclSIMDViewExpert.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Debug Window of XMM registers\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclSIMDViewExpert\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclSIMDViewExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclSIMDViewExpert.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclSIMDViewExpertDLL.rc
===================================================================
--- trunk/jcl/packages/c6/JclSIMDViewExpertDLL.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclSIMDViewExpertDLL.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Debug Window of XMM registers\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclSIMDViewExpertDLL\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclSIMDViewExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclSIMDViewExpertDLL.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclThreadNameExpert.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclThreadNameExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclThreadNameExpert.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclThreadNameExpert.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Thread Name IDE expert\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclThreadNameExpert\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclThreadNameExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclThreadNameExpertDLL.rc
===================================================================
--- trunk/jcl/packages/c6/JclThreadNameExpertDLL.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclThreadNameExpertDLL.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Thread Name IDE expert\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclThreadNameExpertDLL\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclThreadNameExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclThreadNameExpertDLL.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclUsesExpert.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclUsesExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclUsesExpert.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclUsesExpert.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Uses Wizard\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclUsesExpert\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclUsesExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclUsesExpertDLL.rc
===================================================================
--- trunk/jcl/packages/c6/JclUsesExpertDLL.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclUsesExpertDLL.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Uses Wizard\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclUsesExpertDLL\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclUsesExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclUsesExpertDLL.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclVClx.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclVClx.rc
===================================================================
--- trunk/jcl/packages/c6/JclVClx.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclVClx.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JEDI Code Library VisualCLX package\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclVClx\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclVClxC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclVcl.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclVcl.rc
===================================================================
--- trunk/jcl/packages/c6/JclVcl.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclVcl.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JEDI Code Library VCL package\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclVcl\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclVclC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclVersionControlExpert.rc
===================================================================
--- trunk/jcl/packages/c6/JclVersionControlExpert.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclVersionControlExpert.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Integration of version control systems in the IDE\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclVersionControlExpert\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclVersionControlExpertC60.bpl\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclVersionControlExpert.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclVersionControlExpertDLL.rc
===================================================================
--- trunk/jcl/packages/c6/JclVersionControlExpertDLL.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/JclVersionControlExpertDLL.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "JCL Integration of version control systems in the IDE\0"
               VALUE "FileVersion", "1.102.0.2726\0"
               VALUE "InternalName", "JclVersionControlExpertDLL\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "JclVersionControlExpertDLLC60.dll\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "1.102 Build 2726\0"

Modified: trunk/jcl/packages/c6/JclVersionControlExpertDLL.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/template.rc
===================================================================
--- trunk/jcl/packages/c6/template.rc	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/c6/template.rc	2008-01-13 18:55:51 UTC (rev 2304)
@@ -19,7 +19,7 @@
               VALUE "FileDescription", "%DESCRIPTION%\0"
               VALUE "FileVersion", "%VERSION_MAJOR_NUMBER%.%VERSION_MINOR_NUMBER%.%RELEASE_NUMBER%.%BUILD_NUMBER%\0"
               VALUE "InternalName", "%NAME%\0"
-              VALUE "LegalCopyright", "Copyright (C) 1999, 2007 Project JEDI\0"
+              VALUE "LegalCopyright", "Copyright (C) 1999, 2008 Project JEDI\0"
               VALUE "OriginalFilename", "%NAME%C60%BINEXTENSION%\0"
               VALUE "ProductName", "JEDI Code Library\0"
               VALUE "ProductVersion", "%VERSION_MAJOR_NUMBER%.%VERSION_MINOR_NUMBER% Build %BUILD_NUMBER%\0"

Modified: trunk/jcl/packages/cs1/Jcl.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/cs1/Jcl.bdsproj
===================================================================
--- trunk/jcl/packages/cs1/Jcl.bdsproj	2008-01-13 18:39:42 UTC (rev 2303)
+++ trunk/jcl/packages/cs1/Jcl.bdsproj	2008-01-13 18:55:51 UTC (rev 2304)
@@ -164,7...
 
[truncated message content]

[Jcl-checkins-diff] SF.net SVN: jcl: [2303] trunk/jcl/packages/d11.net

From: <ou...@us...> - 2008-01-13 18:39:43

Revision: 2303
          http://jcl.svn.sourceforge.net/jcl/?rev=2303&view=rev
Author:   outchy
Date:     2008-01-13 10:39:42 -0800 (Sun, 13 Jan 2008)

Log Message:
-----------
setting subversion properties on project files.

Modified Paths:
--------------
    trunk/jcl/packages/d11.net/Jedi.Jcl.dpk
    trunk/jcl/packages/d11.net/template.dpk

Property Changed:
----------------
    trunk/jcl/packages/d11.net/Jedi.Jcl.dpk
    trunk/jcl/packages/d11.net/template.dpk

Modified: trunk/jcl/packages/d11.net/Jedi.Jcl.dpk
===================================================================
--- trunk/jcl/packages/d11.net/Jedi.Jcl.dpk	2008-01-13 16:35:43 UTC (rev 2302)
+++ trunk/jcl/packages/d11.net/Jedi.Jcl.dpk	2008-01-13 18:39:42 UTC (rev 2303)
@@ -1,109 +1,109 @@
-package Jedi.Jcl;
-{
------------------------------------------------------------------------------
-     DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
-            ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
-
-     Last generated: 30-11-2007  11:14:42 UTC
------------------------------------------------------------------------------
-}
-
-{$ALIGN 0}
-{$ASSERTIONS OFF}
-{$BOOLEVAL OFF}
-{$DEBUGINFO OFF}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS OFF}
-{$LOCALSYMBOLS OFF}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION ON}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$REFERENCEINFO OFF}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES OFF}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST ON}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $48000000}
-{$RUNONLY}
-{$IMPLICITBUILD OFF}
-{$DEFINE RELEASE}
-
-requires
-  Borland.Delphi,
-  Borland.VclRtl
-  ;
-  
-contains
-  JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
-  JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,
-  JclAnsiStrings in '..\..\source\common\JclAnsiStrings.pas' ,
-  JclArrayLists in '..\..\source\common\JclArrayLists.pas' ,
-  JclArraySets in '..\..\source\common\JclArraySets.pas' ,
-  JclBase in '..\..\source\common\JclBase.pas' ,
-  JclBinaryTrees in '..\..\source\common\JclBinaryTrees.pas' ,
-  JclComplex in '..\..\source\common\JclComplex.pas' ,
-  JclContainerIntf in '..\..\source\common\JclContainerIntf.pas' ,
-  JclCounter in '..\..\source\common\JclCounter.pas' ,
-  JclDateTime in '..\..\source\common\JclDateTime.pas' ,
-  JclEDI in '..\..\source\common\JclEDI.pas' ,
-  JclEDISEF in '..\..\source\common\JclEDISEF.pas' ,
-  JclEDITranslators in '..\..\source\common\JclEDITranslators.pas' ,
-  JclEDIXML in '..\..\source\common\JclEDIXML.pas' ,
-  JclEDI_ANSIX12 in '..\..\source\common\JclEDI_ANSIX12.pas' ,
-  JclEDI_ANSIX12_Ext in '..\..\source\common\JclEDI_ANSIX12_Ext.pas' ,
-  JclEDI_UNEDIFACT in '..\..\source\common\JclEDI_UNEDIFACT.pas' ,
-  JclEDI_UNEDIFACT_Ext in '..\..\source\common\JclEDI_UNEDIFACT_Ext.pas' ,
-  JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
-  JclHashMaps in '..\..\source\common\JclHashMaps.pas' ,
-  JclHashSets in '..\..\source\common\JclHashSets.pas' ,
-  JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
-  JclLinkedLists in '..\..\source\common\JclLinkedLists.pas' ,
-  JclLogic in '..\..\source\common\JclLogic.pas' ,
-  JclMath in '..\..\source\common\JclMath.pas' ,
-  JclMime in '..\..\source\common\JclMime.pas' ,
-  JclQueues in '..\..\source\common\JclQueues.pas' ,
-  JclResources in '..\..\source\common\JclResources.pas' ,
-  JclRTTI in '..\..\source\common\JclRTTI.pas' ,
-  JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
-  JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
-  JclStacks in '..\..\source\common\JclStacks.pas' ,
-  JclStatistics in '..\..\source\common\JclStatistics.pas' ,
-  JclStreams in '..\..\source\common\JclStreams.pas' ,
-  JclStrings in '..\..\source\common\JclStrings.pas' ,
-  JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
-  JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
-  JclTrees in '..\..\source\common\JclTrees.pas' ,
-  JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
-  JclValidation in '..\..\source\common\JclValidation.pas' ,
-  JclVectors in '..\..\source\common\JclVectors.pas' ,
-  JclSynch in '..\..\source\windows\JclSynch.pas' 
-  ;
-
-[assembly: AssemblyTitle('JEDI Code Library for .NET')]
-[assembly: AssemblyDescription('JEDI Code Library RTL package')]
-[assembly: AssemblyConfiguration('')]
-[assembly: AssemblyCompany('Project JEDI')]
-[assembly: AssemblyProduct('JEDI Code Library')]
-[assembly: AssemblyCopyright('Copyright (C) 1999, 2007 Project JEDI')]
-[assembly: AssemblyTrademark('')]
-[assembly: AssemblyCulture('')]
-
-// MajorVersion.MinorVersion.BuildNumber.Revision
-[assembly: AssemblyVersion('1.102.0.2726')]
-
-// Package signature
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile('')]
-[assembly: AssemblyKeyName('')]
-
-// Com visibility of the assembly
-[assembly: ComVisible(False)]
-//[assembly: Guid('')]
-//[assembly: TypeLibVersion(1, 0)]
-
-end.
+package Jedi.Jcl;
+{
+-----------------------------------------------------------------------------
+     DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
+            ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
+
+     Last generated: 30-11-2007  11:14:42 UTC
+-----------------------------------------------------------------------------
+}
+
+{$ALIGN 0}
+{$ASSERTIONS OFF}
+{$BOOLEVAL OFF}
+{$DEBUGINFO OFF}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS OFF}
+{$LOCALSYMBOLS OFF}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION ON}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO OFF}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES OFF}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST ON}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $48000000}
+{$RUNONLY}
+{$IMPLICITBUILD OFF}
+{$DEFINE RELEASE}
+
+requires
+  Borland.Delphi,
+  Borland.VclRtl
+  ;
+  
+contains
+  JclAbstractContainers in '..\..\source\common\JclAbstractContainers.pas' ,
+  JclAlgorithms in '..\..\source\common\JclAlgorithms.pas' ,
+  JclAnsiStrings in '..\..\source\common\JclAnsiStrings.pas' ,
+  JclArrayLists in '..\..\source\common\JclArrayLists.pas' ,
+  JclArraySets in '..\..\source\common\JclArraySets.pas' ,
+  JclBase in '..\..\source\common\JclBase.pas' ,
+  JclBinaryTrees in '..\..\source\common\JclBinaryTrees.pas' ,
+  JclComplex in '..\..\source\common\JclComplex.pas' ,
+  JclContainerIntf in '..\..\source\common\JclContainerIntf.pas' ,
+  JclCounter in '..\..\source\common\JclCounter.pas' ,
+  JclDateTime in '..\..\source\common\JclDateTime.pas' ,
+  JclEDI in '..\..\source\common\JclEDI.pas' ,
+  JclEDISEF in '..\..\source\common\JclEDISEF.pas' ,
+  JclEDITranslators in '..\..\source\common\JclEDITranslators.pas' ,
+  JclEDIXML in '..\..\source\common\JclEDIXML.pas' ,
+  JclEDI_ANSIX12 in '..\..\source\common\JclEDI_ANSIX12.pas' ,
+  JclEDI_ANSIX12_Ext in '..\..\source\common\JclEDI_ANSIX12_Ext.pas' ,
+  JclEDI_UNEDIFACT in '..\..\source\common\JclEDI_UNEDIFACT.pas' ,
+  JclEDI_UNEDIFACT_Ext in '..\..\source\common\JclEDI_UNEDIFACT_Ext.pas' ,
+  JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
+  JclHashMaps in '..\..\source\common\JclHashMaps.pas' ,
+  JclHashSets in '..\..\source\common\JclHashSets.pas' ,
+  JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
+  JclLinkedLists in '..\..\source\common\JclLinkedLists.pas' ,
+  JclLogic in '..\..\source\common\JclLogic.pas' ,
+  JclMath in '..\..\source\common\JclMath.pas' ,
+  JclMime in '..\..\source\common\JclMime.pas' ,
+  JclQueues in '..\..\source\common\JclQueues.pas' ,
+  JclResources in '..\..\source\common\JclResources.pas' ,
+  JclRTTI in '..\..\source\common\JclRTTI.pas' ,
+  JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
+  JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
+  JclStacks in '..\..\source\common\JclStacks.pas' ,
+  JclStatistics in '..\..\source\common\JclStatistics.pas' ,
+  JclStreams in '..\..\source\common\JclStreams.pas' ,
+  JclStrings in '..\..\source\common\JclStrings.pas' ,
+  JclSysInfo in '..\..\source\common\JclSysInfo.pas' ,
+  JclSysUtils in '..\..\source\common\JclSysUtils.pas' ,
+  JclTrees in '..\..\source\common\JclTrees.pas' ,
+  JclUnitConv in '..\..\source\common\JclUnitConv.pas' ,
+  JclValidation in '..\..\source\common\JclValidation.pas' ,
+  JclVectors in '..\..\source\common\JclVectors.pas' ,
+  JclSynch in '..\..\source\windows\JclSynch.pas' 
+  ;
+
+[assembly: AssemblyTitle('JEDI Code Library for .NET')]
+[assembly: AssemblyDescription('JEDI Code Library RTL package')]
+[assembly: AssemblyConfiguration('')]
+[assembly: AssemblyCompany('Project JEDI')]
+[assembly: AssemblyProduct('JEDI Code Library')]
+[assembly: AssemblyCopyright('Copyright (C) 1999, 2007 Project JEDI')]
+[assembly: AssemblyTrademark('')]
+[assembly: AssemblyCulture('')]
+
+// MajorVersion.MinorVersion.BuildNumber.Revision
+[assembly: AssemblyVersion('1.102.0.2726')]
+
+// Package signature
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile('')]
+[assembly: AssemblyKeyName('')]
+
+// Com visibility of the assembly
+[assembly: ComVisible(False)]
+//[assembly: Guid('')]
+//[assembly: TypeLibVersion(1, 0)]
+
+end.


Property changes on: trunk/jcl/packages/d11.net/Jedi.Jcl.dpk
___________________________________________________________________
Name: svn:keywords
   + URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Name: svn:eol-style
   + native

Modified: trunk/jcl/packages/d11.net/template.dpk
===================================================================
--- trunk/jcl/packages/d11.net/template.dpk	2008-01-13 16:35:43 UTC (rev 2302)
+++ trunk/jcl/packages/d11.net/template.dpk	2008-01-13 18:39:42 UTC (rev 2303)
@@ -1,76 +1,76 @@
-package %NAME%;
-{
------------------------------------------------------------------------------
-     DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
-            ALWAYS EDIT THE RELATED XML FILE (%XMLNAME%)
-
-     Last generated: %DATETIME%
------------------------------------------------------------------------------
-}
-<%%% BEGIN PROGRAMONLY %%%>
-<%%% DO NOT GENERATE %%%>
-<%%% END PROGRAMONLY %%%>
-<%%% BEGIN LIBRARYONLY %%%>
-<%%% DO NOT GENERATE %%%>
-<%%% END LIBRARYONLY %%%>
-
-{$ALIGN 0}
-{$ASSERTIONS OFF}
-{$BOOLEVAL OFF}
-{$DEBUGINFO OFF}
-{$EXTENDEDSYNTAX ON}
-{$IMPORTEDDATA ON}
-{$IOCHECKS OFF}
-{$LOCALSYMBOLS OFF}
-{$LONGSTRINGS ON}
-{$OPENSTRINGS ON}
-{$OPTIMIZATION ON}
-{$OVERFLOWCHECKS OFF}
-{$RANGECHECKS OFF}
-{$REFERENCEINFO OFF}
-{$SAFEDIVIDE OFF}
-{$STACKFRAMES OFF}
-{$TYPEDADDRESS OFF}
-{$VARSTRINGCHECKS ON}
-{$WRITEABLECONST ON}
-{$MINENUMSIZE 1}
-{$IMAGEBASE $%IMAGE_BASE%}
-{$%TYPE%ONLY}
-{$IMPLICITBUILD OFF}
-{$DEFINE RELEASE}
-
-requires
-<%%% START REQUIRES %%%>
-  %NAME%,
-<%%% END REQUIRES %%%>
-  ;
-  
-contains
-<%%% START FILES %%%>
-  %UNITNAME% in '%FILENAME%' {%FORMNAMEANDTYPE%},
-<%%% END FILES %%%>
-  ;
-
-[assembly: AssemblyTitle('JEDI Code Library for .NET')]
-[assembly: AssemblyDescription('%DESCRIPTION%')]
-[assembly: AssemblyConfiguration('')]
-[assembly: AssemblyCompany('Project JEDI')]
-[assembly: AssemblyProduct('JEDI Code Library')]
-[assembly: AssemblyCopyright('Copyright (C) 1999, 2007 Project JEDI')]
-[assembly: AssemblyTrademark('')]
-[assembly: AssemblyCulture('')]
-
-// MajorVersion.MinorVersion.BuildNumber.Revision
-[assembly: AssemblyVersion('%VERSION_MAJOR_NUMBER%.%VERSION_MINOR_NUMBER%.%RELEASE_NUMBER%.%BUILD_NUMBER%')]
-
-// Package signature
-[assembly: AssemblyDelaySign(false)]
-[assembly: AssemblyKeyFile('')]
-[assembly: AssemblyKeyName('')]
-
-// Com visibility of the assembly
-[assembly: ComVisible(False)]
-//[assembly: Guid('')]
-//[assembly: TypeLibVersion(1, 0)]
-
+package %NAME%;
+{
+-----------------------------------------------------------------------------
+     DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
+            ALWAYS EDIT THE RELATED XML FILE (%XMLNAME%)
+
+     Last generated: %DATETIME%
+-----------------------------------------------------------------------------
+}
+<%%% BEGIN PROGRAMONLY %%%>
+<%%% DO NOT GENERATE %%%>
+<%%% END PROGRAMONLY %%%>
+<%%% BEGIN LIBRARYONLY %%%>
+<%%% DO NOT GENERATE %%%>
+<%%% END LIBRARYONLY %%%>
+
+{$ALIGN 0}
+{$ASSERTIONS OFF}
+{$BOOLEVAL OFF}
+{$DEBUGINFO OFF}
+{$EXTENDEDSYNTAX ON}
+{$IMPORTEDDATA ON}
+{$IOCHECKS OFF}
+{$LOCALSYMBOLS OFF}
+{$LONGSTRINGS ON}
+{$OPENSTRINGS ON}
+{$OPTIMIZATION ON}
+{$OVERFLOWCHECKS OFF}
+{$RANGECHECKS OFF}
+{$REFERENCEINFO OFF}
+{$SAFEDIVIDE OFF}
+{$STACKFRAMES OFF}
+{$TYPEDADDRESS OFF}
+{$VARSTRINGCHECKS ON}
+{$WRITEABLECONST ON}
+{$MINENUMSIZE 1}
+{$IMAGEBASE $%IMAGE_BASE%}
+{$%TYPE%ONLY}
+{$IMPLICITBUILD OFF}
+{$DEFINE RELEASE}
+
+requires
+<%%% START REQUIRES %%%>
+  %NAME%,
+<%%% END REQUIRES %%%>
+  ;
+  
+contains
+<%%% START FILES %%%>
+  %UNITNAME% in '%FILENAME%' {%FORMNAMEANDTYPE%},
+<%%% END FILES %%%>
+  ;
+
+[assembly: AssemblyTitle('JEDI Code Library for .NET')]
+[assembly: AssemblyDescription('%DESCRIPTION%')]
+[assembly: AssemblyConfiguration('')]
+[assembly: AssemblyCompany('Project JEDI')]
+[assembly: AssemblyProduct('JEDI Code Library')]
+[assembly: AssemblyCopyright('Copyright (C) 1999, 2007 Project JEDI')]
+[assembly: AssemblyTrademark('')]
+[assembly: AssemblyCulture('')]
+
+// MajorVersion.MinorVersion.BuildNumber.Revision
+[assembly: AssemblyVersion('%VERSION_MAJOR_NUMBER%.%VERSION_MINOR_NUMBER%.%RELEASE_NUMBER%.%BUILD_NUMBER%')]
+
+// Package signature
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile('')]
+[assembly: AssemblyKeyName('')]
+
+// Com visibility of the assembly
+[assembly: ComVisible(False)]
+//[assembly: Guid('')]
+//[assembly: TypeLibVersion(1, 0)]
+
 end.
\ No newline at end of file


Property changes on: trunk/jcl/packages/d11.net/template.dpk
___________________________________________________________________
Name: svn:keywords
   + URL HeadURL Author LastChangedBy Date LastChangedDate Rev Revision LastChangedRevision Id
Name: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2302] trunk/jcl/source

From: <ou...@us...> - 2008-01-13 16:35:45

Revision: 2302
          http://jcl.svn.sourceforge.net/jcl/?rev=2302&view=rev
Author:   outchy
Date:     2008-01-13 08:35:43 -0800 (Sun, 13 Jan 2008)

Log Message:
-----------
container files regenerated with latest version of jpp.exe
declaration and implementation of containers split in 2 files (.int and .imp)
split declaration and implementation of iterators.
update of makefile to look after these new .int files.

Modified Paths:
--------------
    trunk/jcl/source/common/JclArrayLists.pas
    trunk/jcl/source/common/JclArraySets.pas
    trunk/jcl/source/common/JclBinaryTrees.pas
    trunk/jcl/source/common/JclHashMaps.pas
    trunk/jcl/source/common/JclHashSets.pas
    trunk/jcl/source/common/JclLinkedLists.pas
    trunk/jcl/source/common/JclQueues.pas
    trunk/jcl/source/common/JclSortedMaps.pas
    trunk/jcl/source/common/JclStacks.pas
    trunk/jcl/source/common/JclTrees.pas
    trunk/jcl/source/common/JclVectors.pas
    trunk/jcl/source/prototypes/JclArrayLists.pas
    trunk/jcl/source/prototypes/JclArraySets.pas
    trunk/jcl/source/prototypes/JclBinaryTrees.pas
    trunk/jcl/source/prototypes/JclHashMaps.pas
    trunk/jcl/source/prototypes/JclHashSets.pas
    trunk/jcl/source/prototypes/JclLinkedLists.pas
    trunk/jcl/source/prototypes/JclQueues.pas
    trunk/jcl/source/prototypes/JclSortedMaps.pas
    trunk/jcl/source/prototypes/JclStacks.pas
    trunk/jcl/source/prototypes/JclTrees.pas
    trunk/jcl/source/prototypes/JclVectors.pas
    trunk/jcl/source/prototypes/Makefile.mak
    trunk/jcl/source/prototypes/containers/JclArrayLists.imp
    trunk/jcl/source/prototypes/containers/JclArraySets.imp
    trunk/jcl/source/prototypes/containers/JclBinaryTrees.imp
    trunk/jcl/source/prototypes/containers/JclHashMaps.imp
    trunk/jcl/source/prototypes/containers/JclHashSets.imp
    trunk/jcl/source/prototypes/containers/JclLinkedLists.imp
    trunk/jcl/source/prototypes/containers/JclQueues.imp
    trunk/jcl/source/prototypes/containers/JclSortedMaps.imp
    trunk/jcl/source/prototypes/containers/JclStacks.imp
    trunk/jcl/source/prototypes/containers/JclTrees.imp
    trunk/jcl/source/prototypes/containers/JclVectors.imp

Added Paths:
-----------
    trunk/jcl/source/prototypes/containers/JclArrayLists.int
    trunk/jcl/source/prototypes/containers/JclArraySets.int
    trunk/jcl/source/prototypes/containers/JclBinaryTrees.int
    trunk/jcl/source/prototypes/containers/JclHashMaps.int
    trunk/jcl/source/prototypes/containers/JclHashSets.int
    trunk/jcl/source/prototypes/containers/JclLinkedLists.int
    trunk/jcl/source/prototypes/containers/JclQueues.int
    trunk/jcl/source/prototypes/containers/JclSortedMaps.int
    trunk/jcl/source/prototypes/containers/JclStacks.int
    trunk/jcl/source/prototypes/containers/JclTrees.int
    trunk/jcl/source/prototypes/containers/JclVectors.int

Modified: trunk/jcl/source/common/JclArrayLists.pas
===================================================================
--- trunk/jcl/source/common/JclArrayLists.pas	2008-01-13 12:51:30 UTC (rev 2301)
+++ trunk/jcl/source/common/JclArrayLists.pas	2008-01-13 16:35:43 UTC (rev 2302)
@@ -54,7 +54,6 @@
   {$ENDIF SUPPORTS_GENERICS}
   JclBase, JclAbstractContainers, JclContainerIntf;
 type
-
   TJclIntfArrayList = class(TJclIntfAbstractContainer, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
      IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclIntfEqualityComparer,
      IJclIntfCollection, IJclIntfList, IJclIntfArray)
@@ -99,7 +98,6 @@
     destructor Destroy; override;
   end;
 
-
   TJclAnsiStrArrayList = class(TJclAnsiStrAbstractCollection, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
      IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclStrContainer, IJclAnsiStrContainer, IJclAnsiStrFlatContainer, IJclAnsiStrEqualityComparer,
      IJclAnsiStrCollection, IJclAnsiStrList, IJclAnsiStrArray)
@@ -144,7 +142,6 @@
     destructor Destroy; override;
   end;
 
-
   TJclWideStrArrayList = class(TJclWideStrAbstractCollection, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
      IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclStrContainer, IJclWideStrContainer, IJclWideStrFlatContainer, IJclWideStrEqualityComparer,
      IJclWideStrCollection, IJclWideStrList, IJclWideStrArray)
@@ -196,7 +193,6 @@
   TJclStrArrayList = TJclWideStrArrayList;
   {$ENDIF CONTAINER_WIDESTR}
 
-
   TJclSingleArrayList = class(TJclSingleAbstractContainer, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
      IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclSingleContainer, IJclSingleEqualityComparer,
      IJclSingleCollection, IJclSingleList, IJclSingleArray)
@@ -241,7 +237,6 @@
     destructor Destroy; override;
   end;
 
-
   TJclDoubleArrayList = class(TJclDoubleAbstractContainer, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
      IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclDoubleContainer, IJclDoubleEqualityComparer,
      IJclDoubleCollection, IJclDoubleList, IJclDoubleArray)
@@ -286,7 +281,6 @@
     destructor Destroy; override;
   end;
 
-
   TJclExtendedArrayList = class(TJclExtendedAbstractContainer, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
      IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclExtendedContainer, IJclExtendedEqualityComparer,
      IJclExtendedCollection, IJclExtendedList, IJclExtendedArray)
@@ -341,7 +335,6 @@
   TJclFloatArrayList = TJclSingleArrayList;
   {$ENDIF MATH_SINGLE_PRECISION}
 
-
   TJclIntegerArrayList = class(TJclIntegerAbstractContainer, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
      IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclIntegerEqualityComparer,
      IJclIntegerCollection, IJclIntegerList, IJclIntegerArray)
@@ -386,7 +379,6 @@
     destructor Destroy; override;
   end;
 
-
   TJclCardinalArrayList = class(TJclCardinalAbstractContainer, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
      IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclCardinalEqualityComparer,
      IJclCardinalCollection, IJclCardinalList, IJclCardinalArray)
@@ -431,7 +423,6 @@
     destructor Destroy; override;
   end;
 
-
   TJclInt64ArrayList = class(TJclInt64AbstractContainer, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
      IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclInt64EqualityComparer,
      IJclInt64Collection, IJclInt64List, IJclInt64Array)
@@ -477,7 +468,6 @@
   end;
 
   {$IFNDEF CLR}
-
   TJclPtrArrayList = class(TJclPtrAbstractContainer, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
      IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclPtrEqualityComparer,
      IJclPtrCollection, IJclPtrList, IJclPtrArray)
@@ -523,7 +513,6 @@
   end;
   {$ENDIF ~CLR}
 
-
   TJclArrayList = class(TJclAbstractContainer, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
      IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclObjectOwner, IJclEqualityComparer,
      IJclCollection, IJclList, IJclArray)
@@ -569,7 +558,6 @@
   end;
 
   {$IFDEF SUPPORTS_GENERICS}
-
   TJclArrayList<T> = class(TJclAbstractContainer<T>, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
      IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclItemOwner<T>, IJclEqualityComparer<T>,
      IJclCollection<T>, IJclList<T>, IJclArray<T>)
@@ -677,9 +665,6 @@
 type
   TItrStart = (isFirst, isLast);
 
-
-//=== { TIntfItr } ===============================================================
-
 type
   TIntfItr = class(TJclAbstractIterator, IJclIntfIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable)
@@ -714,6 +699,8 @@
     constructor Create(const AOwnList: IJclIntfList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
   end;
 
+//=== { TIntfItr } ===============================================================
+
 constructor TIntfItr.Create(const AOwnList: IJclIntfList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -859,8 +846,6 @@
   FOwnList.SetObject(FCursor, AInterface);
 end;
 
-//=== { TAnsiStrItr } ===============================================================
-
 type
   TAnsiStrItr = class(TJclAbstractIterator, IJclAnsiStrIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable)
@@ -895,6 +880,8 @@
     constructor Create(const AOwnList: IJclAnsiStrList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
   end;
 
+//=== { TAnsiStrItr } ===============================================================
+
 constructor TAnsiStrItr.Create(const AOwnList: IJclAnsiStrList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -1040,8 +1027,6 @@
   FOwnList.SetString(FCursor, AString);
 end;
 
-//=== { TWideStrItr } ===============================================================
-
 type
   TWideStrItr = class(TJclAbstractIterator, IJclWideStrIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable)
@@ -1076,6 +1061,8 @@
     constructor Create(const AOwnList: IJclWideStrList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
   end;
 
+//=== { TWideStrItr } ===============================================================
+
 constructor TWideStrItr.Create(const AOwnList: IJclWideStrList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -1221,8 +1208,6 @@
   FOwnList.SetString(FCursor, AString);
 end;
 
-//=== { TSingleItr } ===============================================================
-
 type
   TSingleItr = class(TJclAbstractIterator, IJclSingleIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable)
@@ -1257,6 +1242,8 @@
     constructor Create(const AOwnList: IJclSingleList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
   end;
 
+//=== { TSingleItr } ===============================================================
+
 constructor TSingleItr.Create(const AOwnList: IJclSingleList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -1402,8 +1389,6 @@
   FOwnList.SetValue(FCursor, AValue);
 end;
 
-//=== { TDoubleItr } ===============================================================
-
 type
   TDoubleItr = class(TJclAbstractIterator, IJclDoubleIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable)
@@ -1438,6 +1423,8 @@
     constructor Create(const AOwnList: IJclDoubleList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
   end;
 
+//=== { TDoubleItr } ===============================================================
+
 constructor TDoubleItr.Create(const AOwnList: IJclDoubleList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -1583,8 +1570,6 @@
   FOwnList.SetValue(FCursor, AValue);
 end;
 
-//=== { TExtendedItr } ===============================================================
-
 type
   TExtendedItr = class(TJclAbstractIterator, IJclExtendedIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable)
@@ -1619,6 +1604,8 @@
     constructor Create(const AOwnList: IJclExtendedList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
   end;
 
+//=== { TExtendedItr } ===============================================================
+
 constructor TExtendedItr.Create(const AOwnList: IJclExtendedList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -1764,8 +1751,6 @@
   FOwnList.SetValue(FCursor, AValue);
 end;
 
-//=== { TIntegerItr } ===============================================================
-
 type
   TIntegerItr = class(TJclAbstractIterator, IJclIntegerIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable)
@@ -1800,6 +1785,8 @@
     constructor Create(const AOwnList: IJclIntegerList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
   end;
 
+//=== { TIntegerItr } ===============================================================
+
 constructor TIntegerItr.Create(const AOwnList: IJclIntegerList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -1945,8 +1932,6 @@
   FOwnList.SetValue(FCursor, AValue);
 end;
 
-//=== { TCardinalItr } ===============================================================
-
 type
   TCardinalItr = class(TJclAbstractIterator, IJclCardinalIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable)
@@ -1981,6 +1966,8 @@
     constructor Create(const AOwnList: IJclCardinalList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
   end;
 
+//=== { TCardinalItr } ===============================================================
+
 constructor TCardinalItr.Create(const AOwnList: IJclCardinalList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -2126,8 +2113,6 @@
   FOwnList.SetValue(FCursor, AValue);
 end;
 
-//=== { TInt64Itr } ===============================================================
-
 type
   TInt64Itr = class(TJclAbstractIterator, IJclInt64Iterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable)
@@ -2162,6 +2147,8 @@
     constructor Create(const AOwnList: IJclInt64List; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
   end;
 
+//=== { TInt64Itr } ===============================================================
+
 constructor TInt64Itr.Create(const AOwnList: IJclInt64List; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -2306,10 +2293,8 @@
   CheckValid;
   FOwnList.SetValue(FCursor, AValue);
 end;
-{$IFNDEF CLR}
 
-//=== { TPtrItr } ===============================================================
-
+{$IFNDEF CLR}
 type
   TPtrItr = class(TJclAbstractIterator, IJclPtrIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable)
@@ -2344,6 +2329,8 @@
     constructor Create(const AOwnList: IJclPtrList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
   end;
 
+//=== { TPtrItr } ===============================================================
+
 constructor TPtrItr.Create(const AOwnList: IJclPtrList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -2490,8 +2477,6 @@
 end;
 {$ENDIF ~CLR}
 
-//=== { TItr } ===============================================================
-
 type
   TItr = class(TJclAbstractIterator, IJclIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable)
@@ -2526,6 +2511,8 @@
     constructor Create(const AOwnList: IJclList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
   end;
 
+//=== { TItr } ===============================================================
+
 constructor TItr.Create(const AOwnList: IJclList; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -2672,9 +2659,6 @@
 end;
 
 {$IFDEF SUPPORTS_GENERICS}
-
-//=== { TItr<T> } ===============================================================
-
 type
   TItr<T> = class(TJclAbstractIterator, IJclIterator<T>, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable)
@@ -2709,6 +2693,8 @@
     constructor Create(const AOwnList: IJclList<T>; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
   end;
 
+//=== { TItr<T> } ===============================================================
+
 constructor TItr<T>.Create(const AOwnList: IJclList<T>; ACursor: Integer; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -2855,7 +2841,6 @@
 end;
 {$ENDIF SUPPORTS_GENERICS}
 
-
 //=== { TJclIntfArrayList } ======================================================
 
 constructor TJclIntfArrayList.Create(ACapacity: Integer);
@@ -3448,7 +3433,6 @@
   {$ENDIF THREADSAFE}
 end;
 
-
 //=== { TJclAnsiStrArrayList } ======================================================
 
 constructor TJclAnsiStrArrayList.Create(ACapacity: Integer);
@@ -4041,7 +4025,6 @@
   {$ENDIF THREADSAFE}
 end;
 
-
 //=== { TJclWideStrArrayList } ======================================================
 
 constructor TJclWideStrArrayList.Create(ACapacity: Integer);
@@ -4634,7 +4617,6 @@
   {$ENDIF THREADSAFE}
 end;
 
-
 //=== { TJclSingleArrayList } ======================================================
 
 constructor TJclSingleArrayList.Create(ACapacity: Integer);
@@ -5227,7 +5209,6 @@
   {$ENDIF THREADSAFE}
 end;
 
-
 //=== { TJclDoubleArrayList } ======================================================
 
 constructor TJclDoubleArrayList.Create(ACapacity: Integer);
@@ -5820,7 +5801,6 @@
   {$ENDIF THREADSAFE}
 end;
 
-
 //=== { TJclExtendedArrayList } ======================================================
 
 constructor TJclExtendedArrayList.Create(ACapacity: Integer);
@@ -6413,7 +6393,6 @@
   {$ENDIF THREADSAFE}
 end;
 
-
 //=== { TJclIntegerArrayList } ======================================================
 
 constructor TJclIntegerArrayList.Create(ACapacity: Integer);
@@ -7006,7 +6985,6 @@
   {$ENDIF THREADSAFE}
 end;
 
-
 //=== { TJclCardinalArrayList } ======================================================
 
 constructor TJclCardinalArrayList.Create(ACapacity: Integer);
@@ -7599,7 +7577,6 @@
   {$ENDIF THREADSAFE}
 end;
 
-
 //=== { TJclInt64ArrayList } ======================================================
 
 constructor TJclInt64ArrayList.Create(ACapacity: Integer);
@@ -8193,7 +8170,6 @@
 end;
 
 {$IFNDEF CLR}
-
 //=== { TJclPtrArrayList } ======================================================
 
 constructor TJclPtrArrayList.Create(ACapacity: Integer);
@@ -8787,7 +8763,6 @@
 end;
 {$ENDIF ~CLR}
 
-
 //=== { TJclArrayList } ======================================================
 
 constructor TJclArrayList.Create(ACapacity: Integer; AOwnsObjects: Boolean);
@@ -9381,7 +9356,6 @@
 end;
 
 {$IFDEF SUPPORTS_GENERICS}
-
 //=== { TJclArrayList<T> } ======================================================
 
 constructor TJclArrayList<T>.Create(ACapacity: Integer; AOwnsItems: Boolean);

Modified: trunk/jcl/source/common/JclArraySets.pas
===================================================================
--- trunk/jcl/source/common/JclArraySets.pas	2008-01-13 12:51:30 UTC (rev 2301)
+++ trunk/jcl/source/common/JclArraySets.pas	2008-01-13 16:35:43 UTC (rev 2302)
@@ -29,7 +29,7 @@
 {                                                                                                  }
 {**************************************************************************************************}
 {                                                                                                  }
-{ Last modified: $Date::                                                                         $ }
+{ Last modified: $Date::                                                                        $ }
 { Revision:      $Rev::                                                                          $ }
 { Author:        $Author::                                                                       $ }
 {                                                                                                  }
@@ -54,7 +54,6 @@
   {$ENDIF SUPPORTS_GENERICS}
   JclBase, JclAbstractContainers, JclContainerIntf, JclArrayLists;
 type
-
   TJclIntfArraySet = class(TJclIntfArrayList, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclIntfEqualityComparer, IJclIntfComparer,
     IJclIntfCollection, IJclIntfList, IJclIntfArray, IJclIntfSet)
@@ -77,7 +76,6 @@
   public
   end;
 
-
   TJclAnsiStrArraySet = class(TJclAnsiStrArrayList, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclStrContainer, IJclAnsiStrContainer, IJclAnsiStrFlatContainer, IJclAnsiStrEqualityComparer, IJclAnsiStrComparer,
     IJclAnsiStrCollection, IJclAnsiStrList, IJclAnsiStrArray, IJclAnsiStrSet)
@@ -100,7 +98,6 @@
   public
   end;
 
-
   TJclWideStrArraySet = class(TJclWideStrArrayList, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclStrContainer, IJclWideStrContainer, IJclWideStrFlatContainer, IJclWideStrEqualityComparer, IJclWideStrComparer,
     IJclWideStrCollection, IJclWideStrList, IJclWideStrArray, IJclWideStrSet)
@@ -130,7 +127,6 @@
   TJclStrArraySet = TJclWideStrArraySet;
   {$ENDIF CONTAINER_WIDESTR}
 
-
   TJclSingleArraySet = class(TJclSingleArrayList, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclSingleContainer, IJclSingleEqualityComparer, IJclSingleComparer,
     IJclSingleCollection, IJclSingleList, IJclSingleArray, IJclSingleSet)
@@ -153,7 +149,6 @@
   public
   end;
 
-
   TJclDoubleArraySet = class(TJclDoubleArrayList, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclDoubleContainer, IJclDoubleEqualityComparer, IJclDoubleComparer,
     IJclDoubleCollection, IJclDoubleList, IJclDoubleArray, IJclDoubleSet)
@@ -176,7 +171,6 @@
   public
   end;
 
-
   TJclExtendedArraySet = class(TJclExtendedArrayList, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclExtendedContainer, IJclExtendedEqualityComparer, IJclExtendedComparer,
     IJclExtendedCollection, IJclExtendedList, IJclExtendedArray, IJclExtendedSet)
@@ -209,7 +203,6 @@
   TJclFloatArraySet = TJclSingleArraySet;
   {$ENDIF MATH_SINGLE_PRECISION}
 
-
   TJclIntegerArraySet = class(TJclIntegerArrayList, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclIntegerEqualityComparer, IJclIntegerComparer,
     IJclIntegerCollection, IJclIntegerList, IJclIntegerArray, IJclIntegerSet)
@@ -232,7 +225,6 @@
   public
   end;
 
-
   TJclCardinalArraySet = class(TJclCardinalArrayList, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclCardinalEqualityComparer, IJclCardinalComparer,
     IJclCardinalCollection, IJclCardinalList, IJclCardinalArray, IJclCardinalSet)
@@ -255,7 +247,6 @@
   public
   end;
 
-
   TJclInt64ArraySet = class(TJclInt64ArrayList, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclInt64EqualityComparer, IJclInt64Comparer,
     IJclInt64Collection, IJclInt64List, IJclInt64Array, IJclInt64Set)
@@ -279,7 +270,6 @@
   end;
 
   {$IFNDEF CLR}
-
   TJclPtrArraySet = class(TJclPtrArrayList, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclPtrEqualityComparer, IJclPtrComparer,
     IJclPtrCollection, IJclPtrList, IJclPtrArray, IJclPtrSet)
@@ -303,7 +293,6 @@
   end;
   {$ENDIF ~CLR}
 
-
   TJclArraySet = class(TJclArrayList, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclObjectOwner, IJclEqualityComparer, IJclComparer,
     IJclCollection, IJclList, IJclArray, IJclSet)
@@ -327,7 +316,6 @@
   end;
 
   {$IFDEF SUPPORTS_GENERICS}
-
   TJclArraySet<T> = class(TJclArrayList<T>, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
     IJclIntfCloneable, IJclCloneable, IJclPackable, IJclGrowable, IJclContainer, IJclItemOwner<T>, IJclEqualityComparer<T>, IJclComparer<T>,
     IJclCollection<T>, IJclList<T>, IJclArray<T>, IJclSet<T>)
@@ -411,7 +399,6 @@
 uses
   SysUtils;
 
-
 //=== { TJclIntfArraySet } ====================================================
 
 function TJclIntfArraySet.Add(const AInterface: IInterface): Boolean;
@@ -546,7 +533,6 @@
   AddAll(ACollection);
 end;
 
-
 //=== { TJclAnsiStrArraySet } ====================================================
 
 function TJclAnsiStrArraySet.Add(const AString: AnsiString): Boolean;
@@ -681,7 +667,6 @@
   AddAll(ACollection);
 end;
 
-
 //=== { TJclWideStrArraySet } ====================================================
 
 function TJclWideStrArraySet.Add(const AString: WideString): Boolean;
@@ -816,7 +801,6 @@
   AddAll(ACollection);
 end;
 
-
 //=== { TJclSingleArraySet } ====================================================
 
 function TJclSingleArraySet.Add(const AValue: Single): Boolean;
@@ -951,7 +935,6 @@
   AddAll(ACollection);
 end;
 
-
 //=== { TJclDoubleArraySet } ====================================================
 
 function TJclDoubleArraySet.Add(const AValue: Double): Boolean;
@@ -1086,7 +1069,6 @@
   AddAll(ACollection);
 end;
 
-
 //=== { TJclExtendedArraySet } ====================================================
 
 function TJclExtendedArraySet.Add(const AValue: Extended): Boolean;
@@ -1221,7 +1203,6 @@
   AddAll(ACollection);
 end;
 
-
 //=== { TJclIntegerArraySet } ====================================================
 
 function TJclIntegerArraySet.Add(AValue: Integer): Boolean;
@@ -1356,7 +1337,6 @@
   AddAll(ACollection);
 end;
 
-
 //=== { TJclCardinalArraySet } ====================================================
 
 function TJclCardinalArraySet.Add(AValue: Cardinal): Boolean;
@@ -1491,7 +1471,6 @@
   AddAll(ACollection);
 end;
 
-
 //=== { TJclInt64ArraySet } ====================================================
 
 function TJclInt64ArraySet.Add(const AValue: Int64): Boolean;
@@ -1627,7 +1606,6 @@
 end;
 
 {$IFNDEF CLR}
-
 //=== { TJclPtrArraySet } ====================================================
 
 function TJclPtrArraySet.Add(APtr: Pointer): Boolean;
@@ -1763,7 +1741,6 @@
 end;
 {$ENDIF ~CLR}
 
-
 //=== { TJclArraySet } ====================================================
 
 function TJclArraySet.Add(AObject: TObject): Boolean;
@@ -1899,7 +1876,6 @@
 end;
 
 {$IFDEF SUPPORTS_GENERICS}
-
 //=== { TJclArraySet<T> } ====================================================
 
 function TJclArraySet<T>.Add(const AItem: T): Boolean;
@@ -2008,6 +1984,7 @@
   {$ENDIF THREADSAFE}
 end;
 
+
 procedure TJclArraySet<T>.Insert(Index: Integer; const AItem: T);
 begin
   raise EJclOperationNotSupportedError.Create;

Modified: trunk/jcl/source/common/JclBinaryTrees.pas
===================================================================
--- trunk/jcl/source/common/JclBinaryTrees.pas	2008-01-13 12:51:30 UTC (rev 2301)
+++ trunk/jcl/source/common/JclBinaryTrees.pas	2008-01-13 16:35:43 UTC (rev 2302)
@@ -29,7 +29,7 @@
 {                                                                                                  }
 {**************************************************************************************************}
 {                                                                                                  }
-{ Last modified: $Date::                                                                         $ }
+{ Last modified: $Date::                                                                        $ }
 { Revision:      $Rev::                                                                          $ }
 { Author:        $Author::                                                                       $ }
 {                                                                                                  }
@@ -52,8 +52,8 @@
   {$ENDIF CLR}
   {$ENDIF SUPPORTS_GENERICS}
   JclBase, JclAbstractContainers, JclAlgorithms, JclContainerIntf;
-type
 
+type
   TJclIntfBinaryNode = class
   public
     Value: IInterface;
@@ -107,7 +107,6 @@
     property TraverseOrder: TJclTraverseOrder read GetTraverseOrder write SetTraverseOrder;
   end;
 
-
   TJclAnsiStrBinaryNode = class
   public
     Value: AnsiString;
@@ -161,7 +160,6 @@
     property TraverseOrder: TJclTraverseOrder read GetTraverseOrder write SetTraverseOrder;
   end;
 
-
   TJclWideStrBinaryNode = class
   public
     Value: WideString;
@@ -222,7 +220,6 @@
   TJclStrBinaryTree = TJclWideStrBinaryTree;
   {$ENDIF CONTAINER_WIDESTR}
 
-
   TJclSingleBinaryNode = class
   public
     Value: Single;
@@ -276,7 +273,6 @@
     property TraverseOrder: TJclTraverseOrder read GetTraverseOrder write SetTraverseOrder;
   end;
 
-
   TJclDoubleBinaryNode = class
   public
     Value: Double;
@@ -330,7 +326,6 @@
     property TraverseOrder: TJclTraverseOrder read GetTraverseOrder write SetTraverseOrder;
   end;
 
-
   TJclExtendedBinaryNode = class
   public
     Value: Extended;
@@ -394,7 +389,6 @@
   TJclFloatBinaryTree = TJclSingleBinaryTree;
   {$ENDIF MATH_SINGLE_PRECISION}
 
-
   TJclIntegerBinaryNode = class
   public
     Value: Integer;
@@ -448,7 +442,6 @@
     property TraverseOrder: TJclTraverseOrder read GetTraverseOrder write SetTraverseOrder;
   end;
 
-
   TJclCardinalBinaryNode = class
   public
     Value: Cardinal;
@@ -502,7 +495,6 @@
     property TraverseOrder: TJclTraverseOrder read GetTraverseOrder write SetTraverseOrder;
   end;
 
-
   TJclInt64BinaryNode = class
   public
     Value: Int64;
@@ -557,7 +549,6 @@
   end;
 
   {$IFNDEF CLR}
-
   TJclPtrBinaryNode = class
   public
     Value: Pointer;
@@ -612,7 +603,6 @@
   end;
   {$ENDIF ~CLR}
 
-
   TJclBinaryNode = class
   public
     Value: TObject;
@@ -667,7 +657,6 @@
   end;
 
   {$IFDEF SUPPORTS_GENERICS}
-
   TJclBinaryNode<T> = class
   public
     Value: T;
@@ -786,9 +775,6 @@
 type
   TItrStart = (isFirst, isLast, isRoot);
 
-
-//=== { TIntfItr } ===========================================================
-
 type
   TIntfItr = class(TJclAbstractIterator, IJclIntfIterator, IJclIntfTreeIterator, IJclIntfBinaryTreeIterator)
   protected
@@ -838,6 +824,38 @@
     constructor Create(const AOwnTree: IJclIntfCollection; ACursor: TJclIntfBinaryNode; AValid: Boolean; AStart: TItrStart);
   end;
 
+  TPreOrderIntfItr = class(TIntfItr, IJclIntfIterator, IJclIntfTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclIntfBinaryNode; override;
+    function GetPreviousCursor: TJclIntfBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+  TInOrderIntfItr = class(TIntfItr, IJclIntfIterator, IJclIntfTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclIntfBinaryNode; override;
+    function GetPreviousCursor: TJclIntfBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+  TPostOrderIntfItr = class(TIntfItr, IJclIntfIterator, IJclIntfTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclIntfBinaryNode; override;
+    function GetPreviousCursor: TJclIntfBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+//=== { TIntfItr } ===========================================================
+
 constructor TIntfItr.Create(const AOwnTree: IJclIntfCollection; ACursor: TJclIntfBinaryNode; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -1326,17 +1344,6 @@
 
 //=== { TPreOrderIntfItr } ===================================================
 
-type
-  TPreOrderIntfItr = class(TIntfItr, IJclIntfIterator, IJclIntfTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclIntfBinaryNode; override;
-    function GetPreviousCursor: TJclIntfBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TPreOrderIntfItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TPreOrderIntfItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -1393,17 +1400,6 @@
 
 //=== { TInOrderIntfItr } ====================================================
 
-type
-  TInOrderIntfItr = class(TIntfItr, IJclIntfIterator, IJclIntfTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclIntfBinaryNode; override;
-    function GetPreviousCursor: TJclIntfBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TInOrderIntfItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TInOrderIntfItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -1461,17 +1457,6 @@
 
 //=== { TPostOrderIntfItr } ==================================================
 
-type
-  TPostOrderIntfItr = class(TIntfItr, IJclIntfIterator, IJclIntfTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclIntfBinaryNode; override;
-    function GetPreviousCursor: TJclIntfBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TPostOrderIntfItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TPostOrderIntfItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -1525,8 +1510,6 @@
   end;
 end;
 
-//=== { TAnsiStrItr } ===========================================================
-
 type
   TAnsiStrItr = class(TJclAbstractIterator, IJclAnsiStrIterator, IJclAnsiStrTreeIterator, IJclAnsiStrBinaryTreeIterator)
   protected
@@ -1576,6 +1559,38 @@
     constructor Create(const AOwnTree: IJclAnsiStrCollection; ACursor: TJclAnsiStrBinaryNode; AValid: Boolean; AStart: TItrStart);
   end;
 
+  TPreOrderAnsiStrItr = class(TAnsiStrItr, IJclAnsiStrIterator, IJclAnsiStrTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclAnsiStrBinaryNode; override;
+    function GetPreviousCursor: TJclAnsiStrBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+  TInOrderAnsiStrItr = class(TAnsiStrItr, IJclAnsiStrIterator, IJclAnsiStrTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclAnsiStrBinaryNode; override;
+    function GetPreviousCursor: TJclAnsiStrBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+  TPostOrderAnsiStrItr = class(TAnsiStrItr, IJclAnsiStrIterator, IJclAnsiStrTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclAnsiStrBinaryNode; override;
+    function GetPreviousCursor: TJclAnsiStrBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+//=== { TAnsiStrItr } ===========================================================
+
 constructor TAnsiStrItr.Create(const AOwnTree: IJclAnsiStrCollection; ACursor: TJclAnsiStrBinaryNode; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -2064,17 +2079,6 @@
 
 //=== { TPreOrderAnsiStrItr } ===================================================
 
-type
-  TPreOrderAnsiStrItr = class(TAnsiStrItr, IJclAnsiStrIterator, IJclAnsiStrTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclAnsiStrBinaryNode; override;
-    function GetPreviousCursor: TJclAnsiStrBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TPreOrderAnsiStrItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TPreOrderAnsiStrItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -2131,17 +2135,6 @@
 
 //=== { TInOrderAnsiStrItr } ====================================================
 
-type
-  TInOrderAnsiStrItr = class(TAnsiStrItr, IJclAnsiStrIterator, IJclAnsiStrTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclAnsiStrBinaryNode; override;
-    function GetPreviousCursor: TJclAnsiStrBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TInOrderAnsiStrItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TInOrderAnsiStrItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -2199,17 +2192,6 @@
 
 //=== { TPostOrderAnsiStrItr } ==================================================
 
-type
-  TPostOrderAnsiStrItr = class(TAnsiStrItr, IJclAnsiStrIterator, IJclAnsiStrTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclAnsiStrBinaryNode; override;
-    function GetPreviousCursor: TJclAnsiStrBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TPostOrderAnsiStrItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TPostOrderAnsiStrItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -2263,8 +2245,6 @@
   end;
 end;
 
-//=== { TWideStrItr } ===========================================================
-
 type
   TWideStrItr = class(TJclAbstractIterator, IJclWideStrIterator, IJclWideStrTreeIterator, IJclWideStrBinaryTreeIterator)
   protected
@@ -2314,6 +2294,38 @@
     constructor Create(const AOwnTree: IJclWideStrCollection; ACursor: TJclWideStrBinaryNode; AValid: Boolean; AStart: TItrStart);
   end;
 
+  TPreOrderWideStrItr = class(TWideStrItr, IJclWideStrIterator, IJclWideStrTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclWideStrBinaryNode; override;
+    function GetPreviousCursor: TJclWideStrBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+  TInOrderWideStrItr = class(TWideStrItr, IJclWideStrIterator, IJclWideStrTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclWideStrBinaryNode; override;
+    function GetPreviousCursor: TJclWideStrBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+  TPostOrderWideStrItr = class(TWideStrItr, IJclWideStrIterator, IJclWideStrTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclWideStrBinaryNode; override;
+    function GetPreviousCursor: TJclWideStrBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+//=== { TWideStrItr } ===========================================================
+
 constructor TWideStrItr.Create(const AOwnTree: IJclWideStrCollection; ACursor: TJclWideStrBinaryNode; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -2802,17 +2814,6 @@
 
 //=== { TPreOrderWideStrItr } ===================================================
 
-type
-  TPreOrderWideStrItr = class(TWideStrItr, IJclWideStrIterator, IJclWideStrTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclWideStrBinaryNode; override;
-    function GetPreviousCursor: TJclWideStrBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TPreOrderWideStrItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TPreOrderWideStrItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -2869,17 +2870,6 @@
 
 //=== { TInOrderWideStrItr } ====================================================
 
-type
-  TInOrderWideStrItr = class(TWideStrItr, IJclWideStrIterator, IJclWideStrTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclWideStrBinaryNode; override;
-    function GetPreviousCursor: TJclWideStrBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TInOrderWideStrItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TInOrderWideStrItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -2937,17 +2927,6 @@
 
 //=== { TPostOrderWideStrItr } ==================================================
 
-type
-  TPostOrderWideStrItr = class(TWideStrItr, IJclWideStrIterator, IJclWideStrTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclWideStrBinaryNode; override;
-    function GetPreviousCursor: TJclWideStrBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TPostOrderWideStrItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TPostOrderWideStrItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -3001,8 +2980,6 @@
   end;
 end;
 
-//=== { TSingleItr } ===========================================================
-
 type
   TSingleItr = class(TJclAbstractIterator, IJclSingleIterator, IJclSingleTreeIterator, IJclSingleBinaryTreeIterator)
   protected
@@ -3052,6 +3029,38 @@
     constructor Create(const AOwnTree: IJclSingleCollection; ACursor: TJclSingleBinaryNode; AValid: Boolean; AStart: TItrStart);
   end;
 
+  TPreOrderSingleItr = class(TSingleItr, IJclSingleIterator, IJclSingleTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclSingleBinaryNode; override;
+    function GetPreviousCursor: TJclSingleBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+  TInOrderSingleItr = class(TSingleItr, IJclSingleIterator, IJclSingleTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclSingleBinaryNode; override;
+    function GetPreviousCursor: TJclSingleBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+  TPostOrderSingleItr = class(TSingleItr, IJclSingleIterator, IJclSingleTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclSingleBinaryNode; override;
+    function GetPreviousCursor: TJclSingleBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+//=== { TSingleItr } ===========================================================
+
 constructor TSingleItr.Create(const AOwnTree: IJclSingleCollection; ACursor: TJclSingleBinaryNode; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -3540,17 +3549,6 @@
 
 //=== { TPreOrderSingleItr } ===================================================
 
-type
-  TPreOrderSingleItr = class(TSingleItr, IJclSingleIterator, IJclSingleTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclSingleBinaryNode; override;
-    function GetPreviousCursor: TJclSingleBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TPreOrderSingleItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TPreOrderSingleItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -3607,17 +3605,6 @@
 
 //=== { TInOrderSingleItr } ====================================================
 
-type
-  TInOrderSingleItr = class(TSingleItr, IJclSingleIterator, IJclSingleTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclSingleBinaryNode; override;
-    function GetPreviousCursor: TJclSingleBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TInOrderSingleItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TInOrderSingleItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -3675,17 +3662,6 @@
 
 //=== { TPostOrderSingleItr } ==================================================
 
-type
-  TPostOrderSingleItr = class(TSingleItr, IJclSingleIterator, IJclSingleTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclSingleBinaryNode; override;
-    function GetPreviousCursor: TJclSingleBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TPostOrderSingleItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TPostOrderSingleItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -3739,8 +3715,6 @@
   end;
 end;
 
-//=== { TDoubleItr } ===========================================================
-
 type
   TDoubleItr = class(TJclAbstractIterator, IJclDoubleIterator, IJclDoubleTreeIterator, IJclDoubleBinaryTreeIterator)
   protected
@@ -3790,6 +3764,38 @@
     constructor Create(const AOwnTree: IJclDoubleCollection; ACursor: TJclDoubleBinaryNode; AValid: Boolean; AStart: TItrStart);
   end;
 
+  TPreOrderDoubleItr = class(TDoubleItr, IJclDoubleIterator, IJclDoubleTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclDoubleBinaryNode; override;
+    function GetPreviousCursor: TJclDoubleBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+  TInOrderDoubleItr = class(TDoubleItr, IJclDoubleIterator, IJclDoubleTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclDoubleBinaryNode; override;
+    function GetPreviousCursor: TJclDoubleBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+  TPostOrderDoubleItr = class(TDoubleItr, IJclDoubleIterator, IJclDoubleTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclDoubleBinaryNode; override;
+    function GetPreviousCursor: TJclDoubleBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+//=== { TDoubleItr } ===========================================================
+
 constructor TDoubleItr.Create(const AOwnTree: IJclDoubleCollection; ACursor: TJclDoubleBinaryNode; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -4278,17 +4284,6 @@
 
 //=== { TPreOrderDoubleItr } ===================================================
 
-type
-  TPreOrderDoubleItr = class(TDoubleItr, IJclDoubleIterator, IJclDoubleTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclDoubleBinaryNode; override;
-    function GetPreviousCursor: TJclDoubleBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TPreOrderDoubleItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TPreOrderDoubleItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -4345,17 +4340,6 @@
 
 //=== { TInOrderDoubleItr } ====================================================
 
-type
-  TInOrderDoubleItr = class(TDoubleItr, IJclDoubleIterator, IJclDoubleTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclDoubleBinaryNode; override;
-    function GetPreviousCursor: TJclDoubleBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TInOrderDoubleItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TInOrderDoubleItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -4413,17 +4397,6 @@
 
 //=== { TPostOrderDoubleItr } ==================================================
 
-type
-  TPostOrderDoubleItr = class(TDoubleItr, IJclDoubleIterator, IJclDoubleTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclDoubleBinaryNode; override;
-    function GetPreviousCursor: TJclDoubleBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TPostOrderDoubleItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TPostOrderDoubleItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -4477,8 +4450,6 @@
   end;
 end;
 
-//=== { TExtendedItr } ===========================================================
-
 type
   TExtendedItr = class(TJclAbstractIterator, IJclExtendedIterator, IJclExtendedTreeIterator, IJclExtendedBinaryTreeIterator)
   protected
@@ -4528,6 +4499,38 @@
     constructor Create(const AOwnTree: IJclExtendedCollection; ACursor: TJclExtendedBinaryNode; AValid: Boolean; AStart: TItrStart);
   end;
 
+  TPreOrderExtendedItr = class(TExtendedItr, IJclExtendedIterator, IJclExtendedTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclExtendedBinaryNode; override;
+    function GetPreviousCursor: TJclExtendedBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+  TInOrderExtendedItr = class(TExtendedItr, IJclExtendedIterator, IJclExtendedTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclExtendedBinaryNode; override;
+    function GetPreviousCursor: TJclExtendedBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+  TPostOrderExtendedItr = class(TExtendedItr, IJclExtendedIterator, IJclExtendedTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclExtendedBinaryNode; override;
+    function GetPreviousCursor: TJclExtendedBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+//=== { TExtendedItr } ===========================================================
+
 constructor TExtendedItr.Create(const AOwnTree: IJclExtendedCollection; ACursor: TJclExtendedBinaryNode; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -5016,17 +5019,6 @@
 
 //=== { TPreOrderExtendedItr } ===================================================
 
-type
-  TPreOrderExtendedItr = class(TExtendedItr, IJclExtendedIterator, IJclExtendedTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclExtendedBinaryNode; override;
-    function GetPreviousCursor: TJclExtendedBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TPreOrderExtendedItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TPreOrderExtendedItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -5083,17 +5075,6 @@
 
 //=== { TInOrderExtendedItr } ====================================================
 
-type
-  TInOrderExtendedItr = class(TExtendedItr, IJclExtendedIterator, IJclExtendedTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclExtendedBinaryNode; override;
-    function GetPreviousCursor: TJclExtendedBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TInOrderExtendedItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TInOrderExtendedItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -5151,17 +5132,6 @@
 
 //=== { TPostOrderExtendedItr } ==================================================
 
-type
-  TPostOrderExtendedItr = class(TExtendedItr, IJclExtendedIterator, IJclExtendedTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclExtendedBinaryNode; override;
-    function GetPreviousCursor: TJclExtendedBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TPostOrderExtendedItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TPostOrderExtendedItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -5215,8 +5185,6 @@
   end;
 end;
 
-//=== { TIntegerItr } ===========================================================
-
 type
   TIntegerItr = class(TJclAbstractIterator, IJclIntegerIterator, IJclIntegerTreeIterator, IJclIntegerBinaryTreeIterator)
   protected
@@ -5266,6 +5234,38 @@
     constructor Create(const AOwnTree: IJclIntegerCollection; ACursor: TJclIntegerBinaryNode; AValid: Boolean; AStart: TItrStart);
   end;
 
+  TPreOrderIntegerItr = class(TIntegerItr, IJclIntegerIterator, IJclIntegerTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclIntegerBinaryNode; override;
+    function GetPreviousCursor: TJclIntegerBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+  TInOrderIntegerItr = class(TIntegerItr, IJclIntegerIterator, IJclIntegerTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclIntegerBinaryNode; override;
+    function GetPreviousCursor: TJclIntegerBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+  TPostOrderIntegerItr = class(TIntegerItr, IJclIntegerIterator, IJclIntegerTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
+    IJclIntfCloneable, IJclCloneable)
+  protected
+    function CreateEmptyIterator: TJclAbstractIterator; override;
+    function GetNextCursor: TJclIntegerBinaryNode; override;
+    function GetPreviousCursor: TJclIntegerBinaryNode; override;
+    { IJclIntfCloneable }
+    function IJclIntfCloneable.Clone = IntfClone;
+  end;
+
+//=== { TIntegerItr } ===========================================================
+
 constructor TIntegerItr.Create(const AOwnTree: IJclIntegerCollection; ACursor: TJclIntegerBinaryNode; AValid: Boolean; AStart: TItrStart);
 begin
   inherited Create(AValid);
@@ -5754,17 +5754,6 @@
 
 //=== { TPreOrderIntegerItr } ===================================================
 
-type
-  TPreOrderIntegerItr = class(TIntegerItr, IJclIntegerIterator, IJclIntegerTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclIntegerBinaryNode; override;
-    function GetPreviousCursor: TJclIntegerBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TPreOrderIntegerItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TPreOrderIntegerItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -5821,17 +5810,6 @@
 
 //=== { TInOrderIntegerItr } ====================================================
 
-type
-  TInOrderIntegerItr = class(TIntegerItr, IJclIntegerIterator, IJclIntegerTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclIntegerBinaryNode; override;
-    function GetPreviousCursor: TJclIntegerBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TInOrderIntegerItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TInOrderIntegerItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -5889,17 +5867,6 @@
 
 //=== { TPostOrderIntegerItr } ==================================================
 
-type
-  TPostOrderIntegerItr = class(TIntegerItr, IJclIntegerIterator, IJclIntegerTreeIterator, {$IFDEF THREADSAFE} IJclLockable, {$ENDIF THREADSAFE}
-    IJclIntfCloneable, IJclCloneable)
-  protected
-    function CreateEmptyIterator: TJclAbstractIterator; override;
-    function GetNextCursor: TJclIntegerBinaryNode; override;
-    function GetPreviousCursor: TJclIntegerBinaryNode; override;
-    { IJclIntfCloneable }
-    function IJclIntfCloneable.Clone = IntfClone;
-  end;
-
 function TPostOrderIntegerItr.CreateEmptyIterator: TJclAbstractIterator;
 begin
   Result := TPostOrderIntegerItr.Create(FOwnTree, FCursor, Valid, FStart);
@@ -5953,8 +5920,6 @@
   end;
 end;
 
-//=== { TCardinalItr } ===========================================================
-
 type
   TCardinalItr = class(TJclAbstractIterator, IJclCardinalIterator, IJclCardinalTreeIterator, IJclCardinalBinaryTreeIterator)
   protected
@@ -6004,6 +5969,38 @@
     constructor Create(const...
 
[truncated message content]

[Jcl-checkins-diff] SF.net SVN: jcl: [2301] trunk/jcl/packages

From: <ob...@us...> - 2008-01-13 12:51:32

Revision: 2301
          http://jcl.svn.sourceforge.net/jcl/?rev=2301&view=rev
Author:   obones
Date:     2008-01-13 04:51:30 -0800 (Sun, 13 Jan 2008)

Log Message:
-----------
Regenerated resources

Modified Paths:
--------------
    trunk/jcl/packages/c5/JclDebugExpertC50.RES
    trunk/jcl/packages/c5/JclFavoriteFoldersExpertC50.res
    trunk/jcl/packages/c5/JclThreadNameExpertC50.RES
    trunk/jcl/packages/c5/JclUsesExpertC50.RES
    trunk/jcl/packages/c6/JclRepositoryExpert.res

Modified: trunk/jcl/packages/c5/JclDebugExpertC50.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclFavoriteFoldersExpertC50.res
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclThreadNameExpertC50.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c5/JclUsesExpertC50.RES
===================================================================
(Binary files differ)

Modified: trunk/jcl/packages/c6/JclRepositoryExpert.res
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2300] trunk

From: <ou...@us...> - 2008-01-11 19:28:11

Revision: 2300
          http://jcl.svn.sourceforge.net/jcl/?rev=2300&view=rev
Author:   outchy
Date:     2008-01-11 11:28:10 -0800 (Fri, 11 Jan 2008)

Log Message:
-----------
Removing new lines at the beginning of macros.

Modified Paths:
--------------
    trunk/jcl/devtools/jpp.exe
    trunk/jpp/JppParser.pas

Modified: trunk/jcl/devtools/jpp.exe
===================================================================
(Binary files differ)

Modified: trunk/jpp/JppParser.pas
===================================================================
--- trunk/jpp/JppParser.pas	2008-01-11 19:23:04 UTC (rev 2299)
+++ trunk/jpp/JppParser.pas	2008-01-11 19:28:10 UTC (rev 2300)
@@ -438,6 +438,8 @@
   I := ParseMacro(MacroText, MacroName, ParamNames, True);
   if I <= Length(MacroText) then
   begin
+    if Copy(MacroText, I, Length(AnsiLineBreak)) = AnsiLineBreak then
+      Inc(I, Length(AnsiLineBreak));
     J := Length(MacroText);
     if MacroText[J] = ')' then
       Dec(J);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2299] trunk/jcl/source

From: <ou...@us...> - 2008-01-11 19:23:13

Revision: 2299
          http://jcl.svn.sourceforge.net/jcl/?rev=2299&view=rev
Author:   outchy
Date:     2008-01-11 11:23:04 -0800 (Fri, 11 Jan 2008)

Log Message:
-----------
Empty hash container must have the same capacity for clone to work.

Modified Paths:
--------------
    trunk/jcl/source/common/JclHashMaps.pas
    trunk/jcl/source/common/JclHashSets.pas
    trunk/jcl/source/prototypes/JclHashMaps.pas
    trunk/jcl/source/prototypes/JclHashSets.pas

Modified: trunk/jcl/source/common/JclHashMaps.pas
===================================================================
--- trunk/jcl/source/common/JclHashMaps.pas	2008-01-11 15:48:08 UTC (rev 2298)
+++ trunk/jcl/source/common/JclHashMaps.pas	2008-01-11 19:23:04 UTC (rev 2299)
@@ -29,7 +29,7 @@
 {                                                                                                  }
 {**************************************************************************************************}
 {                                                                                                  }
-{ Last modified: $Date::                                                                         $ }
+{ Last modified: $Date::                                                                        $ }
 { Revision:      $Rev::                                                                          $ }
 { Author:        $Author::                                                                       $ }
 {                                                                                                  }
@@ -2673,7 +2673,7 @@
 
 function TJclIntfIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfIntfHashMap.Create(FSize);
+  Result := TJclIntfIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -3252,7 +3252,7 @@
 
 function TJclAnsiStrIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclAnsiStrIntfHashMap.Create(FSize);
+  Result := TJclAnsiStrIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -3831,7 +3831,7 @@
 
 function TJclIntfAnsiStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfAnsiStrHashMap.Create(FSize);
+  Result := TJclIntfAnsiStrHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -3882,8 +3882,6 @@
   Value := '';
 end;
 
-
-
 function TJclIntfAnsiStrHashMap.GetValue(const Key: IInterface): AnsiString;
 var
   I: Integer;
@@ -4414,7 +4412,7 @@
 
 function TJclAnsiStrAnsiStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclAnsiStrAnsiStrHashMap.Create(FSize);
+  Result := TJclAnsiStrAnsiStrHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -4993,7 +4991,7 @@
 
 function TJclWideStrIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclWideStrIntfHashMap.Create(FSize);
+  Result := TJclWideStrIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -5572,7 +5570,7 @@
 
 function TJclIntfWideStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfWideStrHashMap.Create(FSize);
+  Result := TJclIntfWideStrHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -6155,7 +6153,7 @@
 
 function TJclWideStrWideStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclWideStrWideStrHashMap.Create(FSize);
+  Result := TJclWideStrWideStrHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -6734,7 +6732,7 @@
 
 function TJclSingleIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclSingleIntfHashMap.Create(FSize);
+  Result := TJclSingleIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -7313,7 +7311,7 @@
 
 function TJclIntfSingleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfSingleHashMap.Create(FSize);
+  Result := TJclIntfSingleHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -7896,7 +7894,7 @@
 
 function TJclSingleSingleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclSingleSingleHashMap.Create(FSize);
+  Result := TJclSingleSingleHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -8475,7 +8473,7 @@
 
 function TJclDoubleIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclDoubleIntfHashMap.Create(FSize);
+  Result := TJclDoubleIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -9054,7 +9052,7 @@
 
 function TJclIntfDoubleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfDoubleHashMap.Create(FSize);
+  Result := TJclIntfDoubleHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -9637,7 +9635,7 @@
 
 function TJclDoubleDoubleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclDoubleDoubleHashMap.Create(FSize);
+  Result := TJclDoubleDoubleHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -10216,7 +10214,7 @@
 
 function TJclExtendedIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclExtendedIntfHashMap.Create(FSize);
+  Result := TJclExtendedIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -10795,7 +10793,7 @@
 
 function TJclIntfExtendedHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfExtendedHashMap.Create(FSize);
+  Result := TJclIntfExtendedHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -11378,7 +11376,7 @@
 
 function TJclExtendedExtendedHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclExtendedExtendedHashMap.Create(FSize);
+  Result := TJclExtendedExtendedHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -11957,7 +11955,7 @@
 
 function TJclIntegerIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntegerIntfHashMap.Create(FSize);
+  Result := TJclIntegerIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -12536,7 +12534,7 @@
 
 function TJclIntfIntegerHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfIntegerHashMap.Create(FSize);
+  Result := TJclIntfIntegerHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -13119,7 +13117,7 @@
 
 function TJclIntegerIntegerHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntegerIntegerHashMap.Create(FSize);
+  Result := TJclIntegerIntegerHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -13698,7 +13696,7 @@
 
 function TJclCardinalIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclCardinalIntfHashMap.Create(FSize);
+  Result := TJclCardinalIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -14277,7 +14275,7 @@
 
 function TJclIntfCardinalHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfCardinalHashMap.Create(FSize);
+  Result := TJclIntfCardinalHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -14860,7 +14858,7 @@
 
 function TJclCardinalCardinalHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclCardinalCardinalHashMap.Create(FSize);
+  Result := TJclCardinalCardinalHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -15439,7 +15437,7 @@
 
 function TJclInt64IntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclInt64IntfHashMap.Create(FSize);
+  Result := TJclInt64IntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -16018,7 +16016,7 @@
 
 function TJclIntfInt64HashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfInt64HashMap.Create(FSize);
+  Result := TJclIntfInt64HashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -16601,7 +16599,7 @@
 
 function TJclInt64Int64HashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclInt64Int64HashMap.Create(FSize);
+  Result := TJclInt64Int64HashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -17181,7 +17179,7 @@
 
 function TJclPtrIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclPtrIntfHashMap.Create(FSize);
+  Result := TJclPtrIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -17760,7 +17758,7 @@
 
 function TJclIntfPtrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfPtrHashMap.Create(FSize);
+  Result := TJclIntfPtrHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -18343,7 +18341,7 @@
 
 function TJclPtrPtrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclPtrPtrHashMap.Create(FSize);
+  Result := TJclPtrPtrHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -18924,7 +18922,7 @@
 
 function TJclIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfHashMap.Create(FSize, False);
+  Result := TJclIntfHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 
@@ -19520,7 +19518,7 @@
 
 function TJclAnsiStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclAnsiStrHashMap.Create(FSize, False);
+  Result := TJclAnsiStrHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 
@@ -20112,7 +20110,7 @@
 
 function TJclWideStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclWideStrHashMap.Create(FSize, False);
+  Result := TJclWideStrHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 
@@ -20704,7 +20702,7 @@
 
 function TJclSingleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclSingleHashMap.Create(FSize, False);
+  Result := TJclSingleHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 
@@ -21296,7 +21294,7 @@
 
 function TJclDoubleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclDoubleHashMap.Create(FSize, False);
+  Result := TJclDoubleHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 
@@ -21888,7 +21886,7 @@
 
 function TJclExtendedHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclExtendedHashMap.Create(FSize, False);
+  Result := TJclExtendedHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 
@@ -22480,7 +22478,7 @@
 
 function TJclIntegerHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntegerHashMap.Create(FSize, False);
+  Result := TJclIntegerHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 
@@ -23072,7 +23070,7 @@
 
 function TJclCardinalHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclCardinalHashMap.Create(FSize, False);
+  Result := TJclCardinalHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 
@@ -23664,7 +23662,7 @@
 
 function TJclInt64HashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclInt64HashMap.Create(FSize, False);
+  Result := TJclInt64HashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 
@@ -24257,7 +24255,7 @@
 
 function TJclPtrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclPtrHashMap.Create(FSize, False);
+  Result := TJclPtrHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 
@@ -24851,7 +24849,7 @@
 
 function TJclHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclHashMap.Create(FSize, False, False);
+  Result := TJclHashMap.Create(FCapacity, False, False);
   AssignPropertiesTo(Result);
 end;
 
@@ -25934,7 +25932,7 @@
 function TJclHashMapE<TKey, TValue>.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
   Result := TJclHashMapE<TKey, TValue>.Create(KeyEqualityComparer, ValueEqualityComparer,
-    KeyComparer, FSize, False, False);
+    KeyComparer, FCapacity, False, False);
   AssignPropertiesTo(Result);
 end;
 
@@ -25999,7 +25997,7 @@
 
 function TJclHashMapF<TKey, TValue>.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclHashMapF<TKey, TValue>.Create(KeyEqualityCompare, KeyHash, ValueEqualityCompare, KeyCompare, FSize,
+  Result := TJclHashMapF<TKey, TValue>.Create(KeyEqualityCompare, KeyHash, ValueEqualityCompare, KeyCompare, FCapacity,
     False, False);
   AssignPropertiesTo(Result);
 end;
@@ -26039,7 +26037,7 @@
 
 function TJclHashMapI<TKey, TValue>.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclHashMapI<TKey, TValue>.Create(FSize, False, False);
+  Result := TJclHashMapI<TKey, TValue>.Create(FCapacity, False, False);
   AssignPropertiesTo(Result);
 end;
 

Modified: trunk/jcl/source/common/JclHashSets.pas
===================================================================
--- trunk/jcl/source/common/JclHashSets.pas	2008-01-11 15:48:08 UTC (rev 2298)
+++ trunk/jcl/source/common/JclHashSets.pas	2008-01-11 19:23:04 UTC (rev 2299)
@@ -29,7 +29,7 @@
 {                                                                                                  }
 {**************************************************************************************************}
 {                                                                                                  }
-{ Last modified: $Date::                                                                         $ }
+{ Last modified: $Date::                                                                        $ }
 { Revision:      $Rev::                                                                          $ }
 { Author:        $Author::                                                                       $ }
 {                                                                                                  }
@@ -992,7 +992,7 @@
 
 function TJclIntfHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfHashSet.Create(FMap.Size);
+  Result := TJclIntfHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -1323,7 +1323,7 @@
 
 function TJclAnsiStrHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclAnsiStrHashSet.Create(FMap.Size);
+  Result := TJclAnsiStrHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -1674,7 +1674,7 @@
 
 function TJclWideStrHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclWideStrHashSet.Create(FMap.Size);
+  Result := TJclWideStrHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -2027,7 +2027,7 @@
 
 function TJclSingleHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclSingleHashSet.Create(FMap.Size);
+  Result := TJclSingleHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -2370,7 +2370,7 @@
 
 function TJclDoubleHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclDoubleHashSet.Create(FMap.Size);
+  Result := TJclDoubleHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -2713,7 +2713,7 @@
 
 function TJclExtendedHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclExtendedHashSet.Create(FMap.Size);
+  Result := TJclExtendedHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -3056,7 +3056,7 @@
 
 function TJclIntegerHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntegerHashSet.Create(FMap.Size);
+  Result := TJclIntegerHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -3391,7 +3391,7 @@
 
 function TJclCardinalHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclCardinalHashSet.Create(FMap.Size);
+  Result := TJclCardinalHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -3726,7 +3726,7 @@
 
 function TJclInt64HashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclInt64HashSet.Create(FMap.Size);
+  Result := TJclInt64HashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -4062,7 +4062,7 @@
 
 function TJclPtrHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclPtrHashSet.Create(FMap.Size);
+  Result := TJclPtrHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 
@@ -4398,7 +4398,7 @@
 
 function TJclHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclHashSet.Create(FMap.Size, False);
+  Result := TJclHashSet.Create(GetCapacity, False);
   AssignPropertiesTo(Result);
 end;
 

Modified: trunk/jcl/source/prototypes/JclHashMaps.pas
===================================================================
--- trunk/jcl/source/prototypes/JclHashMaps.pas	2008-01-11 15:48:08 UTC (rev 2298)
+++ trunk/jcl/source/prototypes/JclHashMaps.pas	2008-01-11 19:23:04 UTC (rev 2299)
@@ -25,7 +25,7 @@
 {                                                                                                  }
 {**************************************************************************************************}
 {                                                                                                  }
-{ Last modified: $Date::                                                                         $ }
+{ Last modified: $Date::                                                                        $ }
 { Revision:      $Rev::                                                                          $ }
 { Author:        $Author::                                                                       $ }
 {                                                                                                  }
@@ -557,7 +557,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclIntfIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfIntfHashMap.Create(FSize);
+  Result := TJclIntfIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -607,7 +607,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclAnsiStrIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclAnsiStrIntfHashMap.Create(FSize);
+  Result := TJclAnsiStrIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -657,7 +657,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclIntfAnsiStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfAnsiStrHashMap.Create(FSize);
+  Result := TJclIntfAnsiStrHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -712,7 +712,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclAnsiStrAnsiStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclAnsiStrAnsiStrHashMap.Create(FSize);
+  Result := TJclAnsiStrAnsiStrHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -762,7 +762,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclWideStrIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclWideStrIntfHashMap.Create(FSize);
+  Result := TJclWideStrIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -812,7 +812,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclIntfWideStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfWideStrHashMap.Create(FSize);
+  Result := TJclIntfWideStrHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -867,7 +867,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclWideStrWideStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclWideStrWideStrHashMap.Create(FSize);
+  Result := TJclWideStrWideStrHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -917,7 +917,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclSingleIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclSingleIntfHashMap.Create(FSize);
+  Result := TJclSingleIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -967,7 +967,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclIntfSingleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfSingleHashMap.Create(FSize);
+  Result := TJclIntfSingleHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1022,7 +1022,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclSingleSingleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclSingleSingleHashMap.Create(FSize);
+  Result := TJclSingleSingleHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1072,7 +1072,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclDoubleIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclDoubleIntfHashMap.Create(FSize);
+  Result := TJclDoubleIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1122,7 +1122,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclIntfDoubleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfDoubleHashMap.Create(FSize);
+  Result := TJclIntfDoubleHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1177,7 +1177,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclDoubleDoubleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclDoubleDoubleHashMap.Create(FSize);
+  Result := TJclDoubleDoubleHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1227,7 +1227,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclExtendedIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclExtendedIntfHashMap.Create(FSize);
+  Result := TJclExtendedIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1277,7 +1277,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclIntfExtendedHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfExtendedHashMap.Create(FSize);
+  Result := TJclIntfExtendedHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1332,7 +1332,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclExtendedExtendedHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclExtendedExtendedHashMap.Create(FSize);
+  Result := TJclExtendedExtendedHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1382,7 +1382,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclIntegerIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntegerIntfHashMap.Create(FSize);
+  Result := TJclIntegerIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1432,7 +1432,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclIntfIntegerHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfIntegerHashMap.Create(FSize);
+  Result := TJclIntfIntegerHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1487,7 +1487,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclIntegerIntegerHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntegerIntegerHashMap.Create(FSize);
+  Result := TJclIntegerIntegerHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1537,7 +1537,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclCardinalIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclCardinalIntfHashMap.Create(FSize);
+  Result := TJclCardinalIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1587,7 +1587,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclIntfCardinalHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfCardinalHashMap.Create(FSize);
+  Result := TJclIntfCardinalHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1642,7 +1642,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclCardinalCardinalHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclCardinalCardinalHashMap.Create(FSize);
+  Result := TJclCardinalCardinalHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1692,7 +1692,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclInt64IntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclInt64IntfHashMap.Create(FSize);
+  Result := TJclInt64IntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1742,7 +1742,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclIntfInt64HashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfInt64HashMap.Create(FSize);
+  Result := TJclIntfInt64HashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1797,7 +1797,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclInt64Int64HashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclInt64Int64HashMap.Create(FSize);
+  Result := TJclInt64Int64HashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1848,7 +1848,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclPtrIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclPtrIntfHashMap.Create(FSize);
+  Result := TJclPtrIntfHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1898,7 +1898,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclIntfPtrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfPtrHashMap.Create(FSize);
+  Result := TJclIntfPtrHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -1953,7 +1953,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclPtrPtrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclPtrPtrHashMap.Create(FSize);
+  Result := TJclPtrPtrHashMap.Create(FCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -2004,7 +2004,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclIntfHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfHashMap.Create(FSize, False);
+  Result := TJclIntfHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 }
@@ -2073,7 +2073,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclAnsiStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclAnsiStrHashMap.Create(FSize, False);
+  Result := TJclAnsiStrHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 }
@@ -2137,7 +2137,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclWideStrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclWideStrHashMap.Create(FSize, False);
+  Result := TJclWideStrHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 }
@@ -2201,7 +2201,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclSingleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclSingleHashMap.Create(FSize, False);
+  Result := TJclSingleHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 }
@@ -2265,7 +2265,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclDoubleHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclDoubleHashMap.Create(FSize, False);
+  Result := TJclDoubleHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 }
@@ -2329,7 +2329,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclExtendedHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclExtendedHashMap.Create(FSize, False);
+  Result := TJclExtendedHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 }
@@ -2393,7 +2393,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclIntegerHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntegerHashMap.Create(FSize, False);
+  Result := TJclIntegerHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 }
@@ -2457,7 +2457,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclCardinalHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclCardinalHashMap.Create(FSize, False);
+  Result := TJclCardinalHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 }
@@ -2521,7 +2521,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclInt64HashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclInt64HashMap.Create(FSize, False);
+  Result := TJclInt64HashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 }
@@ -2586,7 +2586,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclPtrHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclPtrHashMap.Create(FSize, False);
+  Result := TJclPtrHashMap.Create(FCapacity, False);
   AssignPropertiesTo(Result);
 end;
 }
@@ -2651,7 +2651,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclHashMap.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclHashMap.Create(FSize, False, False);
+  Result := TJclHashMap.Create(FCapacity, False, False);
   AssignPropertiesTo(Result);
 end;
 }
@@ -2834,7 +2834,7 @@
 function TJclHashMapE<TKey, TValue>.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
   Result := TJclHashMapE<TKey, TValue>.Create(KeyEqualityComparer, ValueEqualityComparer,
-    KeyComparer, FSize, False, False);
+    KeyComparer, FCapacity, False, False);
   AssignPropertiesTo(Result);
 end;
 
@@ -2899,7 +2899,7 @@
 
 function TJclHashMapF<TKey, TValue>.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclHashMapF<TKey, TValue>.Create(KeyEqualityCompare, KeyHash, ValueEqualityCompare, KeyCompare, FSize,
+  Result := TJclHashMapF<TKey, TValue>.Create(KeyEqualityCompare, KeyHash, ValueEqualityCompare, KeyCompare, FCapacity,
     False, False);
   AssignPropertiesTo(Result);
 end;
@@ -2939,7 +2939,7 @@
 
 function TJclHashMapI<TKey, TValue>.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclHashMapI<TKey, TValue>.Create(FSize, False, False);
+  Result := TJclHashMapI<TKey, TValue>.Create(FCapacity, False, False);
   AssignPropertiesTo(Result);
 end;
 

Modified: trunk/jcl/source/prototypes/JclHashSets.pas
===================================================================
--- trunk/jcl/source/prototypes/JclHashSets.pas	2008-01-11 15:48:08 UTC (rev 2298)
+++ trunk/jcl/source/prototypes/JclHashSets.pas	2008-01-11 19:23:04 UTC (rev 2299)
@@ -25,7 +25,7 @@
 {                                                                                                  }
 {**************************************************************************************************}
 {                                                                                                  }
-{ Last modified: $Date::                                                                         $ }
+{ Last modified: $Date::                                                                        $ }
 { Revision:      $Rev::                                                                          $ }
 { Author:        $Author::                                                                       $ }
 {                                                                                                  }
@@ -236,7 +236,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclIntfHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntfHashSet.Create(FMap.Size);
+  Result := TJclIntfHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -261,7 +261,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclAnsiStrHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclAnsiStrHashSet.Create(FMap.Size);
+  Result := TJclAnsiStrHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -306,7 +306,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclWideStrHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclWideStrHashSet.Create(FMap.Size);
+  Result := TJclWideStrHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -351,7 +351,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclSingleHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclSingleHashSet.Create(FMap.Size);
+  Result := TJclSingleHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -386,7 +386,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclDoubleHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclDoubleHashSet.Create(FMap.Size);
+  Result := TJclDoubleHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -421,7 +421,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclExtendedHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclExtendedHashSet.Create(FMap.Size);
+  Result := TJclExtendedHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -456,7 +456,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclIntegerHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclIntegerHashSet.Create(FMap.Size);
+  Result := TJclIntegerHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -481,7 +481,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclCardinalHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclCardinalHashSet.Create(FMap.Size);
+  Result := TJclCardinalHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -506,7 +506,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclInt64HashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclInt64HashSet.Create(FMap.Size);
+  Result := TJclInt64HashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -532,7 +532,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclPtrHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclPtrHashSet.Create(FMap.Size);
+  Result := TJclPtrHashSet.Create(GetCapacity);
   AssignPropertiesTo(Result);
 end;
 }
@@ -558,7 +558,7 @@
 {$JPPDEFINEMACRO CREATEEMPTYCONTAINER
 function TJclHashSet.CreateEmptyContainer: TJclAbstractContainerBase;
 begin
-  Result := TJclHashSet.Create(FMap.Size, False);
+  Result := TJclHashSet.Create(GetCapacity, False);
   AssignPropertiesTo(Result);
 end;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2298] trunk/jcl/source/common/JclSysUtils.pas

From: <ah...@us...> - 2008-01-11 15:48:12

Revision: 2298
          http://jcl.svn.sourceforge.net/jcl/?rev=2298&view=rev
Author:   ahuser
Date:     2008-01-11 07:48:08 -0800 (Fri, 11 Jan 2008)

Log Message:
-----------
Fixed memory leak in SharedFreeMem

Modified Paths:
--------------
    trunk/jcl/source/common/JclSysUtils.pas

Modified: trunk/jcl/source/common/JclSysUtils.pas
===================================================================
--- trunk/jcl/source/common/JclSysUtils.pas	2008-01-10 23:39:36 UTC (rev 2297)
+++ trunk/jcl/source/common/JclSysUtils.pas	2008-01-11 15:48:08 UTC (rev 2298)
@@ -1017,18 +1017,10 @@
   NewListItem^.Name := Name;
   NewListItem^.Handle := FileMappingHandle;
   NewListItem^.Memory := Pointer(p);
-  NewListItem^.Next := nil;
   NewListItem^.References := 1;
 
-  if MMFHandleList = nil then
-    MMFHandleList := NewListItem
-  else
-  begin
-    Iterate := MMFHandleList;
-    while Iterate^.Next <> nil do
-      Iterate := Iterate^.Next;
-    Iterate^.Next := NewListItem;
-  end;
+  NewListItem^.Next := MMFHandleList;
+  MMFHandleList := NewListItem;
 end;
 
 function SharedAllocMem(const Name: string; Size: Cardinal;
@@ -1073,13 +1065,12 @@
         if n = nil then
           MMFHandleList := Iterate^.Next
         else
-        begin
           n^.Next := Iterate^.Next;
-          Dispose(Iterate);
-          Pointer(p) := nil;
-          Result := True;
-          Break;
-        end;
+
+        Dispose(Iterate);
+        Pointer(p) := nil;
+        Result := True;
+        Break;
       end;
       n := Iterate;
       Iterate := Iterate^.Next;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2297] trunk/jcl/source/windows/JclDebug.pas

From: <ou...@us...> - 2008-01-10 23:39:39

Revision: 2297
          http://jcl.svn.sourceforge.net/jcl/?rev=2297&view=rev
Author:   outchy
Date:     2008-01-10 15:39:36 -0800 (Thu, 10 Jan 2008)

Log Message:
-----------
Mantis 4297 enhancement of JclDebug to report calling addresses rather than return address.
enhancement of backward disassembler to handle more call possibilities.

Modified Paths:
--------------
    trunk/jcl/source/windows/JclDebug.pas

Modified: trunk/jcl/source/windows/JclDebug.pas
===================================================================
--- trunk/jcl/source/windows/JclDebug.pas	2008-01-10 19:18:25 UTC (rev 2296)
+++ trunk/jcl/source/windows/JclDebug.pas	2008-01-10 23:39:36 UTC (rev 2297)
@@ -4346,6 +4346,7 @@
   CodeDWORD4: DWORD;
   CodeDWORD8: DWORD;
   C4P, C8P: PDWORD;
+  RM1, RM2, RM5: Byte;
 begin
   // First check that the address is within range of our code segment!
   C8P := PDWORD(CodeAddr - 8);
@@ -4359,32 +4360,71 @@
     try
       CodeDWORD8 := PDWORD(C8P)^;
       CodeDWORD4 := PDWORD(C4P)^;
+      // CodeDWORD8 = (ReturnAddr-5):(ReturnAddr-6):(ReturnAddr-7):(ReturnAddr-8)
+      // CodeDWORD4 = (ReturnAddr-1):(ReturnAddr-2):(ReturnAddr-3):(ReturnAddr-4)
 
+      // ModR/M bytes contain the following bits:
+      // Mod        = (76)
+      // Reg/Opcode = (543)
+      // R/M        = (210)
+      RM1 := (CodeDWORD4 shr 24) and $7;
+      RM2 := (CodeDWORD4 shr 16) and $7;
+      //RM3 := (CodeDWORD4 shr 8)  and $7;
+      //RM4 :=  CodeDWORD4         and $7;
+      RM5 := (CodeDWORD8 shr 24) and $7;
+      //RM6 := (CodeDWORD8 shr 16) and $7;
+      //RM7 := (CodeDWORD8 shr 8)  and $7;
+
       // Check the instruction prior to the potential call site.
       // We consider it a valid call site if we find a CALL instruction there
       // Check the most common CALL variants first
-      if ((CodeDWORD8 and $FF000000) = $E8000000) then // 5-byte, CALL [-$1234567]
+      if ((CodeDWORD8 and $FF000000) = $E8000000) then
+        // 5 bytes, "CALL NEAR REL32" (E8 cd)
         CallInstructionSize := 5
       else
-      if ((CodeDWORD4 and $38FF0000) = $10FF0000) then // 2 byte, CALL EAX
+      if ((CodeDWORD4 and $F8FF0000) = $10FF0000) and not (RM1 in [4, 5]) then
+        // 2 bytes, "CALL NEAR [EAX]" (FF /2) where Reg = 010, Mod = 00, R/M <> 100 (1 extra byte)
+        // and R/M <> 101 (4 extra bytes)
         CallInstructionSize := 2
       else
-      if ((CodeDWORD4 and $0038FF00) = $0010FF00) then // 3 byte, CALL [EBP+0x8]
+      if ((CodeDWORD4 and $F8FF0000) = $D0FF0000) then
+        // 2 bytes, "CALL NEAR EAX" (FF /2) where Reg = 010 and Mod = 11
+        CallInstructionSize := 2
+      else
+      if ((CodeDWORD4 and $00FFFF00) = $0014FF00) then
+        // 3 bytes, "CALL NEAR [EAX+EAX*i]" (FF /2) where Reg = 010, Mod = 00 and RM = 100
+        // SIB byte not validated
         CallInstructionSize := 3
       else
-      if ((CodeDWORD4 and $000038FF) = $000010FF) then // 4 byte, CALL ??
+      if ((CodeDWORD4 and $00F8FF00) = $0050FF00) and (RM2 <> 4) then
+        // 3 bytes, "CALL NEAR [EAX+$12]" (FF /2) where Reg = 010, Mod = 01 and RM <> 100 (1 extra byte)
+        CallInstructionSize := 3
+      else
+      if ((CodeDWORD4 and $0000FFFF) = $000054FF) then
+        // 4 bytes, "CALL NEAR [EAX+EAX+$12]" (FF /2) where Reg = 010, Mod = 01 and RM = 100
+        // SIB byte not validated
         CallInstructionSize := 4
       else
-      if ((CodeDWORD8 and $38FF0000) = $10FF0000) then // 6-byte, CALL ??
+      if ((CodeDWORD8 and $FFFF0000) = $15FF0000) then
+        // 6 bytes, "CALL NEAR [$12345678]" (FF /2) where Reg = 010, Mod = 00 and RM = 101
         CallInstructionSize := 6
       else
-      if ((CodeDWORD8 and $0038FF00) = $0010FF00) then // 7-byte, CALL [ESP-0x1234567]
+      if ((CodeDWORD8 and $F8FF0000) = $90FF0000) and (RM5 <> 4) then
+        // 6 bytes, "CALL NEAR [EAX+$12345678]" (FF /2) where Reg = 010, Mod = 10 and RM <> 100 (1 extra byte)
+        CallInstructionSize := 6
+      else
+      if ((CodeDWORD8 and $00FFFF00) = $0094FF00) then
+        // 7 bytes, "CALL NEAR [EAX+EAX+$1234567]" (FF /2) where Reg = 010, Mod = 10 and RM = 100
         CallInstructionSize := 7
       else
+      if ((CodeDWORD8 and $0000FF00) = $00009A00) then
+        // 7 bytes, "CALL FAR $1234:12345678" (9A ptr16:32)
+        CallInstructionSize := 7
+      else
         Result := False;
       // Because we're not doing a complete disassembly, we will potentially report
       // false positives. If there is odd code that uses the CALL 16:32 format, we
-      // can also get false negatives.}
+      // can also get false negatives.
     except
       Result := False;
     end;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2296] trunk/jcl/source/common/JclBorlandTools.pas

From: <ob...@us...> - 2008-01-10 19:18:27

Revision: 2296
          http://jcl.svn.sourceforge.net/jcl/?rev=2296&view=rev
Author:   obones
Date:     2008-01-10 11:18:25 -0800 (Thu, 10 Jan 2008)

Log Message:
-----------
Fixed crash when uninstalling BCB package.

Modified Paths:
--------------
    trunk/jcl/source/common/JclBorlandTools.pas

Modified: trunk/jcl/source/common/JclBorlandTools.pas
===================================================================
--- trunk/jcl/source/common/JclBorlandTools.pas	2008-01-10 11:41:56 UTC (rev 2295)
+++ trunk/jcl/source/common/JclBorlandTools.pas	2008-01-10 19:18:25 UTC (rev 2296)
@@ -4356,7 +4356,7 @@
 
 function TJclBorRADToolInstallation.UninstallBCBPackage(const PackageName, BPLPath, DCPPath: string): Boolean;
 var
-  MAPFileName, TDSFileName,
+  MAPFileName, TDSFileName, TmpBinaryFileName,
   BPIFileName, LIBFileName, BPLFileName: string;
   RunOnly: Boolean;
 begin
@@ -4365,7 +4365,7 @@
   if not IsBCBPackage(PackageName) then
     raise EJclBorRADException.CreateResFmt(@RsENotABCBPackage, [PackageName]);
 
-  GetBPKFileInfo(PackageName, RunOnly, @BinaryFileName);
+  GetBPKFileInfo(PackageName, RunOnly, @TmpBinaryFileName);
 
   BPLFileName := BinaryFileName(BPLPath, PackageName);
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2295] trunk/jcl/lib

From: <ou...@us...> - 2008-01-10 11:42:00

Revision: 2295
          http://jcl.svn.sourceforge.net/jcl/?rev=2295&view=rev
Author:   outchy
Date:     2008-01-10 03:41:56 -0800 (Thu, 10 Jan 2008)

Log Message:
-----------
Unmasking common units compatible with .NET

Modified Paths:
--------------
    trunk/jcl/lib/d10.net/common.exc
    trunk/jcl/lib/d11.net/common.exc
    trunk/jcl/lib/d9.net/common.exc

Modified: trunk/jcl/lib/d10.net/common.exc
===================================================================
--- trunk/jcl/lib/d10.net/common.exc	2008-01-07 16:57:32 UTC (rev 2294)
+++ trunk/jcl/lib/d10.net/common.exc	2008-01-10 11:41:56 UTC (rev 2295)
@@ -2,15 +2,6 @@
 Jcl8087.pas
 JclBorlandTools.pas
 JclCompression.pas
-JclCounter.pas
-JclEDI.pas
-JclEDISEF.pas
-JclEDITranslators.pas
-JclEDIXML.pas
-JclEDI_ANSIX12.pas
-JclEDI_ANSIX12_Ext.pas
-JclEDI_UNEDIFACT.pas
-JclEDI_UNEDIFACT_Ext.pas
 JclExprEval.pas
 JclMIDI.pas
 JclPCRE.pas
@@ -19,6 +10,5 @@
 JclStringLists.pas
 JclUnitVersioning.pas
 JclUnitVersioningProviders.pas
-JclValidation.pas
 JclWideStrings.pas
 pcre.pas
\ No newline at end of file

Modified: trunk/jcl/lib/d11.net/common.exc
===================================================================
--- trunk/jcl/lib/d11.net/common.exc	2008-01-07 16:57:32 UTC (rev 2294)
+++ trunk/jcl/lib/d11.net/common.exc	2008-01-10 11:41:56 UTC (rev 2295)
@@ -2,15 +2,6 @@
 Jcl8087.pas
 JclBorlandTools.pas
 JclCompression.pas
-JclCounter.pas
-JclEDI.pas
-JclEDISEF.pas
-JclEDITranslators.pas
-JclEDIXML.pas
-JclEDI_ANSIX12.pas
-JclEDI_ANSIX12_Ext.pas
-JclEDI_UNEDIFACT.pas
-JclEDI_UNEDIFACT_Ext.pas
 JclExprEval.pas
 JclMIDI.pas
 JclPCRE.pas
@@ -19,6 +10,5 @@
 JclStringLists.pas
 JclUnitVersioning.pas
 JclUnitVersioningProviders.pas
-JclValidation.pas
 JclWideStrings.pas
 pcre.pas
\ No newline at end of file

Modified: trunk/jcl/lib/d9.net/common.exc
===================================================================
--- trunk/jcl/lib/d9.net/common.exc	2008-01-07 16:57:32 UTC (rev 2294)
+++ trunk/jcl/lib/d9.net/common.exc	2008-01-10 11:41:56 UTC (rev 2295)
@@ -2,15 +2,6 @@
 Jcl8087.pas
 JclBorlandTools.pas
 JclCompression.pas
-JclCounter.pas
-JclEDI.pas
-JclEDISEF.pas
-JclEDITranslators.pas
-JclEDIXML.pas
-JclEDI_ANSIX12.pas
-JclEDI_ANSIX12_Ext.pas
-JclEDI_UNEDIFACT.pas
-JclEDI_UNEDIFACT_Ext.pas
 JclExprEval.pas
 JclMIDI.pas
 JclPCRE.pas
@@ -19,6 +10,5 @@
 JclStringLists.pas
 JclUnitVersioning.pas
 JclUnitVersioningProviders.pas
-JclValidation.pas
 JclWideStrings.pas
 pcre.pas


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2294] trunk/jcl/install/JclInstall.pas

From: <ou...@us...> - 2008-01-07 16:57:35

Revision: 2294
          http://jcl.svn.sourceforge.net/jcl/?rev=2294&view=rev
Author:   outchy
Date:     2008-01-07 08:57:32 -0800 (Mon, 07 Jan 2008)

Log Message:
-----------
mantis 4309 Uninstallation of the experts does not allow for a smooth transition between versions.

Modified Paths:
--------------
    trunk/jcl/install/JclInstall.pas

Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas	2008-01-05 23:17:58 UTC (rev 2293)
+++ trunk/jcl/install/JclInstall.pas	2008-01-07 16:57:32 UTC (rev 2294)
@@ -23,7 +23,7 @@
 {                                                                                                  }
 {**************************************************************************************************}
 {                                                                                                  }
-{ Last modified: $Date::                                                                         $ }
+{ Last modified: $Date::                                                                        $ }
 { Revision:      $Rev::                                                                          $ }
 { Author:        $Author::                                                                       $ }
 {                                                                                                  }
@@ -170,7 +170,6 @@
     procedure ConfigureBpr2Mak(const PackageFileName: string);
     {$IFDEF MSWINDOWS}
     function CompileExpert(const Name: string): Boolean;
-    function DeleteExpert(const Option: TJclOption): Boolean;
     {$ENDIF MSWINDOWS}
     
     function GetBplPath: string;
@@ -674,15 +673,17 @@
   JclExpertUses           = 'JclUsesExpert';
   JclExpertSimdView       = 'JclSIMDViewExpert';
   JclExpertVersionControl = 'JclVersionControlExpert';
-//  JclExpertBdsExpertDpr   = 'JclBdsExpert';
 
-  ExpertPaths: array[joExperts..joExpertVersionControl] of string =
+  SupportedExperts: array [joExperts..joExpertVersionControl] of string =
     (
       JclExpertBase, '', '', JclExpertDebug, JclExpertAnalyzer,
       JclExpertFavorite, JclExpertRepository, JclExpertThrNames,
       JclExpertUses, JclExpertSimdView, JclExpertVersionControl
-    );            
+    );
 
+  OldExperts: array [0..6] of string =
+    ( 'JclDebugIde', 'ProjectAnalyzer', 'IdeOpenDlgFavorite', 'ThreadNameExpert', 'JediUses', 'JclSIMDView', 'JclVersionControl' );
+
   JclSrcDirWindows  = 'windows';
   JclSrcDirUnix     = 'unix';
   JclSrcDirVcl      = 'vcl';
@@ -1846,7 +1847,7 @@
       // dual packages useless for experts
       if Target.RadToolKind = brBorlandDevStudio then
         TJclBDSInstallation(Target).DualPackageInstallation := False;
-      for Option := Low(ExpertPaths) to High(ExpertPaths) do
+      for Option := Low(SupportedExperts) to High(SupportedExperts) do
         if OptionChecked[Option] then
       begin
         MarkOptionBegin(Option);
@@ -1855,9 +1856,9 @@
         else if Option = joExpertsDLL then
           DLLExperts := OptionChecked[Option]
         else if DLLExperts then
-          Result := CompileExpert(FullLibraryFileName(Target, ExpertPaths[Option]))
+          Result := CompileExpert(FullLibraryFileName(Target, SupportedExperts[Option]))
         else
-          Result := CompilePackage(FullPackageFileName(Target,ExpertPaths[Option]));
+          Result := CompilePackage(FullPackageFileName(Target, SupportedExperts[Option]));
         MarkOptionEnd(Option, Result);
         if not Result then
           Break;
@@ -1880,7 +1881,7 @@
       // dual packages useless for experts
       if ATarget.RadToolKind = brBorlandDevStudio then
         TJclBDSInstallation(ATarget).DualPackageInstallation := False;
-      for Option := Low(ExpertPaths) to High(ExpertPaths) do
+      for Option := Low(SupportedExperts) to High(SupportedExperts) do
         if OptionChecked[Option] then
       begin
         MarkOptionBegin(Option);
@@ -1890,12 +1891,12 @@
           DLLExperts := OptionChecked[Option]
         else if DLLExperts then
         begin
-          ProjectFileName := Distribution.JclPath + FullLibraryFileName(ATarget, ExpertPaths[Option]);
+          ProjectFileName := Distribution.JclPath + FullLibraryFileName(ATarget, SupportedExperts[Option]);
           Result := ATarget.RegisterExpert(ProjectFileName, GetBplPath, PathExtractFileNameNoExt(ProjectFileName));
         end
         else
         begin
-          ProjectFileName := Distribution.JclPath + FullPackageFileName(ATarget,ExpertPaths[Option]);
+          ProjectFileName := Distribution.JclPath + FullPackageFileName(ATarget, SupportedExperts[Option]);
           Result := ATarget.RegisterPackage(ProjectFileName, GetBplPath, PathExtractFileNameNoExt(ProjectFileName));
         end;
         MarkOptionEnd(Option, Result);
@@ -2275,11 +2276,11 @@
       end;
       {$ENDIF KYLIX}
       //ioJclPackages
-      ATarget.UnregisterPackage(Distribution.JclPath + FullPackageFileName(ATarget, JclDpk));
+      ATarget.UnregisterPackage(Distribution.JclPath + FullPackageFileName(ATarget, JclDpk), GetBplPath);
       if RuntimeInstallation and ATarget.SupportsVisualCLX then
-        ATarget.UnregisterPackage(Distribution.JclPath + FullPackageFileName(ATarget, JclVClxDpk));
+        ATarget.UnregisterPackage(Distribution.JclPath + FullPackageFileName(ATarget, JclVClxDpk), GetBplPath);
       if RuntimeInstallation and ATarget.SupportsVCL then
-        ATarget.UnregisterPackage(Distribution.JclPath + FullPackageFileName(ATarget, JclVclDpk));
+        ATarget.UnregisterPackage(Distribution.JclPath + FullPackageFileName(ATarget, JclVclDpk), GetBplPath);
       {$IFDEF MSWINDOWS}
       RemoveJediRegInformation(Target.ConfigDataLocation, 'JCL', ATarget.RootKey);
       {$ENDIF MSWINDOWS}
@@ -2299,26 +2300,65 @@
   end;
   {$IFDEF MSWINDOWS}
   procedure UnregisterExperts(ATarget: TJclBorRADToolInstallation);
+    procedure UnregisterExpert(const Name: string);
+    var
+      Index: Integer;
+      FileName, ShortFileName: string;
+    begin
+      for Index := ATarget.IdePackages.Count - 1 downto 0 do
+      begin
+        FileName := ATarget.IdePackages.PackageFileNames[Index];
+        ShortFileName := ChangeFileExt(ExtractFileName(FileName), '');
+        if StrMatches(Name, ShortFileName)
+          or StrMatches(Format('%s%s', [Name, ATarget.VersionNumberStr]), ShortFileName)
+          or StrMatches(Format('%s%d', [Name, ATarget.VersionNumber]), ShortFileName)
+          or StrMatches(Format('%s%s0', [Name, ATarget.VersionNumberStr]), ShortFileName)
+          or StrMatches(Format('%s%d0', [Name, ATarget.VersionNumber]), ShortFileName) then
+          ATarget.UnregisterPackage(FileName);
+      end;
+      for Index := ATarget.IdePackages.ExpertCount - 1 downto 0 do
+      begin
+        FileName := ATarget.IdePackages.ExpertFileNames[Index];
+        ShortFileName := ChangeFileExt(ExtractFileName(FileName), '');
+        if StrMatches(Name, ShortFileName)
+          or StrMatches(Format('%s%s', [Name, ATarget.VersionNumberStr]), ShortFileName)
+          or StrMatches(Format('%s%d', [Name, ATarget.VersionNumber]), ShortFileName)
+          or StrMatches(Format('%s%s0', [Name, ATarget.VersionNumberStr]), ShortFileName)
+          or StrMatches(Format('%s%d0', [Name, ATarget.VersionNumber]), ShortFileName) then
+          ATarget.UnregisterExpert(FileName);
+      end;
+    end;
   var
     Option: TJclOption;
+    IndexOldExpert: Integer;
   begin
     if CLRVersion = '' then
     begin
-      for Option := Low(ExpertPaths) to High(ExpertPaths) do
+      for Option := Low(SupportedExperts) to High(SupportedExperts) do
         if not (Option in [joExpertsDsgnPackages, joExpertsDLL]) then
-          ATarget.UnregisterExpert(Distribution.JclPath + FullLibraryFileName(ATarget, ExpertPaths[Option]));
+          UnregisterExpert(SupportedExperts[Option]);
+      for IndexOldExpert := Low(OldExperts) to High(OldExperts) do
+        UnregisterExpert(OldExperts[IndexOldExpert]);
     end;
   end;
 
   procedure DeleteExperts;
   var
     Option: TJclOption;
+    ProjectFileName: string;
   begin
     if CLRVersion = '' then
     begin
-      for Option := Low(ExpertPaths) to High(ExpertPaths) do
+      for Option := Low(SupportedExperts) to High(SupportedExperts) do
         if not (Option in [joExpertsDsgnPackages, joExpertsDLL]) then
-          DeleteExpert(Option);
+      begin
+        ProjectFileName := Distribution.JclPath + FullPackageFileName(Target, SupportedExperts[Option]);
+        if FileExists(ProjectFileName) then
+          Target.UninstallPackage(ProjectFileName, GetBplPath, GetDcpPath);
+        ProjectFileName := Distribution.JclPath + FullLibraryFileName(Target, SupportedExperts[Option]);
+        if FileExists(ProjectFileName) then
+          Result := FileDelete(BinaryFileName(GetBplPath, ProjectFileName));
+      end;
     end;
   end;
 
@@ -3038,51 +3078,6 @@
   else
     WriteLog('... failed ' + ProjectFileName);
 end;
-
-function TJclInstallation.DeleteExpert(const Option: TJclOption): Boolean;
-
-  function OldExpertBPLFileName(const BaseName: string): string;
-  const
-    OldExperts: array[joExpertDebug..joExpertVersionControl] of string =
-      (
-        'JclDebugIde%s0.bpl', 'ProjectAnalyzer%s0.bpl',
-        'IdeOpenDlgFavorite%s0.bpl', 'JclRepositoryExpert',
-        'ThreadNameExpert%s0.bpl', 'JediUses%s0.bpl', 'JclSIMDView%s.bpl',
-        'JclVersionControl'
-      );
-
-  var
-    I: TJclOption;
-  begin
-    with Target do
-      for I := Low(OldExperts) to High(OldExperts) do
-        if BaseName = ExpertPaths[I] then
-    begin
-      Result := PathAddSeparator(GetBPLPath) + Format(OldExperts[I], [VersionNumberStr]);
-      Break;
-    end;
-  end;
-
-var
-  BaseName: string;
-  LibraryFileName: string;
-begin
-  Result := False;
-
-  BaseName := ExpertPaths[Option];
-  LibraryFileName := Distribution.JclPath + FullLibraryFileName(Target, BaseName);
-
-  if FileExists(Distribution.JclPath + LibraryFileName) then
-  begin
-    WriteLog(Format('Removing expert %s', [LibraryFileName]));
-    // delete DLL experts
-    Result := FileDelete(BinaryFileName(GetBplPath, LibraryFileName));
-    if Result then
-      WriteLog('...done.')
-    else
-      WriteLog('...failed');
-  end;
-end;
 {$ENDIF MSWINDOWS}
 
 function DemoNameCompare(List: TStringList; Index1, Index2: Integer): Integer;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2293] trunk/jcl/source/common/JclSimpleXml.pas

From: <jfu...@us...> - 2008-01-05 23:18:06

Revision: 2293
          http://jcl.svn.sourceforge.net/jcl/?rev=2293&view=rev
Author:   jfudickar
Date:     2008-01-05 15:17:58 -0800 (Sat, 05 Jan 2008)

Log Message:
-----------
Fixed TJclSimpleXMLElems.Notify when deleting Elems with named elements

Modified Paths:
--------------
    trunk/jcl/source/common/JclSimpleXml.pas

Modified: trunk/jcl/source/common/JclSimpleXml.pas
===================================================================
--- trunk/jcl/source/common/JclSimpleXml.pas	2008-01-05 18:21:29 UTC (rev 2292)
+++ trunk/jcl/source/common/JclSimpleXml.pas	2008-01-05 23:17:58 UTC (rev 2293)
@@ -2146,13 +2146,13 @@
     opRemove:
       if Value.Container = Self then  // Only remove if we have it
       begin
-        FElems.Delete(FElems.IndexOfObject(Value));
         if FNamedElems <> nil then
         begin
           NamedIndex := FNamedElems.IndexOf(Value.Name);
           if NamedIndex >= 0 then
-            TJclSimpleXMLNamedElems(FNamedElems[NamedIndex]).FItems.Remove(Value);
+            TJclSimpleXMLNamedElems(FNamedElems.Objects[NamedIndex]).FItems.Remove(Value);
         end;
+        FElems.Delete(FElems.IndexOfObject(Value));
       end;
     opInsert:
       Value.Container := Self;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2292] trunk/jcl/source/common/JclSimpleXml.pas

From: <jfu...@us...> - 2008-01-05 18:21:31

Revision: 2292
          http://jcl.svn.sourceforge.net/jcl/?rev=2292&view=rev
Author:   jfudickar
Date:     2008-01-05 10:21:29 -0800 (Sat, 05 Jan 2008)

Log Message:
-----------
Enhanced TJclSimpleXMLNamedElems.GetItem to autogenerate new Items

Modified Paths:
--------------
    trunk/jcl/source/common/JclSimpleXml.pas

Modified: trunk/jcl/source/common/JclSimpleXml.pas
===================================================================
--- trunk/jcl/source/common/JclSimpleXml.pas	2008-01-05 17:18:20 UTC (rev 2291)
+++ trunk/jcl/source/common/JclSimpleXml.pas	2008-01-05 18:21:29 UTC (rev 2292)
@@ -1578,7 +1578,21 @@
 
 function TJclSimpleXMLNamedElems.GetItem(const Index: Integer): TJclSimpleXMLElem;
 begin
-  Result := TJclSimpleXMLElem(FItems.Items[Index]);
+  if (Index >= 0) then
+  begin
+    While (Index >= Count) do
+      if Assigned(Elems.Parent) and Assigned(Elems.Parent.SimpleXML) and
+         (sxoAutoCreate in Elems.Parent.SimpleXML.Options) then
+        Add
+      else
+        break;
+    if Index < Count then
+      Result := TJclSimpleXMLElem(FItems.Items[Index])
+    else
+      Result := nil;
+  end
+  else
+    Result := nil;
 end;
 
 function TJclSimpleXMLNamedElems.IndexOf(const Value: TJclSimpleXMLElem): Integer;
@@ -1937,7 +1951,7 @@
     Result := TJclSimpleXMLNamedElems.Create(Self, Name);
     FNamedElems.AddObject(Name, Result);
     if FElems <> nil then
-      for NamedIndex := 0 to FElems.Count - 1 do
+      for NamedIndex := 0 to FElems.Count - 1 do                 
         if FElems.Strings[NamedIndex] = Name then
           Result.FItems.Add(FElems.Objects[NamedIndex]);
   end


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2291] trunk/jcl/experts/common/JclOtaUtils.pas

From: <ou...@us...> - 2008-01-05 17:18:23

Revision: 2291
          http://jcl.svn.sourceforge.net/jcl/?rev=2291&view=rev
Author:   outchy
Date:     2008-01-05 09:18:20 -0800 (Sat, 05 Jan 2008)

Log Message:
-----------
fix some suspicious warnings about arrays not initialized.

Modified Paths:
--------------
    trunk/jcl/experts/common/JclOtaUtils.pas

Modified: trunk/jcl/experts/common/JclOtaUtils.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaUtils.pas	2008-01-04 09:06:08 UTC (rev 2290)
+++ trunk/jcl/experts/common/JclOtaUtils.pas	2008-01-05 17:18:20 UTC (rev 2291)
@@ -488,6 +488,7 @@
 begin
   PropCount := Length(PropIDs);
   SetLength(Result, PropCount);
+  SetLength(PropLocations, 0);
   for FileIndex := 0 to AProject.GetModuleFileCount - 1 do
   begin
     AEditor := AProject.GetModuleFileEditor(FileIndex);
@@ -543,6 +544,7 @@
       ASourceEditor := AEditor as IOTASourceEditor;
       for PropIndex := 0 to PropCount - 1 do
       begin
+        SetLength(PropLocations, 0);
         PropSize := 0;
         AReader := ASourceEditor.CreateReader;
         try


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2290] trunk/jcl/source/common/JclSimpleXml.pas

From: <ou...@us...> - 2008-01-04 09:06:11

Revision: 2290
          http://jcl.svn.sourceforge.net/jcl/?rev=2290&view=rev
Author:   outchy
Date:     2008-01-04 01:06:08 -0800 (Fri, 04 Jan 2008)

Log Message:
-----------
new feature for TJclSimpleXML: filter for child items based on their name.
style cleanup: removing useless "var" keywords and fixing parameter declaration of function IndexOf.

Modified Paths:
--------------
    trunk/jcl/source/common/JclSimpleXml.pas

Modified: trunk/jcl/source/common/JclSimpleXml.pas
===================================================================
--- trunk/jcl/source/common/JclSimpleXml.pas	2007-12-30 16:50:19 UTC (rev 2289)
+++ trunk/jcl/source/common/JclSimpleXml.pas	2008-01-04 09:06:08 UTC (rev 2290)
@@ -169,7 +169,7 @@
   protected
     function GetSimpleXML: TJclSimpleXML;
     function GetItem(const Index: Integer): TJclSimpleXMLProp;
-    procedure DoItemRename(var Value: TJclSimpleXMLProp; const Name: string);
+    procedure DoItemRename(Value: TJclSimpleXMLProp; const Name: string);
     procedure Error(const S: string);
     procedure FmtError(const S: string; const Args: array of const);
   public
@@ -225,6 +225,39 @@
     property Version: string read GetVersion write SetVersion;
   end;
 
+  TJclSimpleXMLNamedElems = class(TObject)
+  private
+    FElems: TJclSimpleXMLElems;
+    FName: string;
+    function GetCount: Integer;
+  protected
+    FItems: TList;
+    function GetItem(const Index: Integer): TJclSimpleXMLElem;
+  public
+    constructor Create(const AOwner: TJClSimpleXMLElems; const AName: string);
+    destructor Destroy; override;
+
+    function Add: TJclSimpleXmlElemClassic; overload;
+    function Add(const Value: string): TJclSimpleXmlElemClassic; overload;
+    function Add(const Value: Int64): TJclSimpleXmlElemClassic; overload;
+    function Add(const Value: Boolean): TJclSimpleXmlElemClassic; overload;
+    function Add(const Value: TStream): TJclSimpleXmlElemClassic; overload;
+    function AddFirst: TJclSimpleXmlElemClassic;
+    function AddComment(const Value: string): TJclSimpleXMLElemComment;
+    function AddCData(const Value: string): TJclSimpleXMLElemCData;
+    function AddText(const Value: string): TJclSimpleXMLElemText;
+    procedure Clear; virtual;
+    procedure Delete(const Index: Integer);
+    procedure Move(const CurIndex, NewIndex: Integer);
+    function IndexOf(const Value: TJclSimpleXMLElem): Integer; overload;
+    function IndexOf(const Value: string): Integer; overload;
+
+    property Elems: TJclSimpleXMLElems read FElems;
+    property Item[const Index: Integer]: TJclSimpleXMLElem read GetItem; default;
+    property Count: Integer read GetCount;
+    property Name: string read FName;
+  end;
+
   TJclSimpleXMLElemCompare = function(Elems: TJclSimpleXMLElems; Index1, Index2: Integer): Integer of object;
   TJclSimpleXMLElems = class(TObject)
   private
@@ -232,14 +265,16 @@
     function GetCount: Integer;
     function GetItemNamedDefault(const Name, Default: string): TJclSimpleXMLElem;
     function GetItemNamed(const Name: string): TJclSimpleXMLElem;
+    function GetNamedElems(const Name: string): TJclSimpleXMLNamedElems;
   protected
     FElems: THashedStringList;
     FCompare: TJclSimpleXMLElemCompare;
+    FNamedElems: THashedStringList;
     function GetItem(const Index: Integer): TJclSimpleXMLElem;
     procedure AddChild(const Value: TJclSimpleXMLElem);
     procedure AddChildFirst(const Value: TJclSimpleXMLElem);
     procedure InsertChild(const Value: TJclSimpleXMLElem; Index: Integer);
-    procedure DoItemRename(var Value: TJclSimpleXMLElem; const Name: string);
+    procedure DoItemRename(Value: TJclSimpleXMLElem; const Name: string);
     procedure CreateElems;
   public
     constructor Create(const AOwner: TJclSimpleXMLElem);
@@ -268,9 +303,10 @@
     procedure Clear; virtual;
     procedure Delete(const Index: Integer); overload;
     procedure Delete(const Name: string); overload;
+    function Remove(Value: TJclSimpleXMLElem): Integer;
     procedure Move(const CurIndex, NewIndex: Integer);
     function IndexOf(const Value: TJclSimpleXMLElem): Integer; overload;
-    function IndexOf(const Value: string): Integer; overload;
+    function IndexOf(const Name: string): Integer; overload;
     function Value(const Name: string; Default: string = ''): string;
     function IntValue(const Name: string; Default: Int64 = -1): Int64;
     function BoolValue(const Name: string; Default: Boolean = True): Boolean;
@@ -283,6 +319,7 @@
     property Item[const Index: Integer]: TJclSimpleXMLElem read GetItem; default;
     property ItemNamed[const Name: string]: TJclSimpleXMLElem read GetItemNamed;
     property Count: Integer read GetCount;
+    property NamedElems[const Name: string]: TJclSimpleXMLNamedElems read GetNamedElems;
   end;
 
   {$M+}
@@ -324,6 +361,7 @@
     procedure GetBinaryValue(const Stream: TStream);
     property Data: {$IFDEF CLR} TObject {$ELSE} Pointer {$ENDIF} read FData write FData;
     function GetChildIndex(const AChild: TJclSimpleXMLElem): Integer;
+    function GetNamedIndex(const AChild: TJclSimpleXMLElem): Integer;
 
     property SimpleXML: TJclSimpleXML read GetSimpleXML;
     property Container: TJclSimpleXMLElems read FContainer write FContainer;
@@ -1388,6 +1426,11 @@
   Result := FItems;
 end;
 
+function TJclSimpleXMLElem.GetNamedIndex(const AChild: TJclSimpleXMLElem): Integer;
+begin
+  Result := Items.NamedElems[AChild.Name].IndexOf(AChild);
+end;
+
 function TJclSimpleXMLElem.GetProps: TJclSimpleXMLProps;
 begin
   if FProps = nil then
@@ -1453,6 +1496,125 @@
   end;
 end;
 
+//=== { TJclSimpleXMLNamedElems } ============================================
+
+constructor TJclSimpleXMLNamedElems.Create(const AOwner: TJClSimpleXMLElems; const AName: string);
+begin
+  inherited Create;
+  FElems := AOwner;
+  FName := AName;
+  FItems := TList.Create;
+end;
+
+destructor TJclSimpleXMLNamedElems.Destroy;
+begin
+  FItems.Free;
+  inherited Destroy;
+end;
+
+function TJclSimpleXMLNamedElems.Add(const Value: Int64): TJclSimpleXmlElemClassic;
+begin
+  Result := Elems.Add(Name, Value);
+end;
+
+function TJclSimpleXMLNamedElems.Add(const Value: TStream): TJclSimpleXmlElemClassic;
+begin
+  Result := Elems.Add(Name, Value);
+end;
+
+function TJclSimpleXMLNamedElems.Add(const Value: Boolean): TJclSimpleXmlElemClassic;
+begin
+  Result := Elems.Add(Name, Value);
+end;
+
+function TJclSimpleXMLNamedElems.Add: TJclSimpleXmlElemClassic;
+begin
+  Result := Elems.Add(Name);
+end;
+
+function TJclSimpleXMLNamedElems.Add(const Value: string): TJclSimpleXmlElemClassic;
+begin
+  Result := Elems.Add(Name, Value);
+end;
+
+function TJclSimpleXMLNamedElems.AddCData(const Value: string): TJclSimpleXMLElemCData;
+begin
+  Result := Elems.AddCData(Name, Value);
+end;
+
+function TJclSimpleXMLNamedElems.AddComment(const Value: string): TJclSimpleXMLElemComment;
+begin
+  Result := Elems.AddComment(Name, Value);
+end;
+
+function TJclSimpleXMLNamedElems.AddFirst: TJclSimpleXmlElemClassic;
+begin
+  Result := Elems.AddFirst(Name);
+end;
+
+function TJclSimpleXMLNamedElems.AddText(const Value: string): TJclSimpleXMLElemText;
+begin
+  Result := Elems.AddText(Name, Value);
+end;
+
+procedure TJclSimpleXMLNamedElems.Clear;
+var
+  Index: Integer;
+begin
+  for Index := FItems.Count - 1 downto 0 do
+    Elems.Remove(TJclSimpleXMLElem(FItems.Items[Index]));
+end;
+
+procedure TJclSimpleXMLNamedElems.Delete(const Index: Integer);
+begin
+  if (Index >= 0) and (Index < FItems.Count) then
+    Elems.Remove(TJclSimpleXMLElem(FItems.Items[Index]));
+end;
+
+function TJclSimpleXMLNamedElems.GetCount: Integer;
+begin
+  Result := FItems.Count;
+end;
+
+function TJclSimpleXMLNamedElems.GetItem(const Index: Integer): TJclSimpleXMLElem;
+begin
+  Result := TJclSimpleXMLElem(FItems.Items[Index]);
+end;
+
+function TJclSimpleXMLNamedElems.IndexOf(const Value: TJclSimpleXMLElem): Integer;
+begin
+  Result := FItems.IndexOf(Value);
+end;
+
+function TJclSimpleXMLNamedElems.IndexOf(const Value: string): Integer;
+var
+  Index: Integer;
+  NewItem: TJclSimpleXMLElem;
+begin
+  Result := -1;
+  for Index := 0 to FItems.Count - 1 do
+    if TJclSimpleXMLElem(FItems.Items[Index]).Value = Value then
+  begin
+    Result := Index;
+    Break;
+  end;
+  if (Result = -1) and (sxoAutoCreate in Elems.Parent.SimpleXML.Options) then
+  begin
+    NewItem := Elems.Add(Name, Value);
+    Result := FItems.IndexOf(NewItem);
+  end;
+end;
+
+procedure TJclSimpleXMLNamedElems.Move(const CurIndex, NewIndex: Integer);
+var
+  ElemsCurIndex, ElemsNewIndex: Integer;
+begin
+  ElemsCurIndex := Elems.IndexOf(TJclSimpleXMLElem(FItems.Items[CurIndex]));
+  ElemsNewIndex := Elems.IndexOf(TJclSimpleXMLElem(FItems.Items[NewIndex]));
+  Elems.Move(ElemsCurIndex, ElemsNewIndex);
+  FItems.Move(CurIndex, NewIndex);
+end;
+
 //=== { TJclSimpleXMLElems } =================================================
 
 function TJclSimpleXMLElems.Add(const Name: string): TJclSimpleXMLElemClassic;
@@ -1465,14 +1627,17 @@
 function TJclSimpleXMLElems.Add(const Name, Value: string): TJclSimpleXMLElemClassic;
 begin
   Result := TJclSimpleXMLElemClassic.Create(Parent);
-  Result.Name := Name;
+  Result.FName := Name;
   Result.Value := Value;
   AddChild(Result);
 end;
 
 function TJclSimpleXMLElems.Add(const Name: string; const Value: Int64): TJclSimpleXMLElemClassic;
 begin
-  Result := Add(Name, IntToStr(Value));
+  Result := TJclSimpleXMLElemClassic.Create(Parent);
+  Result.FName := Name;
+  Result.Value := IntToStr(Value);
+  AddChild(Result);
 end;
 
 function TJclSimpleXMLElems.Add(Value: TJclSimpleXMLElem): TJclSimpleXMLElem;
@@ -1485,7 +1650,10 @@
 function TJclSimpleXMLElems.Add(const Name: string;
   const Value: Boolean): TJclSimpleXMLElemClassic;
 begin
-  Result := Add(Name, BoolToStr(Value));
+  Result := TJclSimpleXMLElemClassic.Create(Parent);
+  Result.FName := Name;
+  Result.Value := BoolToStr(Value);
+  AddChild(Result);
 end;
 
 function TJclSimpleXMLElems.Add(const Name: string;
@@ -1497,18 +1665,26 @@
   I, Count: Integer;
 begin
   Stream := TStringStream.Create('');
-  repeat
-    Count := Value.Read(Buf, Length(Buf));
-    St := '';
-    for I := 0 to Count - 1 do
-      St := St + IntToHex(Buf[I], 2);
-    Stream.WriteString(St);
-  until Count = 0;
-  Result := Add(Name, Stream.DataString);
-  Stream.Free;
+  try
+    repeat
+      Count := Value.Read(Buf, Length(Buf));
+      St := '';
+      for I := 0 to Count - 1 do
+        St := St + IntToHex(Buf[I], 2);
+      Stream.WriteString(St);
+    until Count = 0;
+    Result := TJclSimpleXMLElemClassic.Create(Parent);
+    Result.FName := Name;
+    Result.Value := Stream.DataString;
+    AddChild(Result);
+  finally
+    Stream.Free;
+  end;
 end;
 
 procedure TJclSimpleXMLElems.AddChild(const Value: TJclSimpleXMLElem);
+var
+  NamedIndex: Integer;
 begin
   CreateElems;
 
@@ -1521,10 +1697,19 @@
 
   FElems.AddObject(Value.Name, Value);
 
+  if FNamedElems <> nil then
+  begin
+    NamedIndex := FNamedElems.IndexOf(Value.Name);
+    if NamedIndex >= 0 then
+      TJclSimpleXMLNamedElems(FNamedElems.Objects[NamedIndex]).FItems.Add(Value);
+  end;
+
   Notify(Value, opInsert);
 end;
 
 procedure TJclSimpleXMLElems.AddChildFirst(const Value: TJclSimpleXMLElem);
+var
+  NamedIndex: Integer;
 begin
   CreateElems;
 
@@ -1537,6 +1722,13 @@
 
   FElems.InsertObject(0, Value.Name, Value);
 
+  if FNamedElems <> nil then
+  begin
+    NamedIndex := FNamedElems.IndexOf(Value.Name);
+    if NamedIndex >= 0 then
+      TJclSimpleXMLNamedElems(FNamedElems.Objects[NamedIndex]).FItems.Insert(0, Value);
+  end;
+
   Notify(Value, opInsert);
 end;
 
@@ -1618,6 +1810,15 @@
     end;
     FElems.Clear;
   end;
+  if FNamedElems <> nil then
+  begin
+    for I := 0 to FNamedElems.Count - 1 do
+    begin
+      FNamedElems.Objects[I].Free;
+      FNamedElems.Objects[I] := nil;
+    end;
+    FNamedElems.Clear;
+  end;
 end;
 
 constructor TJclSimpleXMLElems.Create(const AOwner: TJclSimpleXMLElem);
@@ -1626,21 +1827,30 @@
   FParent := AOwner;
 end;
 
+procedure TJclSimpleXMLElems.CreateElems;
+begin
+  if FElems = nil then
+    FElems := THashedStringList.Create;
+end;
+
 procedure TJclSimpleXMLElems.Delete(const Index: Integer);
+var
+  Elem: TJclSimpleXMLElem;
+  NamedIndex: Integer;
 begin
   if (FElems <> nil) and (Index >= 0) and (Index < FElems.Count) then
   begin
-    TObject(FElems.Objects[Index]).Free;
+    Elem := TJclSimpleXMLElem(FElems.Objects[Index]);
+    if FNamedElems <> nil then
+    begin
+      NamedIndex := FNamedElems.IndexOf(Elem.Name);
+      if NamedIndex >= 0 then
+        TJclSimpleXMLNamedElems(FNamedElems.Objects[NamedIndex]).FItems.Remove(Elem);
+    end;
     FElems.Delete(Index);
   end;
 end;
 
-procedure TJclSimpleXMLElems.CreateElems;
-begin
-  if FElems = nil then
-    FElems := THashedStringList.Create;
-end;
-
 procedure TJclSimpleXMLElems.Delete(const Name: string);
 begin
   if FElems <> nil then
@@ -1652,17 +1862,32 @@
   FParent := nil;
   Clear;
   FreeAndNil(FElems);
+  FreeAndNil(FNamedElems);
   inherited Destroy;
 end;
 
-procedure TJclSimpleXMLElems.DoItemRename(var Value: TJclSimpleXMLElem;
-  const Name: string);
+procedure TJclSimpleXMLElems.DoItemRename(Value: TJclSimpleXMLElem; const Name: string);
 var
   I: Integer;
+  NamedIndex: Integer;
 begin
+  if FNamedElems <> nil then
+  begin
+    NamedIndex := FNamedElems.IndexOf(Value.Name);
+    if NamedIndex >= 0 then
+      TJclSimpleXMLNamedElems(FNamedElems.Objects[NamedIndex]).FItems.Remove(Value);
+  end;
+
   I := FElems.IndexOfObject(Value);
   if I <> -1 then
-    FElems[I] := Name;
+    FElems.Strings[I] := Name;
+
+  if FNamedElems <> nil then
+  begin
+    NamedIndex := FNamedElems.IndexOf(Name);
+    if NamedIndex >= 0 then
+      TJclSimpleXMLNamedElems(FNamedElems.Objects[NamedIndex]).FItems.Add(Value);
+  end;
 end;
 
 function TJclSimpleXMLElems.GetCount: Integer;
@@ -1700,6 +1925,26 @@
     Result := Add(Name, Default);
 end;
 
+function TJclSimpleXMLElems.GetNamedElems(const Name: string): TJclSimpleXMLNamedElems;
+var
+  NamedIndex: Integer;
+begin
+  if FNamedElems = nil then
+    FNamedElems := THashedStringList.Create;
+  NamedIndex := FNamedElems.IndexOf(Name);
+  if NamedIndex = -1 then
+  begin
+    Result := TJclSimpleXMLNamedElems.Create(Self, Name);
+    FNamedElems.AddObject(Name, Result);
+    if FElems <> nil then
+      for NamedIndex := 0 to FElems.Count - 1 do
+        if FElems.Strings[NamedIndex] = Name then
+          Result.FItems.Add(FElems.Objects[NamedIndex]);
+  end
+  else
+    Result := TJclSimpleXMLNamedElems(FNamedElems.Objects[NamedIndex]);
+end;
+
 function TJclSimpleXMLElems.GetItemNamed(const Name: string): TJclSimpleXMLElem;
 begin
   Result := GetItemNamedDefault(Name, '');
@@ -1880,16 +2125,32 @@
 
 procedure TJclSimpleXMLElems.Notify(Value: TJclSimpleXMLElem;
   Operation: TOperation);
+var
+  NamedIndex: Integer;
 begin
   case Operation of
     opRemove:
       if Value.Container = Self then  // Only remove if we have it
+      begin
         FElems.Delete(FElems.IndexOfObject(Value));
+        if FNamedElems <> nil then
+        begin
+          NamedIndex := FNamedElems.IndexOf(Value.Name);
+          if NamedIndex >= 0 then
+            TJclSimpleXMLNamedElems(FNamedElems[NamedIndex]).FItems.Remove(Value);
+        end;
+      end;
     opInsert:
       Value.Container := Self;
   end;
 end;
 
+function TJclSimpleXMLElems.Remove(Value: TJclSimpleXMLElem): Integer;
+begin
+  Result := FElems.IndexOfObject(Value);
+  Notify(Value, opRemove);
+end;
+
 procedure TJclSimpleXMLElems.SaveToStream(const Stream: TStream;
   const Level: string; AParent: TJclSimpleXML);
 var
@@ -1925,15 +2186,17 @@
     Result := FElems.IndexOfObject(Value);
 end;
 
-function TJclSimpleXMLElems.IndexOf(const Value: string): Integer;
+function TJclSimpleXMLElems.IndexOf(const Name: string): Integer;
 begin
   if FElems = nil then
     Result := -1
   else
-    Result := FElems.IndexOf(Value);
+    Result := FElems.IndexOf(Name);
 end;
 
 procedure TJclSimpleXMLElems.InsertChild(const Value: TJclSimpleXMLElem; Index: Integer);
+var
+  NamedIndex: Integer;
 begin
   CreateElems;
 
@@ -1946,6 +2209,13 @@
 
   FElems.InsertObject(Index, Value.Name, Value);
 
+  if FNamedElems <> nil then
+  begin
+    NamedIndex := FNamedElems.IndexOf(Value.Name);
+    if NamedIndex >= 0 then
+      TJclSimpleXMLNamedElems(FNamedElems.Objects[NamedIndex]).FItems.Add(Value);
+  end;
+
   Notify(Value, opInsert);
 end;
 
@@ -2104,8 +2374,7 @@
   inherited Destroy;
 end;
 
-procedure TJclSimpleXMLProps.DoItemRename(var Value: TJclSimpleXMLProp;
-  const Name: string);
+procedure TJclSimpleXMLProps.DoItemRename(Value: TJclSimpleXMLProp; const Name: string);
 var
   I: Integer;
 begin


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2289] trunk/jcl/experts/versioncontrol/VersionControlImpl .pas

From: <ou...@us...> - 2007-12-30 16:50:20

Revision: 2289
          http://jcl.svn.sourceforge.net/jcl/?rev=2289&view=rev
Author:   outchy
Date:     2007-12-30 08:50:19 -0800 (Sun, 30 Dec 2007)

Log Message:
-----------
reworked ownership of menu items.

Modified Paths:
--------------
    trunk/jcl/experts/versioncontrol/VersionControlImpl.pas

Modified: trunk/jcl/experts/versioncontrol/VersionControlImpl.pas
===================================================================
--- trunk/jcl/experts/versioncontrol/VersionControlImpl.pas	2007-12-30 13:55:38 UTC (rev 2288)
+++ trunk/jcl/experts/versioncontrol/VersionControlImpl.pas	2007-12-30 16:50:19 UTC (rev 2289)
@@ -21,7 +21,7 @@
 {                                                                                                  }
 {**************************************************************************************************}
 {                                                                                                  }
-{ Last modified: $Date::                                                                        $ }
+{ Last modified: $Date::                                                                       $ }
 { Revision:      $Rev::                                                                          $ }
 { Author:        $Author::                                                                       $ }
 {                                                                                                  }
@@ -186,7 +186,6 @@
     procedure IDEVersionCtrlMenuClick(Sender: TObject);
     procedure RefreshIcons;
     procedure RefreshMenu;
-    procedure CleanSubMenus(const AMenuItem: TMenuItem);
     function GetCurrentCache: TJclVersionControlCache;
     function GetCurrentPlugin: TJclVersionControlPlugin;
     function GetCurrentFileName: string;
@@ -1106,20 +1105,6 @@
   end;
 end;
 
-procedure TJclVersionControlExpert.CleanSubMenus(const AMenuItem: TMenuItem);
-var
-  Index: Integer;
-  BMenuItem: TMenuItem;
-begin
-  if Assigned(AMenuItem) then
-    for Index := AMenuItem.Count - 1 downto 0 do
-  begin
-    BMenuItem := AMenuItem.Items[Index];
-    CleanSubMenus(BMenuItem);
-    BMenuItem.Free;
-  end;
-end;
-
 procedure TJclVersionControlExpert.ConfigurationClosed(AControl: TControl;
   SaveChanges: Boolean);
 begin
@@ -1199,7 +1184,7 @@
     APopupMenu := Sender as TPopupMenu;
     AControlAction := TJclVersionControlAction(APopupMenu.Tag);
 
-    CleanSubMenus(APopupMenu.Items);
+    APopupMenu.Items.Clear;
 
     if VersionControlActionInfos[AControlAction].AllPlugins then
     begin
@@ -1211,7 +1196,7 @@
         for IndexSandbox := 0 to AFileCache.SandBoxCount - 1 do
           if AControlAction in AFileCache.SandBoxActions[IndexSandbox] then
         begin
-          AMenuItem := TMenuItem.Create(nil);
+          AMenuItem := TMenuItem.Create(APopupMenu.Items);
           AMenuItem.Caption := Format('%s | %s', [AFileCache.Plugin.Name, AFileCache.SandBoxes[IndexSandbox]]);
           AMenuItem.Tag := APopupMenu.Tag;
           AMenuItem.OnClick := SubItemClick;
@@ -1227,7 +1212,7 @@
         for IndexSandbox := 0 to AFileCache.SandBoxCount - 1 do
           if AControlAction in AFileCache.SandBoxActions[IndexSandbox] then
       begin
-        AMenuItem := TMenuItem.Create(nil);
+        AMenuItem := TMenuItem.Create(APopupMenu.Items);
         AMenuItem.Caption := AFileCache.SandBoxes[IndexSandbox];
         AMenuItem.Tag := APopupMenu.Tag;
         AMenuItem.OnClick := SubItemClick;
@@ -1366,7 +1351,7 @@
         for IndexSandbox := 0 to AFileCache.SandBoxCount - 1 do
           if AControlAction in AFileCache.SandBoxActions[IndexSandbox] then
         begin
-          SubMenuItem := TMenuItem.Create(nil);
+          SubMenuItem := TMenuItem.Create(AMenuItem);
           SubMenuItem.Caption := Format('%s | %s', [AFileCache.Plugin.Name, AFileCache.SandBoxes[IndexSandbox]]);
           SubMenuItem.Tag := Integer(AControlAction);
           SubMenuItem.OnClick := SubItemClick;
@@ -1383,7 +1368,7 @@
         for IndexSandbox := 0 to AFileCache.SandBoxCount - 1 do
           if AControlAction in AFileCache.SandBoxActions[IndexSandbox] then
       begin
-        SubMenuItem := TMenuItem.Create(nil);
+        SubMenuItem := TMenuItem.Create(AMenuItem);
         SubMenuItem.Caption := AFileCache.SandBoxes[IndexSandbox];
         SubMenuItem.Tag := Integer(AControlAction);
         SubMenuItem.OnClick := SubItemClick;
@@ -1600,7 +1585,7 @@
   Item, ItemName: string;
   AAction: TCustomAction;
 begin
-  CleanSubMenus(FVersionCtrlMenu);
+  FVersionCtrlMenu.Clear;
 
   if FMenuOrganization.Count > 0 then
   try
@@ -1627,14 +1612,14 @@
 
       if (ActionIndex = -1) or (ItemName = '-') then
       begin
-        SubMenuItem := TMenuItem.Create(nil);
+        SubMenuItem := TMenuItem.Create(FVersionCtrlMenu);
         SubMenuItem.Caption := ItemName;
         SubMenuItem.Tag := -1;
         FVersionCtrlMenu.Add(SubMenuItem);
       end
       else
       begin
-        ActionMenuItem := TMenuItem.Create(nil);
+        ActionMenuItem := TMenuItem.Create(FVersionCtrlMenu);
         AAction := FActions[TJclVersionControlAction(ActionIndex)];
         if VersionControlActionInfos[TJclVersionControlAction(ActionIndex)].Sandbox then
         begin
@@ -1645,7 +1630,7 @@
           ActionMenuItem.OnClick := IDEActionMenuClick;
 
           // to always have the arrow in the parent menu item
-          DummyMenuItem := TMenuItem.Create(nil);
+          DummyMenuItem := TMenuItem.Create(ActionMenuItem);
           DummyMenuItem.Visible := False;
           DummyMenuItem.Tag := -2;
           ActionMenuItem.Add(DummyMenuItem);
@@ -1662,12 +1647,12 @@
         Abort;
       if (ActionIndex = -1) or (ItemName = '-') then
       begin
-        ActionMenuItem := TMenuItem.Create(nil);
+        ActionMenuItem := TMenuItem.Create(FVersionCtrlMenu);
         ActionMenuItem.Caption := ItemName;
       end
       else
       begin
-        ActionMenuItem := TMenuItem.Create(nil);
+        ActionMenuItem := TMenuItem.Create(FVersionCtrlMenu);
         AAction := FActions[TJclVersionControlAction(ActionIndex)];
         if VersionControlActionInfos[TJclVersionControlAction(ActionIndex)].Sandbox then
         begin
@@ -1678,7 +1663,7 @@
           ActionMenuItem.OnClick := IDEActionMenuClick;
 
           // to always have the arrow in the parent menu item
-          DummyMenuItem := TMenuItem.Create(nil);
+          DummyMenuItem := TMenuItem.Create(ActionMenuItem);
           DummyMenuItem.Visible := False;
           DummyMenuItem.Tag := -2;
           ActionMenuItem.Add(DummyMenuItem);
@@ -1904,16 +1889,15 @@
       ADropDownAction := TDropDownAction(FActions[ControlAction]);
       if Assigned(ADropDownAction.DropDownMenu) then
       begin
-        CleanSubMenus(ADropDownAction.DropDownMenu.Items);
+        ADropDownAction.DropDownMenu.Items.Clear;
         ADropDownAction.DropDownMenu.Free;
         ADropDownAction.DropDownMenu := nil;
       end;
     end;
     FreeAndNil(FActions[ControlAction]);
   end;
-  CleanSubMenus(FVersionCtrlMenu);
+  FVersionCtrlMenu.Clear;
   FreeAndNil(FVersionCtrlMenu);
-  FVersionCtrlMenu := nil;
 end;
 
 //=== TJclVersionControlPlugin ===============================================


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[Jcl-checkins-diff] SF.net SVN: jcl: [2288] trunk/jcl/experts

From: <ou...@us...> - 2007-12-30 13:55:40

Revision: 2288
          http://jcl.svn.sourceforge.net/jcl/?rev=2288&view=rev
Author:   outchy
Date:     2007-12-30 05:55:38 -0800 (Sun, 30 Dec 2007)

Log Message:
-----------
minor style cleaning: removing some with...begin...end blocks.
added option to hide units imported from other packages.
changed binary statistics to represent ICODE data.

Modified Paths:
--------------
    trunk/jcl/experts/common/JclOtaConsts.pas
    trunk/jcl/experts/common/JclOtaResources.pas
    trunk/jcl/experts/projectanalyzer/ProjAnalyzerFrm.dfm
    trunk/jcl/experts/projectanalyzer/ProjAnalyzerFrm.pas

Modified: trunk/jcl/experts/common/JclOtaConsts.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaConsts.pas	2007-12-30 13:17:56 UTC (rev 2287)
+++ trunk/jcl/experts/common/JclOtaConsts.pas	2007-12-30 13:55:38 UTC (rev 2288)
@@ -123,6 +123,7 @@
   //=== Project analyser =====================================================
   JclProjectAnalyzerExpertName = 'JclProjectAnalyzerExpert';
   AnalyzerViewName             = 'AnalyzerView';
+  AnalyzerShowPackagesName     = 'ShowPackages';
   JclProjectAnalyzeActionName  = 'JCLProjectAnalyseCommand';
   JclProjectAnalyzeMenuName    = 'JCLProjectAnalyseMenu';
 

Modified: trunk/jcl/experts/common/JclOtaResources.pas
===================================================================
--- trunk/jcl/experts/common/JclOtaResources.pas	2007-12-30 13:17:56 UTC (rev 2287)
+++ trunk/jcl/experts/common/JclOtaResources.pas	2007-12-30 13:55:38 UTC (rev 2288)
@@ -20,7 +20,7 @@
 {                                                                                                  }
 {**************************************************************************************************}
 {                                                                                                  }
-{ Last modified: $Date::                                                                       $ }
+{ Last modified: $Date::                                                                      $ }
 { Revision:      $Rev::                                                                          $ }
 { Author:        $Author::                                                                       $ }
 {                                                                                                  }
@@ -201,8 +201,8 @@
 //=== ProjAnalyzerFrm.pas ====================================================
 resourcestring
   RsFormCaption = 'Project Analyzer - %s';
-  RsStatusText = 'Units: %d, Forms: %d, Code: %d, Data: %d, Bss: %d, Resources: %d';
-  RsCodeData = '(CODE+DATA)';
+  RsStatusText = 'Units: %d, Forms: %d, Code: %d, ICode: %d, Data: %d, Bss: %d, Resources: %d';
+  RsCodeData = '(CODE+ICODE+DATA)';
 
 //=== JclUsesWizard.pas ======================================================
 resourcestring

Modified: trunk/jcl/experts/projectanalyzer/ProjAnalyzerFrm.dfm
===================================================================
--- trunk/jcl/experts/projectanalyzer/ProjAnalyzerFrm.dfm	2007-12-30 13:17:56 UTC (rev 2287)
+++ trunk/jcl/experts/projectanalyzer/ProjAnalyzerFrm.dfm	2007-12-30 13:55:38 UTC (rev 2288)
@@ -5,7 +5,7 @@
   BorderStyle = bsSizeToolWin
   Caption = 'Project Analyzer'
   ClientHeight = 456
-  ClientWidth = 402
+  ClientWidth = 536
   Color = clBtnFace
   Constraints.MinHeight = 250
   Constraints.MinWidth = 290
@@ -23,7 +23,7 @@
   object UnitListView: TListView
     Left = 0
     Top = 40
-    Width = 402
+    Width = 536
     Height = 397
     Align = alClient
     Columns = <
@@ -57,11 +57,11 @@
   object ToolBarMain: TToolBar
     Left = 0
     Top = 0
-    Width = 402
+    Width = 536
     Height = 40
     AutoSize = True
     ButtonHeight = 36
-    ButtonWidth = 50
+    ButtonWidth = 84
     Caption = 'ToolBarMain'
     EdgeBorders = [ebTop, ebBottom]
     Images = ExplorerItemImages
@@ -75,43 +75,56 @@
       Action = ActionCopy
     end
     object ToolButtonSave: TToolButton
-      Left = 54
+      Left = 88
       Top = 0
       Action = ActionSave
     end
-    object ToolButtonSeparator: TToolButton
-      Left = 104
+    object ToolButtonSeparator1: TToolButton
+      Left = 172
       Top = 0
       Width = 8
       ImageIndex = 3
       Style = tbsSeparator
     end
     object ToolButtonDetails: TToolButton
-      Left = 112
+      Left = 180
       Top = 0
       Action = ActionShowDetails
       Grouped = True
       Style = tbsCheck
     end
     object ToolButtonSummary: TToolButton
-      Left = 162
+      Left = 264
       Top = 0
       Action = ActionShowSummary
       Grouped = True
       Style = tbsCheck
     end
     object ToolButtonDfms: TToolButton
-      Left = 212
+      Left = 348
       Top = 0
       Action = ActionShowDfms
       Grouped = True
       Style = tbsCheck
     end
+    object ToolButtonSeparator2: TToolButton
+      Left = 432
+      Top = 0
+      Width = 8
+      Caption = 'ToolButtonSeparator2'
+      ImageIndex = 18
+      Style = tbsSeparator
+    end
+    object ToolButtonShowPackages: TToolButton
+      Left = 440
+      Top = 0
+      Action = ActionShowPackages
+    end
   end
   object StatusBarMain: TStatusBar
     Left = 0
     Top = 437
-    Width = 402
+    Width = 536
     Height = 19
     Panels = <
       item
@@ -122,131 +135,134 @@
     Left = 8
     Top = 392
     Bitmap = {
-      494C010112001300040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
+      494C010113001400040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
       0000000000003600000028000000400000005000000001002000000000000050
       0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000000000007F7F7F000000
       00007F7F7F007F7F7F0000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      000000000000000000000000000000000000FFFF000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000BFBFBF000000
       0000BFBFBF00BFBFBF0000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000FFFF0000FFFFFF00FFFF0000FFFF0000FF0000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000BFBFBF00BFBF
       BF00BFBFBF00BFBFBF00000000000000000000000000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00000000000000000000000000000000000000
+      0000FFFFFF000000FF00FFFFFF00FFFFFF00FFFF0000FFFF0000FFFF00000000
+      FF00FFFF00000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000FFFFFF00000000000000
       0000FFFFFF000000000000000000FFFFFF00000000000000000000000000FFFF
-      FF000000000000000000FFFFFF00000000000000000000000000000000000000
+      FF000000000000000000FFFFFF0000000000000000000000000000000000FFFF
+      FF00FFFF00000000FF00FFFF0000FFFFFF00FFFF0000FFFF0000FF0000000000
+      FF00FF000000FFFF000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00000000000000000000000000000000000000
+      FF00FFFFFF00FFFFFF00FFFFFF0000000000000000000000000000000000FFFF
+      FF00FFFFFF000000FF00FFFFFF00FFFFFF00FFFF0000FFFF0000FFFF00000000
+      FF00FFFF0000FFFF000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF000000000000000000FFFFFF00000000000000
       0000FFFFFF000000000000000000FFFFFF00FFFFFF0000000000000000000000
-      00000000000000000000FFFFFF00000000000000000000000000000000000000
+      00000000000000000000FFFFFF0000000000000000000000000000000000FFFF
+      FF00FFFF00000000FF00FFFF0000FFFFFF00FFFF0000FFFF0000FF0000000000
+      FF00FF000000FFFF000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF000000000000000000FFFFFF00FFFF0000FFFF
       0000FFFF0000FFFF0000FFFF0000FFFFFF00FFFFFF0000000000FFFFFF000000
-      FF00FFFFFF00FF000000FFFFFF00000000000000000000000000000000000000
+      FF00FFFFFF00FF000000FFFFFF0000000000000000000000000000000000FFFF
+      FF00FFFFFF000000FF00FFFFFF00FFFFFF0080808000FFFF0000FFFF00000000
+      FF00FFFF0000FFFF000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000FFFFFF00000000000000
       0000FFFFFF000000000000000000BFBFBF0000000000FF000000FF000000FF00
       00000000FF00FF000000FF0000000000000000000000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000FFFFFF000000
-      FF00FFFFFF00FF000000FFFFFF00000000000000000000000000000000000000
+      FF00FFFFFF00FF000000FFFFFF0000000000000000000000000000000000FFFF
+      FF00FFFF00000000FF00808080008080800000000000FFFFFF00800000000000
+      FF00FF000000FFFF000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF0000000000000000000000
       FF000000FF000000FF00000000000000000000000000FFFFFF00000000000000
       00000000000000000000FFFFFF00FFFFFF00FFFFFF0000000000FFFFFF00FFFF
-      FF00FFFFFF00FF000000FFFFFF00000000000000000000000000000000000000
+      FF00FFFFFF00FF000000FFFFFF0000000000000000000000000000000000FFFF
+      FF008080800080808000FFFFFF00000000008080800000000000FFFFFF008000
+      000080000000FFFF000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000FFFFFF00000000000000
       00000000000000000000FFFFFF0000000000FFFFFF00000000000000FF000000
       FF000000FF000000FF000000FF000000000000000000FFFFFF00000000000000
       00000000000000000000FFFFFF00FFFFFF00FFFFFF0000000000FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00000000000000000000000000000000000000
+      FF00FFFFFF00FFFFFF00FFFFFF00000000000000000000000000808080008080
+      8000FFFFFF00FFFFFF0000000000C0C0C00080808000C0C0C00000000000FFFF
+      FF00FFFFFF008000000080000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF000000FF000000FF000000
       FF000000FF000000FF000000FF000000FF0000000000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
-      FF00FFFFFF00FFFFFF00FFFFFF00000000000000000000000000000000000000
+      FF00FFFFFF00FFFFFF00FFFFFF000000000000000000FFFFFF00FFFFFF00FFFF
+      FF000000000000000000C0C0C0000000000000000000C0C0C000C0C0C0000000
+      000000000000FFFFFF00FFFFFF00FFFFFF000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000FFFFFF00000000000000
       0000FFFFFF000000000000000000000000000000000000000000000000000000
       FF000000FF000000FF00000000000000000000000000FF000000FF000000FF00
       0000FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF00
       0000FF000000FF000000FF000000000000000000000000000000000000000000
+      0000FFFFFF00808080000000000000FFFF0000FFFF0000000000808080008080
+      8000FFFFFF000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF0000000000FFFFFF00FFFFFF000000000000000000000000000000
       FF000000FF000000FF00000000000000000000000000BFBFBF00BFBFBF00FF00
       0000FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF00
-      0000FF000000BFBFBF00BFBFBF00000000000000000000000000000000000000
+      0000FF000000BFBFBF00BFBFBF0000000000000000000000000000000000FFFF
+      FF00FFFFFF000000000000FFFF0000FFFF0000FFFF0000FFFF0000000000FFFF
+      FF00FFFFFF00FFFFFF0000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000FFFFFF0000000000BFBF
       BF00FFFFFF0000000000FFFFFF000000000000000000000000007F7F7F000000
       FF000000FF000000FF0000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000000000000000000000000000000000000000000000000000FFFFFF00FFFF
+      FF00FFFFFF000000000000FFFF0000FFFF0000FFFF0000FFFF0000000000FFFF
+      FF00FFFFFF00FFFFFF00FFFFFF00000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
       00000000000000000000000000000000000000000000FFFFFF00FFFFFF00FFFF
       FF00FFFFFF000000000000000000000000000000FF000000FF000000FF000000
       FF000000FF000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      0000FFFFFF00FFFFFF000000000000FFFF0000FFFF0000000000FFFFFF00FFFF
+      FF00FFFFFF000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
+      00000000000000000000FFFFFF000000000000000000FFFFFF00FFFFFF000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -256,9 +272,6 @@
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000000000000000000000000000000000
       000000000000000000000000000000FFFF007F7F7F00FFFFFF00FFFFFF00FFFF
       FF00FFFFFF00FFFFFF0000FFFF00000000000000000000000000000000000000
       0000000000000000000000000000000000000000000000000000000000000000
@@ -766,11 +779,11 @@
       0000000000000000000000000000000000000000000000000000000000000000
       000000000000000000000000000000000000424D3E000000000000003E000000
       2800000040000000500000000100010000000000800200000000000000000000
-      000000000000000000000000FFFFFF00FF00FFFF00000000FF00000000000000
-      FF00000000000000FF0000000000000000000000000000000000000000000000
-      0000000000000000000000000000000000230000000000000001000000000000
-      00000000000000000023000000000000006300000000000000C3000000000000
-      0107FFFF0000000003FFFFFF00000000FFFFFFFFFFFFFC00FFFFFFFFFFFFFC00
+      000000000000000000000000FFFFFF00FF00FFFFFC1F0000FF000000F0070000
+      FF000000C0010000FF000000C001000000000000C001000000000000C0010000
+      00000000C001000000000000C001000000230000C00100000001000080000000
+      0000000000000000002300008000000000630000C001000000C3000080000000
+      0107FFFFC001000003FFFFFFF0070000FFFFFFFFFFFFFC00FFFFFFFFFFFFFC00
       C000E000F1E7FC008000C000F0C3FC008000C000F883000080008000E0030000
       80008000E003000080000000E003000080000000E00F002380000000E0070001
       80008000E007000080008000F003002380018001F1830063C07FC07FFF0700C3
@@ -830,6 +843,13 @@
       OnExecute = ActionShowDfmsExecute
       OnUpdate = ActionShowDfmsUpdate
     end
+    object ActionShowPackages: TAction
+      Caption = 'Show packages'
+      Checked = True
+      ImageIndex = 18
+      OnExecute = ActionShowPackagesExecute
+      OnUpdate = ActionShowPackagesUpdate
+    end
   end
   object PopupMenuUnitView: TPopupMenu
     Left = 72

Modified: trunk/jcl/experts/projectanalyzer/ProjAnalyzerFrm.pas
===================================================================
--- trunk/jcl/experts/projectanalyzer/ProjAnalyzerFrm.pas	2007-12-30 13:17:56 UTC (rev 2287)
+++ trunk/jcl/experts/projectanalyzer/ProjAnalyzerFrm.pas	2007-12-30 13:55:38 UTC (rev 2288)
@@ -61,7 +61,7 @@
     MenuItemDetails: TMenuItem;
     MenuItemSummary: TMenuItem;
     ToolButtonSummary: TToolButton;
-    ToolButtonSeparator: TToolButton;
+    ToolButtonSeparator1: TToolButton;
     ToolButtonCopy: TToolButton;
     ToolButtonSave: TToolButton;
     ActionCopy: TAction;
@@ -76,6 +76,9 @@
     ActionShowDfms: TAction;
     ToolButtonDfms: TToolButton;
     MenuItemDfms: TMenuItem;
+    ToolButtonSeparator2: TToolButton;
+    ToolButtonShowPackages: TToolButton;
+    ActionShowPackages: TAction;
     procedure ActionShowDfmsUpdate(Sender: TObject);
     procedure ActionShowSummaryUpdate(Sender: TObject);
     procedure FormCreate(Sender: TObject);
@@ -90,8 +93,11 @@
     procedure ActionSaveExecute(Sender: TObject);
     procedure ActionShowDfmsExecute(Sender: TObject);
     procedure ActionShowDetailsUpdate(Sender: TObject);
+    procedure ActionShowPackagesExecute(Sender: TObject);
+    procedure ActionShowPackagesUpdate(Sender: TObject);
   private
     FCodeSize: Integer;
+    FICodeSize: Integer;
     FDataSize: Integer;
     FBssSize: Integer;
     FPackageUnits: array of TPackageUnitItem;
@@ -99,6 +105,7 @@
     FDfms: array of TUnitItem;
     FUnitsSum: TStringList;
     FSettings: TJclOtaSettings;
+    FShowPackages: Boolean;
     FView: TProjectAnalyserView;
     procedure OnMapSegmentEvent(Sender: TObject; const Address: TJclMapAddress;
       Length: Integer; const ClassName, UnitName: string);
@@ -118,6 +125,7 @@
     property StatusBarText: string write SetStatusBarText;
     property Settings: TJclOtaSettings read FSettings;
     property View: TProjectAnalyserView read FView;
+    property ShowPackages: Boolean read FShowPackages;
   end;
 
 var
@@ -140,9 +148,8 @@
   ListView := TListColumns(Column.Collection).Owner as TListView;
   ListView.Columns.BeginUpdate;
   try
-    with ListView.Columns do
-      for I := 0 to Count - 1 do
-        Items[I].ImageIndex := -1;
+    for I := 0 to ListView.Columns.Count - 1 do
+        ListView.Columns.Items[I].ImageIndex := -1;
     if ListView.Tag and $FF = Column.Index then
       ListView.Tag := ListView.Tag xor $100
     else
@@ -282,10 +289,11 @@
             Settings.LoadInteger(JclHeight, Height));
 
   FView := TProjectAnalyserView(Settings.LoadInteger(AnalyzerViewName, Integer(pavDetails)));
+  FShowPackages := Settings.LoadBool(AnalyzerShowPackagesName, True);
 
-  with UnitListView.Columns do
-    for Index := 0 to Count - 1 do
-      Items[Index].Width := Settings.LoadInteger(Format(ColumnRegName, [Index]), Items[Index].Width);
+  for Index := 0 to UnitListView.Columns.Count - 1 do
+    UnitListView.Columns.Items[Index].Width := Settings.LoadInteger(Format(ColumnRegName, [Index]),
+      UnitListView.Columns.Items[Index].Width);
 end;
 
 procedure TProjectAnalyzerForm.FormDestroy(Sender: TObject);
@@ -297,9 +305,9 @@
   Settings.SaveInteger(JclWidth, Width);
   Settings.SaveInteger(JclHeight, Height);
   Settings.SaveInteger(AnalyzerViewName, Integer(FView));
-  with UnitListView.Columns do
-    for Index := 0 to Count - 1 do
-      Settings.SaveInteger(Format(ColumnRegName, [Index]), Items[Index].Width);
+  Settings.SaveBool(AnalyzerShowPackagesName, ShowPackages);
+  for Index := 0 to UnitListView.Columns.Count - 1 do
+    Settings.SaveInteger(Format(ColumnRegName, [Index]), UnitListView.Columns.Items[Index].Width);
 
   FreeAndNil(FUnitsSum);
 end;
@@ -358,7 +366,7 @@
     PackagesList.Free;
   end;
   StatusBarMain.Panels[0].Text := Format(RsStatusText,
-    [FUnitsSum.Count, Length(FDfms), FCodeSize, FDataSize, FBssSize, ResourcesSize]);
+    [FUnitsSum.Count, Length(FDfms), FCodeSize, FICodeSize, FDataSize, FBssSize, ResourcesSize]);
   case View of
     pavDetails:
       ShowDetails;
@@ -372,53 +380,65 @@
 procedure TProjectAnalyzerForm.ShowDetails;
 var
   I: Integer;
+  PackageName: string;
+  AItem: TListItem;
 begin
   FView := pavDetails;
-  with UnitListView do
-  begin
-    Items.BeginUpdate;
-    Items.Clear;
+  UnitListView.Items.BeginUpdate;
+  try
+    UnitListView.Items.Clear;
     for I := 0 to Length(FUnits) - 1 do
-      with Items.Add, FUnits[I] do
+    begin
+      PackageName := FindPackageForUnitName(FUnits[I].Name);
+      if ShowPackages or (PackageName = '') then
       begin
-        Caption := Name;
-        SubItems.Add(Format('%.0n', [IntToExtended(Size)]));
-        SubItems.Add(Group);
-        SubItems.Add(FindPackageForUnitName(Name));
-        case Group[1] of
+        AItem := UnitListView.Items.Add;
+        AItem.Caption := FUnits[I].Name;
+        AItem.SubItems.Add(Format('%.0n', [IntToExtended(FUnits[I].Size)]));
+        AItem.SubItems.Add(FUnits[I].Group);
+        AItem.SubItems.Add(PackageName);
+        case FUnits[I].Group[1] of
           'D':
-            ImageIndex := 3;
+            AItem.ImageIndex := 3;
           'B':
-            ImageIndex := 4;
+            AItem.ImageIndex := 4;
         else
-          ImageIndex := 2;
+          AItem.ImageIndex := 2;
         end;
       end;
-    AlphaSort;
-    Items.EndUpdate;
+    end;
+    UnitListView.AlphaSort;
+  finally
+    UnitListView.Items.EndUpdate;
   end;
 end;
 
 procedure TProjectAnalyzerForm.ShowSummary;
 var
   I: Integer;
+  PackageName: string;
+  AItem: TListItem;
 begin
   FView := pavSummary;
-  with UnitListView do
-  begin
-    Items.BeginUpdate;
-    Items.Clear;
+  UnitListView.Items.BeginUpdate;
+  try
+    UnitListView.Items.Clear;
     for I := 0 to FUnitsSum.Count - 1 do
-      with Items.Add, FUnitsSum do
+    begin
+      PackageName := FindPackageForUnitName(FUnitsSum.Strings[I]);
+      if ShowPackages or (PackageName = '') then
       begin
-        Caption := Strings[I];
-        SubItems.Add(Format('%.0n', [IntToExtended(Integer(Objects[I]))]));
-        SubItems.Add(RsCodeData);
-        SubItems.Add(FindPackageForUnitName(Strings[I]));
-        ImageIndex := 2;
+        AItem := UnitListView.Items.Add;
+        AItem.Caption := FUnitsSum.Strings[I];
+        AItem.SubItems.Add(Format('%.0n', [IntToExtended(Integer(FUnitsSum.Objects[I]))]));
+        AItem.SubItems.Add(RsCodeData);
+        AItem.SubItems.Add(PackageName);
+        AItem.ImageIndex := 2;
       end;
-    AlphaSort;
-    Items.EndUpdate;
+    end;
+    UnitListView.AlphaSort;
+  finally
+    UnitListView.Items.EndUpdate;
   end;
 end;
 
@@ -470,6 +490,8 @@
       Inc(FCodeSize, Length);
     'D':
       Inc(FDataSize, Length);
+    'I':
+      Inc(FICodeSize, Length);
   end;
   C := FUnitsSum.IndexOf(UnitName);
   if C = -1 then
@@ -535,6 +557,30 @@
   AAction.Checked := View = pavDfms;
 end;
 
+procedure TProjectAnalyzerForm.ActionShowPackagesExecute(Sender: TObject);
+begin
+  FShowPackages := not FShowPackages;
+  ActionShowPackages.Checked := not ActionShowPackages.Checked;
+  case FView of
+    pavDetails:
+      ShowDetails;
+    pavSummary:
+      ShowSummary;
+    pavDfms:
+      ShowDfms;
+  end;
+end;
+
+procedure TProjectAnalyzerForm.ActionShowPackagesUpdate(Sender: TObject);
+var
+  AAction: TAction;
+begin
+  AAction := Sender as TAction;
+
+  AAction.Enabled := (Length(FUnits) > 0);
+  AAction.Checked := ShowPackages;
+end;
+
 procedure TProjectAnalyzerForm.TextLabelsItemClick(Sender: TObject);
 begin
   TextLabelsItem.Checked := not TextLabelsItem.Checked;
@@ -645,6 +691,7 @@
   FUnits := nil;
   FUnitsSum.Clear;
   FCodeSize := 0;
+  FICodeSize := 0;
   FDataSize := 0;
   FBssSize := 0;
   FPackageUnits := nil;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

49 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 62 63 64 65 66 .. 92 > >> (Page 64 of 92)