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

[Jcl-checkins-diff] SF.net SVN: jcl:[3842] trunk/help/StrHashMap.dtx

[<ou...@us...>]

Revision: 3842
          http://jcl.svn.sourceforge.net/jcl/?rev=3842&view=rev
Author:   outchy
Date:     2012-08-22 10:34:07 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
JclStrHashMaps.pas was moved to package JclContainers.

Modified Paths:
--------------
    trunk/help/StrHashMap.dtx

Modified: trunk/help/StrHashMap.dtx
===================================================================
--- trunk/help/StrHashMap.dtx	2012-08-22 07:37:31 UTC (rev 3841)
+++ trunk/help/StrHashMap.dtx	2012-08-22 10:34:07 UTC (rev 3842)
@@ -11,7 +11,7 @@
   Petr Vones
 --------------------------------------------------------------------------------
 @@Searching
-<GROUP JCL>
+<GROUP JCL_Containers>
 <TITLE Searching>
 <TOPICORDER 100>
 --------------------------------------------------------------------------------

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:[3841] trunk/jcl/source/common/JclIDEUtils.pas

[<ob...@us...>]

Revision: 3841
          http://jcl.svn.sourceforge.net/jcl/?rev=3841&view=rev
Author:   obones
Date:     2012-08-22 07:37:31 +0000 (Wed, 22 Aug 2012)
Log Message:
-----------
Must not check for CBuilder platform if we are not a CBuilder install, or else we are requiring CBuilder 64 when it does not even exist...

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

Modified: trunk/jcl/source/common/JclIDEUtils.pas
===================================================================
--- trunk/jcl/source/common/JclIDEUtils.pas	2012-08-21 12:39:07 UTC (rev 3840)
+++ trunk/jcl/source/common/JclIDEUtils.pas	2012-08-22 07:37:31 UTC (rev 3841)
@@ -2207,10 +2207,11 @@
 
 function TJclBorRADToolInstallation.GetObjFolderName(APlatform: TJclBDSPlatform): string;
 begin
-  CheckCBuilderPlatform(APlatform);
-
   if RadToolKind = brCppBuilder then
-    Result := LibFolderName[APlatform] + PathAddSeparator('obj')
+  begin
+    CheckCBuilderPlatform(APlatform);
+    Result := LibFolderName[APlatform] + PathAddSeparator('obj');
+  end
   else
     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:[3840] trunk

[<ou...@us...>]

Revision: 3840
          http://jcl.svn.sourceforge.net/jcl/?rev=3840&view=rev
Author:   outchy
Date:     2012-08-21 12:39:07 +0000 (Tue, 21 Aug 2012)
Log Message:
-----------
help update.

Modified Paths:
--------------
    trunk/help/ContainerCopies.dtx
    trunk/help/ExprEval.dtx
    trunk/help/JclTemplate.dox
    trunk/help/containers/JclAlgorithms.inc
    trunk/help/containers/JclArrayLists.inc
    trunk/help/containers/JclBinaryTrees.inc
    trunk/help/containers/JclContainerIntf.inc
    trunk/help/containers/JclHashMaps.inc
    trunk/help/containers/JclHashSets.inc
    trunk/help/containers/JclLinkedLists.inc
    trunk/help/containers/JclSortedMaps.inc
    trunk/help/containers/JclTrees.inc
    trunk/help/containers/JclVectors.inc
    trunk/jcl/packages/help/Jcl.dox
    trunk/jcl/packages/help/JclContainers.dox
    trunk/jcl/packages/help/JclDeveloperTools.dox
    trunk/jcl/packages/xml/Jcl-R.xml
    trunk/jcl/packages/xml/JclContainers-R.xml
    trunk/jcl/packages/xml/JclDeveloperTools-R.xml

Modified: trunk/help/ContainerCopies.dtx
===================================================================
--- trunk/help/ContainerCopies.dtx	2012-08-20 14:14:38 UTC (rev 3839)
+++ trunk/help/ContainerCopies.dtx	2012-08-21 12:39:07 UTC (rev 3840)
@@ -16510,1307 +16510,1307 @@
 
 
 
-@@TJclIntfIntfHashEntry
+@@TJclIntfIntfHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclIntfIntfHashEntry.Key
+@@TJclIntfIntfHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclIntfIntfHashEntry.Value
+@@TJclIntfIntfHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclIntfIntfBucket
+@@TJclIntfIntfHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclIntfIntfBucket
+@@!!MEMBEROVERVIEW_TJclIntfIntfHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclIntfIntfBucket.Entries
+@@TJclIntfIntfHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclIntfIntfBucket.Size
+@@TJclIntfIntfHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclIntfIntfBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclIntfIntfHashMapBucket.MoveArray@TJclIntfIntfHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclAnsiStrIntfHashEntry
+@@TJclAnsiStrIntfHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclAnsiStrIntfHashEntry.Key
+@@TJclAnsiStrIntfHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclAnsiStrIntfHashEntry.Value
+@@TJclAnsiStrIntfHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclAnsiStrIntfBucket
+@@TJclAnsiStrIntfHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclAnsiStrIntfBucket
+@@!!MEMBEROVERVIEW_TJclAnsiStrIntfHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclAnsiStrIntfBucket.Entries
+@@TJclAnsiStrIntfHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclAnsiStrIntfBucket.Size
+@@TJclAnsiStrIntfHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclAnsiStrIntfBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclAnsiStrIntfHashMapBucket.MoveArray@TJclAnsiStrIntfHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclIntfAnsiStrHashEntry
+@@TJclIntfAnsiStrHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclIntfAnsiStrHashEntry.Key
+@@TJclIntfAnsiStrHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclIntfAnsiStrHashEntry.Value
+@@TJclIntfAnsiStrHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclIntfAnsiStrBucket
+@@TJclIntfAnsiStrHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclIntfAnsiStrBucket
+@@!!MEMBEROVERVIEW_TJclIntfAnsiStrHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclIntfAnsiStrBucket.Entries
+@@TJclIntfAnsiStrHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclIntfAnsiStrBucket.Size
+@@TJclIntfAnsiStrHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclIntfAnsiStrBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclIntfAnsiStrHashMapBucket.MoveArray@TJclIntfAnsiStrHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclAnsiStrAnsiStrHashEntry
+@@TJclAnsiStrAnsiStrHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclAnsiStrAnsiStrHashEntry.Key
+@@TJclAnsiStrAnsiStrHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclAnsiStrAnsiStrHashEntry.Value
+@@TJclAnsiStrAnsiStrHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclAnsiStrAnsiStrBucket
+@@TJclAnsiStrAnsiStrHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclAnsiStrAnsiStrBucket
+@@!!MEMBEROVERVIEW_TJclAnsiStrAnsiStrHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclAnsiStrAnsiStrBucket.Entries
+@@TJclAnsiStrAnsiStrHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclAnsiStrAnsiStrBucket.Size
+@@TJclAnsiStrAnsiStrHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclAnsiStrAnsiStrBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclAnsiStrAnsiStrHashMapBucket.MoveArray@TJclAnsiStrAnsiStrHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclWideStrIntfHashEntry
+@@TJclWideStrIntfHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclWideStrIntfHashEntry.Key
+@@TJclWideStrIntfHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclWideStrIntfHashEntry.Value
+@@TJclWideStrIntfHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclWideStrIntfBucket
+@@TJclWideStrIntfHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclWideStrIntfBucket
+@@!!MEMBEROVERVIEW_TJclWideStrIntfHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclWideStrIntfBucket.Entries
+@@TJclWideStrIntfHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclWideStrIntfBucket.Size
+@@TJclWideStrIntfHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclWideStrIntfBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclWideStrIntfHashMapBucket.MoveArray@TJclWideStrIntfHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclIntfWideStrHashEntry
+@@TJclIntfWideStrHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclIntfWideStrHashEntry.Key
+@@TJclIntfWideStrHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclIntfWideStrHashEntry.Value
+@@TJclIntfWideStrHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclIntfWideStrBucket
+@@TJclIntfWideStrHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclIntfWideStrBucket
+@@!!MEMBEROVERVIEW_TJclIntfWideStrHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclIntfWideStrBucket.Entries
+@@TJclIntfWideStrHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclIntfWideStrBucket.Size
+@@TJclIntfWideStrHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclIntfWideStrBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclIntfWideStrHashMapBucket.MoveArray@TJclIntfWideStrHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclWideStrWideStrHashEntry
+@@TJclWideStrWideStrHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclWideStrWideStrHashEntry.Key
+@@TJclWideStrWideStrHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclWideStrWideStrHashEntry.Value
+@@TJclWideStrWideStrHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclWideStrWideStrBucket
+@@TJclWideStrWideStrHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclWideStrWideStrBucket
+@@!!MEMBEROVERVIEW_TJclWideStrWideStrHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclWideStrWideStrBucket.Entries
+@@TJclWideStrWideStrHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclWideStrWideStrBucket.Size
+@@TJclWideStrWideStrHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclWideStrWideStrBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclWideStrWideStrHashMapBucket.MoveArray@TJclWideStrWideStrHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclUnicodeStrIntfHashEntry
+@@TJclUnicodeStrIntfHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclUnicodeStrIntfHashEntry.Key
+@@TJclUnicodeStrIntfHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclUnicodeStrIntfHashEntry.Value
+@@TJclUnicodeStrIntfHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclUnicodeStrIntfBucket
+@@TJclUnicodeStrIntfHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclUnicodeStrIntfBucket
+@@!!MEMBEROVERVIEW_TJclUnicodeStrIntfHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclUnicodeStrIntfBucket.Entries
+@@TJclUnicodeStrIntfHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclUnicodeStrIntfBucket.Size
+@@TJclUnicodeStrIntfHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclUnicodeStrIntfBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclUnicodeStrIntfHashMapBucket.MoveArray@TJclUnicodeStrIntfHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclIntfUnicodeStrHashEntry
+@@TJclIntfUnicodeStrHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclIntfUnicodeStrHashEntry.Key
+@@TJclIntfUnicodeStrHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclIntfUnicodeStrHashEntry.Value
+@@TJclIntfUnicodeStrHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclIntfUnicodeStrBucket
+@@TJclIntfUnicodeStrHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclIntfUnicodeStrBucket
+@@!!MEMBEROVERVIEW_TJclIntfUnicodeStrHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclIntfUnicodeStrBucket.Entries
+@@TJclIntfUnicodeStrHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclIntfUnicodeStrBucket.Size
+@@TJclIntfUnicodeStrHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclIntfUnicodeStrBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclIntfUnicodeStrHashMapBucket.MoveArray@TJclIntfUnicodeStrHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclUnicodeStrUnicodeStrHashEntry
+@@TJclUnicodeStrUnicodeStrHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclUnicodeStrUnicodeStrHashEntry.Key
+@@TJclUnicodeStrUnicodeStrHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclUnicodeStrUnicodeStrHashEntry.Value
+@@TJclUnicodeStrUnicodeStrHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclUnicodeStrUnicodeStrBucket
+@@TJclUnicodeStrUnicodeStrHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclUnicodeStrUnicodeStrBucket
+@@!!MEMBEROVERVIEW_TJclUnicodeStrUnicodeStrHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclUnicodeStrUnicodeStrBucket.Entries
+@@TJclUnicodeStrUnicodeStrHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclUnicodeStrUnicodeStrBucket.Size
+@@TJclUnicodeStrUnicodeStrHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclUnicodeStrUnicodeStrBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclUnicodeStrUnicodeStrHashMapBucket.MoveArray@TJclUnicodeStrUnicodeStrHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclSingleIntfHashEntry
+@@TJclSingleIntfHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclSingleIntfHashEntry.Key
+@@TJclSingleIntfHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclSingleIntfHashEntry.Value
+@@TJclSingleIntfHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclSingleIntfBucket
+@@TJclSingleIntfHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclSingleIntfBucket
+@@!!MEMBEROVERVIEW_TJclSingleIntfHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclSingleIntfBucket.Entries
+@@TJclSingleIntfHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclSingleIntfBucket.Size
+@@TJclSingleIntfHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclSingleIntfBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclSingleIntfHashMapBucket.MoveArray@TJclSingleIntfHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclIntfSingleHashEntry
+@@TJclIntfSingleHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclIntfSingleHashEntry.Key
+@@TJclIntfSingleHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclIntfSingleHashEntry.Value
+@@TJclIntfSingleHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclIntfSingleBucket
+@@TJclIntfSingleHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclIntfSingleBucket
+@@!!MEMBEROVERVIEW_TJclIntfSingleHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclIntfSingleBucket.Entries
+@@TJclIntfSingleHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclIntfSingleBucket.Size
+@@TJclIntfSingleHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclIntfSingleBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclIntfSingleHashMapBucket.MoveArray@TJclIntfSingleHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclSingleSingleHashEntry
+@@TJclSingleSingleHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclSingleSingleHashEntry.Key
+@@TJclSingleSingleHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclSingleSingleHashEntry.Value
+@@TJclSingleSingleHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclSingleSingleBucket
+@@TJclSingleSingleHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclSingleSingleBucket
+@@!!MEMBEROVERVIEW_TJclSingleSingleHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclSingleSingleBucket.Entries
+@@TJclSingleSingleHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclSingleSingleBucket.Size
+@@TJclSingleSingleHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclSingleSingleBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclSingleSingleHashMapBucket.MoveArray@TJclSingleSingleHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclDoubleIntfHashEntry
+@@TJclDoubleIntfHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclDoubleIntfHashEntry.Key
+@@TJclDoubleIntfHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclDoubleIntfHashEntry.Value
+@@TJclDoubleIntfHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclDoubleIntfBucket
+@@TJclDoubleIntfHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclDoubleIntfBucket
+@@!!MEMBEROVERVIEW_TJclDoubleIntfHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclDoubleIntfBucket.Entries
+@@TJclDoubleIntfHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclDoubleIntfBucket.Size
+@@TJclDoubleIntfHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclDoubleIntfBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclDoubleIntfHashMapBucket.MoveArray@TJclDoubleIntfHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclIntfDoubleHashEntry
+@@TJclIntfDoubleHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclIntfDoubleHashEntry.Key
+@@TJclIntfDoubleHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclIntfDoubleHashEntry.Value
+@@TJclIntfDoubleHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclIntfDoubleBucket
+@@TJclIntfDoubleHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclIntfDoubleBucket
+@@!!MEMBEROVERVIEW_TJclIntfDoubleHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclIntfDoubleBucket.Entries
+@@TJclIntfDoubleHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclIntfDoubleBucket.Size
+@@TJclIntfDoubleHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclIntfDoubleBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclIntfDoubleHashMapBucket.MoveArray@TJclIntfDoubleHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclDoubleDoubleHashEntry
+@@TJclDoubleDoubleHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclDoubleDoubleHashEntry.Key
+@@TJclDoubleDoubleHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclDoubleDoubleHashEntry.Value
+@@TJclDoubleDoubleHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclDoubleDoubleBucket
+@@TJclDoubleDoubleHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclDoubleDoubleBucket
+@@!!MEMBEROVERVIEW_TJclDoubleDoubleHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclDoubleDoubleBucket.Entries
+@@TJclDoubleDoubleHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclDoubleDoubleBucket.Size
+@@TJclDoubleDoubleHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclDoubleDoubleBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclDoubleDoubleHashMapBucket.MoveArray@TJclDoubleDoubleHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclExtendedIntfHashEntry
+@@TJclExtendedIntfHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclExtendedIntfHashEntry.Key
+@@TJclExtendedIntfHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclExtendedIntfHashEntry.Value
+@@TJclExtendedIntfHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclExtendedIntfBucket
+@@TJclExtendedIntfHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclExtendedIntfBucket
+@@!!MEMBEROVERVIEW_TJclExtendedIntfHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclExtendedIntfBucket.Entries
+@@TJclExtendedIntfHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclExtendedIntfBucket.Size
+@@TJclExtendedIntfHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclExtendedIntfBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclExtendedIntfHashMapBucket.MoveArray@TJclExtendedIntfHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclIntfExtendedHashEntry
+@@TJclIntfExtendedHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclIntfExtendedHashEntry.Key
+@@TJclIntfExtendedHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclIntfExtendedHashEntry.Value
+@@TJclIntfExtendedHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclIntfExtendedBucket
+@@TJclIntfExtendedHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclIntfExtendedBucket
+@@!!MEMBEROVERVIEW_TJclIntfExtendedHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclIntfExtendedBucket.Entries
+@@TJclIntfExtendedHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclIntfExtendedBucket.Size
+@@TJclIntfExtendedHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclIntfExtendedBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclIntfExtendedHashMapBucket.MoveArray@TJclIntfExtendedHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclExtendedExtendedHashEntry
+@@TJclExtendedExtendedHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclExtendedExtendedHashEntry.Key
+@@TJclExtendedExtendedHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclExtendedExtendedHashEntry.Value
+@@TJclExtendedExtendedHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclExtendedExtendedBucket
+@@TJclExtendedExtendedHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclExtendedExtendedBucket
+@@!!MEMBEROVERVIEW_TJclExtendedExtendedHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclExtendedExtendedBucket.Entries
+@@TJclExtendedExtendedHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclExtendedExtendedBucket.Size
+@@TJclExtendedExtendedHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclExtendedExtendedBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclExtendedExtendedHashMapBucket.MoveArray@TJclExtendedExtendedHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclIntegerIntfHashEntry
+@@TJclIntegerIntfHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclIntegerIntfHashEntry.Key
+@@TJclIntegerIntfHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclIntegerIntfHashEntry.Value
+@@TJclIntegerIntfHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclIntegerIntfBucket
+@@TJclIntegerIntfHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclIntegerIntfBucket
+@@!!MEMBEROVERVIEW_TJclIntegerIntfHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclIntegerIntfBucket.Entries
+@@TJclIntegerIntfHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclIntegerIntfBucket.Size
+@@TJclIntegerIntfHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclIntegerIntfBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclIntegerIntfHashMapBucket.MoveArray@TJclIntegerIntfHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclIntfIntegerHashEntry
+@@TJclIntfIntegerHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclIntfIntegerHashEntry.Key
+@@TJclIntfIntegerHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclIntfIntegerHashEntry.Value
+@@TJclIntfIntegerHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclIntfIntegerBucket
+@@TJclIntfIntegerHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclIntfIntegerBucket
+@@!!MEMBEROVERVIEW_TJclIntfIntegerHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclIntfIntegerBucket.Entries
+@@TJclIntfIntegerHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclIntfIntegerBucket.Size
+@@TJclIntfIntegerHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclIntfIntegerBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclIntfIntegerHashMapBucket.MoveArray@TJclIntfIntegerHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclIntegerIntegerHashEntry
+@@TJclIntegerIntegerHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclIntegerIntegerHashEntry.Key
+@@TJclIntegerIntegerHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclIntegerIntegerHashEntry.Value
+@@TJclIntegerIntegerHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclIntegerIntegerBucket
+@@TJclIntegerIntegerHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclIntegerIntegerBucket
+@@!!MEMBEROVERVIEW_TJclIntegerIntegerHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclIntegerIntegerBucket.Entries
+@@TJclIntegerIntegerHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclIntegerIntegerBucket.Size
+@@TJclIntegerIntegerHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclIntegerIntegerBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclIntegerIntegerHashMapBucket.MoveArray@TJclIntegerIntegerHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclCardinalIntfHashEntry
+@@TJclCardinalIntfHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclCardinalIntfHashEntry.Key
+@@TJclCardinalIntfHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclCardinalIntfHashEntry.Value
+@@TJclCardinalIntfHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclCardinalIntfBucket
+@@TJclCardinalIntfHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclCardinalIntfBucket
+@@!!MEMBEROVERVIEW_TJclCardinalIntfHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclCardinalIntfBucket.Entries
+@@TJclCardinalIntfHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclCardinalIntfBucket.Size
+@@TJclCardinalIntfHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclCardinalIntfBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclCardinalIntfHashMapBucket.MoveArray@TJclCardinalIntfHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclIntfCardinalHashEntry
+@@TJclIntfCardinalHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclIntfCardinalHashEntry.Key
+@@TJclIntfCardinalHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclIntfCardinalHashEntry.Value
+@@TJclIntfCardinalHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclIntfCardinalBucket
+@@TJclIntfCardinalHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclIntfCardinalBucket
+@@!!MEMBEROVERVIEW_TJclIntfCardinalHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclIntfCardinalBucket.Entries
+@@TJclIntfCardinalHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclIntfCardinalBucket.Size
+@@TJclIntfCardinalHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclIntfCardinalBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclIntfCardinalHashMapBucket.MoveArray@TJclIntfCardinalHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclCardinalCardinalHashEntry
+@@TJclCardinalCardinalHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclCardinalCardinalHashEntry.Key
+@@TJclCardinalCardinalHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclCardinalCardinalHashEntry.Value
+@@TJclCardinalCardinalHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclCardinalCardinalBucket
+@@TJclCardinalCardinalHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclCardinalCardinalBucket
+@@!!MEMBEROVERVIEW_TJclCardinalCardinalHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclCardinalCardinalBucket.Entries
+@@TJclCardinalCardinalHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclCardinalCardinalBucket.Size
+@@TJclCardinalCardinalHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclCardinalCardinalBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclCardinalCardinalHashMapBucket.MoveArray@TJclCardinalCardinalHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclInt64IntfHashEntry
+@@TJclInt64IntfHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclInt64IntfHashEntry.Key
+@@TJclInt64IntfHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclInt64IntfHashEntry.Value
+@@TJclInt64IntfHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclInt64IntfBucket
+@@TJclInt64IntfHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclInt64IntfBucket
+@@!!MEMBEROVERVIEW_TJclInt64IntfHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclInt64IntfBucket.Entries
+@@TJclInt64IntfHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclInt64IntfBucket.Size
+@@TJclInt64IntfHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclInt64IntfBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclInt64IntfHashMapBucket.MoveArray@TJclInt64IntfHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclIntfInt64HashEntry
+@@TJclIntfInt64HashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclIntfInt64HashEntry.Key
+@@TJclIntfInt64HashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclIntfInt64HashEntry.Value
+@@TJclIntfInt64HashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclIntfInt64Bucket
+@@TJclIntfInt64HashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclIntfInt64Bucket
+@@!!MEMBEROVERVIEW_TJclIntfInt64HashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclIntfInt64Bucket.Entries
+@@TJclIntfInt64HashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclIntfInt64Bucket.Size
+@@TJclIntfInt64HashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclIntfInt64Bucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclIntfInt64HashMapBucket.MoveArray@TJclIntfInt64HashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclInt64Int64HashEntry
+@@TJclInt64Int64HashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclInt64Int64HashEntry.Key
+@@TJclInt64Int64HashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclInt64Int64HashEntry.Value
+@@TJclInt64Int64HashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclInt64Int64Bucket
+@@TJclInt64Int64HashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclInt64Int64Bucket
+@@!!MEMBEROVERVIEW_TJclInt64Int64HashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclInt64Int64Bucket.Entries
+@@TJclInt64Int64HashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclInt64Int64Bucket.Size
+@@TJclInt64Int64HashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclInt64Int64Bucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclInt64Int64HashMapBucket.MoveArray@TJclInt64Int64HashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclPtrIntfHashEntry
+@@TJclPtrIntfHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclPtrIntfHashEntry.Key
+@@TJclPtrIntfHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclPtrIntfHashEntry.Value
+@@TJclPtrIntfHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclPtrIntfBucket
+@@TJclPtrIntfHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclPtrIntfBucket
+@@!!MEMBEROVERVIEW_TJclPtrIntfHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclPtrIntfBucket.Entries
+@@TJclPtrIntfHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclPtrIntfBucket.Size
+@@TJclPtrIntfHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclPtrIntfBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclPtrIntfHashMapBucket.MoveArray@TJclPtrIntfHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclIntfPtrHashEntry
+@@TJclIntfPtrHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclIntfPtrHashEntry.Key
+@@TJclIntfPtrHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclIntfPtrHashEntry.Value
+@@TJclIntfPtrHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclIntfPtrBucket
+@@TJclIntfPtrHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclIntfPtrBucket
+@@!!MEMBEROVERVIEW_TJclIntfPtrHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclIntfPtrBucket.Entries
+@@TJclIntfPtrHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclIntfPtrBucket.Size
+@@TJclIntfPtrHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclIntfPtrBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclIntfPtrHashMapBucket.MoveArray@TJclIntfPtrHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclPtrPtrHashEntry
+@@TJclPtrPtrHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclPtrPtrHashEntry.Key
+@@TJclPtrPtrHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclPtrPtrHashEntry.Value
+@@TJclPtrPtrHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclPtrPtrBucket
+@@TJclPtrPtrHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclPtrPtrBucket
+@@!!MEMBEROVERVIEW_TJclPtrPtrHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclPtrPtrBucket.Entries
+@@TJclPtrPtrHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclPtrPtrBucket.Size
+@@TJclPtrPtrHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclPtrPtrBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclPtrPtrHashMapBucket.MoveArray@TJclPtrPtrHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclIntfHashEntry
+@@TJclIntfHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclIntfHashEntry.Key
+@@TJclIntfHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclIntfHashEntry.Value
+@@TJclIntfHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclIntfBucket
+@@TJclIntfHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclIntfBucket
+@@!!MEMBEROVERVIEW_TJclIntfHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclIntfBucket.Entries
+@@TJclIntfHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclIntfBucket.Size
+@@TJclIntfHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclIntfBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclIntfHashMapBucket.MoveArray@TJclIntfHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclAnsiStrHashEntry
+@@TJclAnsiStrHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclAnsiStrHashEntry.Key
+@@TJclAnsiStrHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclAnsiStrHashEntry.Value
+@@TJclAnsiStrHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclAnsiStrBucket
+@@TJclAnsiStrHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclAnsiStrBucket
+@@!!MEMBEROVERVIEW_TJclAnsiStrHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclAnsiStrBucket.Entries
+@@TJclAnsiStrHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclAnsiStrBucket.Size
+@@TJclAnsiStrHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclAnsiStrBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclAnsiStrHashMapBucket.MoveArray@TJclAnsiStrHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclWideStrHashEntry
+@@TJclWideStrHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclWideStrHashEntry.Key
+@@TJclWideStrHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclWideStrHashEntry.Value
+@@TJclWideStrHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclWideStrBucket
+@@TJclWideStrHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclWideStrBucket
+@@!!MEMBEROVERVIEW_TJclWideStrHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclWideStrBucket.Entries
+@@TJclWideStrHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclWideStrBucket.Size
+@@TJclWideStrHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclWideStrBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclWideStrHashMapBucket.MoveArray@TJclWideStrHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclUnicodeStrHashEntry
+@@TJclUnicodeStrHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclUnicodeStrHashEntry.Key
+@@TJclUnicodeStrHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclUnicodeStrHashEntry.Value
+@@TJclUnicodeStrHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclUnicodeStrBucket
+@@TJclUnicodeStrHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclUnicodeStrBucket
+@@!!MEMBEROVERVIEW_TJclUnicodeStrHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclUnicodeStrBucket.Entries
+@@TJclUnicodeStrHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclUnicodeStrBucket.Size
+@@TJclUnicodeStrHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclUnicodeStrBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclUnicodeStrHashMapBucket.MoveArray@TJclUnicodeStrHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclSingleHashEntry
+@@TJclSingleHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclSingleHashEntry.Key
+@@TJclSingleHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclSingleHashEntry.Value
+@@TJclSingleHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclSingleBucket
+@@TJclSingleHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclSingleBucket
+@@!!MEMBEROVERVIEW_TJclSingleHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclSingleBucket.Entries
+@@TJclSingleHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclSingleBucket.Size
+@@TJclSingleHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclSingleBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclSingleHashMapBucket.MoveArray@TJclSingleHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclDoubleHashEntry
+@@TJclDoubleHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclDoubleHashEntry.Key
+@@TJclDoubleHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclDoubleHashEntry.Value
+@@TJclDoubleHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclDoubleBucket
+@@TJclDoubleHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclDoubleBucket
+@@!!MEMBEROVERVIEW_TJclDoubleHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclDoubleBucket.Entries
+@@TJclDoubleHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclDoubleBucket.Size
+@@TJclDoubleHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclDoubleBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclDoubleHashMapBucket.MoveArray@TJclDoubleHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclExtendedHashEntry
+@@TJclExtendedHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclExtendedHashEntry.Key
+@@TJclExtendedHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclExtendedHashEntry.Value
+@@TJclExtendedHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclExtendedBucket
+@@TJclExtendedHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclExtendedBucket
+@@!!MEMBEROVERVIEW_TJclExtendedHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclExtendedBucket.Entries
+@@TJclExtendedHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclExtendedBucket.Size
+@@TJclExtendedHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclExtendedBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclExtendedHashMapBucket.MoveArray@TJclExtendedHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclIntegerHashEntry
+@@TJclIntegerHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclIntegerHashEntry.Key
+@@TJclIntegerHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclIntegerHashEntry.Value
+@@TJclIntegerHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclIntegerBucket
+@@TJclIntegerHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclIntegerBucket
+@@!!MEMBEROVERVIEW_TJclIntegerHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclIntegerBucket.Entries
+@@TJclIntegerHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclIntegerBucket.Size
+@@TJclIntegerHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclIntegerBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclIntegerHashMapBucket.MoveArray@TJclIntegerHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclCardinalHashEntry
+@@TJclCardinalHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclCardinalHashEntry.Key
+@@TJclCardinalHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclCardinalHashEntry.Value
+@@TJclCardinalHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclCardinalBucket
+@@TJclCardinalHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclCardinalBucket
+@@!!MEMBEROVERVIEW_TJclCardinalHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclCardinalBucket.Entries
+@@TJclCardinalHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclCardinalBucket.Size
+@@TJclCardinalHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclCardinalBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclCardinalHashMapBucket.MoveArray@TJclCardinalHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclInt64HashEntry
+@@TJclInt64HashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclInt64HashEntry.Key
+@@TJclInt64HashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclInt64HashEntry.Value
+@@TJclInt64HashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclInt64Bucket
+@@TJclInt64HashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclInt64Bucket
+@@!!MEMBEROVERVIEW_TJclInt64HashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclInt64Bucket.Entries
+@@TJclInt64HashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclInt64Bucket.Size
+@@TJclInt64HashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclInt64Bucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclInt64HashMapBucket.MoveArray@TJclInt64HashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
-@@TJclPtrHashEntry
+@@TJclPtrHashMapEntry
 <copy TJclHashEntry>
 \ \
 
-@@TJclPtrHashEntry.Key
+@@TJclPtrHashMapEntry.Key
 <copy TJclHashEntry.Key>
 \ \
 
-@@TJclPtrHashEntry.Value
+@@TJclPtrHashMapEntry.Value
 <copy TJclHashEntry.Value>
 \ \
 
-@@TJclPtrBucket
+@@TJclPtrHashMapBucket
 <copy TJclBucket>
 \ \
 
-@@!!MEMBEROVERVIEW_TJclPtrBucket
+@@!!MEMBEROVERVIEW_TJclPtrHashMapBucket
 <copy !!MEMBEROVERVIEW_TJclBucket>
 \ \
 
-@@TJclPtrBucket.Entries
+@@TJclPtrHashMapBucket.Entries
 <copy TJclBucket.Entries>
 \ \
 
-@@TJclPtrBucket.Size
+@@TJclPtrHashMapBucket.Size
 <copy TJclBucket.Size>
 \ \
 
-@@TJclPtrBucket.MoveArray@Integer@Integer@Integer
-<copy TJclBucket.MoveArray@Integer@Integer@Integer>
+@@TJclPtrHashMapBucket.MoveArray@TJclPtrHashMapEntryArray@SizeInt@SizeInt@SizeInt
+<copy MoveArray@TDynObjectArray@SizeInt@SizeInt@SizeInt>
 \ \
 
 
@@ -17822,8 +17822,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclIntfIntfHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclIntfIntfHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -17937,8 +17937,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclAnsiStrIntfHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclAnsiStrIntfHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -18052,8 +18052,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclIntfAnsiStrHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclIntfAnsiStrHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -18167,8 +18167,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclAnsiStrAnsiStrHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclAnsiStrAnsiStrHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -18282,8 +18282,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclWideStrIntfHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclWideStrIntfHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -18397,8 +18397,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclIntfWideStrHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclIntfWideStrHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -18512,8 +18512,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclWideStrWideStrHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclWideStrWideStrHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -18627,8 +18627,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclUnicodeStrIntfHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclUnicodeStrIntfHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -18742,8 +18742,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclIntfUnicodeStrHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclIntfUnicodeStrHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -18857,8 +18857,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclUnicodeStrUnicodeStrHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclUnicodeStrUnicodeStrHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -18972,8 +18972,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclSingleIntfHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclSingleIntfHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -19087,8 +19087,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclIntfSingleHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclIntfSingleHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -19202,8 +19202,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclSingleSingleHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclSingleSingleHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -19317,8 +19317,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclDoubleIntfHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclDoubleIntfHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -19432,8 +19432,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclIntfDoubleHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclIntfDoubleHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -19547,8 +19547,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclDoubleDoubleHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclDoubleDoubleHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -19662,8 +19662,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclExtendedIntfHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclExtendedIntfHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -19777,8 +19777,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclIntfExtendedHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclIntfExtendedHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -19892,8 +19892,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclExtendedExtendedHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclExtendedExtendedHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -20007,8 +20007,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclIntegerIntfHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclIntegerIntfHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -20122,8 +20122,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclIntfIntegerHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclIntfIntegerHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -20237,8 +20237,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclIntegerIntegerHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclIntegerIntegerHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -20352,8 +20352,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclCardinalIntfHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclCardinalIntfHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -20467,8 +20467,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclIntfCardinalHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclIntfCardinalHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -20582,8 +20582,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclCardinalCardinalHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclCardinalCardinalHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -20697,8 +20697,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclInt64IntfHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclInt64IntfHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -20812,8 +20812,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclIntfInt64HashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclIntfInt64HashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -20927,8 +20927,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclInt64Int64HashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclInt64Int64HashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -21042,8 +21042,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclPtrIntfHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclPtrIntfHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -21157,8 +21157,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclIntfPtrHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclIntfPtrHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -21272,8 +21272,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclPtrPtrHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclPtrPtrHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -21387,8 +21387,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclIntfHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclIntfHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -21508,8 +21508,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclAnsiStrHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclAnsiStrHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -21629,8 +21629,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclWideStrHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclWideStrHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -21750,8 +21750,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclUnicodeStrHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclUnicodeStrHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -21871,8 +21871,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclSingleHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclSingleHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -21992,8 +21992,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclDoubleHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclDoubleHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -22113,8 +22113,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclExtendedHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclExtendedHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -22234,8 +22234,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclIntegerHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclIntegerHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -22355,8 +22355,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclCardinalHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclCardinalHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -22476,8 +22476,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclInt64HashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclInt64HashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -22597,8 +22597,8 @@
 <copy !!MEMBEROVERVIEW_TJclHashMap>
 \ \
 
-@@TJclPtrHashMap.HashFunction
-<copy TJclHashMap.HashFunction>
+@@TJclPtrHashMap.HashToRangeFunction
+<copy TJclHashMap.HashToRangeFunction>
 \ \
 
 
@@ -22748,10 +22748,6 @@
 <copy TJclHashSet.ContainsAll@IJclCollection>
 \ \
 
-@@TJclIntfHashSet.Create@IJclIntfMap
-<copy TJclHashSet.Create@IJclMap>
-\ \
-
 @@TJclIntfHashSet.Create@Integer
 <copy TJclHashSet.Create@Integer@Boolean>
 \ \
@@ -22776,46 +22772,10 @@
 <copy TJclHashSet.First>
 \ \
 
-@@TJclIntfHashSet.GetAllowDefaultElements
-<copy TJclHashSet.GetAllowDefaultElements>
-\ \
-
-@@TJclIntfHashSet.GetAutoPackParameter
-<copy TJclHashSet.GetAutoPackParameter>
-\ \
-
-@@TJclIntfHashSet.GetAutoPackStrategy
-<copy TJclHashSet.GetAutoPackStrategy>
-\ \
-
-@@TJclIntfHashSet.GetCapacity
-<copy TJclHashSet.GetCapacity>
-\ \
-
-@@TJclIntfHashSet.GetDuplicates
-<copy TJclHashSet.GetDuplicates>
-\ \
-
 @@TJclIntfHashSet.GetEnumerator
 <copy TJclHashSet.GetEnumerator>
 \ \
 
-@@TJclIntfHashSet.GetReadOnly
-<copy TJclHashSet.GetReadOnly>
-\ \
-
-@@TJclIntfHashSet.GetRemoveSingleElement
-<copy TJclHashSet.GetRemoveSingleElement>
-\ \
-
-@@TJclIntfHashSet.GetReturnDefaultElements
-<copy TJclHashSet.GetReturnDefaultElements>
-\ \
-
-@@TJclIntfHashSet.GetThreadSafe
-<copy TJclHashSet.GetThreadSafe>
-\ \
-
 @@TJclIntfHashSet.Intersect@IJclIntfCollection
 <copy TJclHashSet.Intersect@IJclCollection>
 \ \
@@ -22844,42 +22804,10 @@
 <copy TJclHashSet.RetainAll@IJclCollection>
 \ \
 
-@@TJclIntfHashSet.SetAllowDefaultElements@Boolean
-<copy TJclHashSet.SetAllowDefaultElements@Boolean>
-\ \
-
-@@TJclIntfHashSet.SetAutoPackParameter@Integer
-<copy TJclHashSet.SetAutoPackParameter@Integer>
-\ \
-
-@@TJclIntfHashSet.SetAutoPackStrategy@TJclAutoPackStrategy
-<copy TJclHashSet.SetAutoPackStrategy@TJclAutoPackStrategy>
-\ \
-
 @@TJclIntfHashSet.SetCapacity@Integer
 <copy TJclHashSet.SetCapacity@Integer>
 \ \
 
-@@TJclIntfHashSet.SetDuplicates@TDuplicates
-<copy TJclHashSet.SetDuplicates@TDuplicates>
-\ \
-
-@@TJclIntfHashSet.SetReadOnly@Boolean
-<copy TJclHashSet.SetReadOnly@Boolean>
-\ \
-
-@@TJclIntfHashSet.SetRemoveSingleElement@Boolean
-<copy TJclHashSet.SetRemoveSingleElement@Boolean>
-\ \
-
-@@TJclIntfHashSet.SetReturnDefaultElements@Boolean
-<copy TJclHashSet.SetReturnDefaultElements@Boolean>
-\ \
-
-@@TJclIntfHashSet.SetThreadSafe@Boolean
-<copy TJclHashSet.SetThreadSafe@Boolean>
-\ \
-
 @@TJclIntfHashSet.Size
 <copy TJclHashSet.Size>
 \ \
@@ -22927,10 +22855,6 @@
 <copy TJclHashSet.ContainsAll@IJclCollection>
 \ \
 
-@@TJclAnsiStrHashSet.Create@IJclAnsiStrMap
-<copy TJclHashSet.Create@IJclMap>
-\ \
-
 @@TJclAnsiStrHashSet.Create@Integer
 <copy TJclHashSet.Create@Integer@Boolean>
 \ \
@@ -22955,46 +22879,10 @@
 <copy TJclHashSet.First>
 \ \
 
-@@TJclAnsiStrHashSet.GetAllowDefaultElements
-<copy TJclHashSet.GetAllowDefaultElements>
-\ \
-
-@@TJclAnsiStrHashSet.GetAutoPackParameter
-<copy TJclHashSet.GetAutoPackParameter>
-\ \
-
-@@TJclAnsiStrHashSet.GetAutoPackStrategy
-<copy TJclHashSet.GetAutoPackStrategy>
-\ \
-
-@@TJclAnsiStrHashSet.GetCapacity
-<copy TJclHashSet.GetCapacity>
-\ \
-
-@@TJclAnsiStrHashSet.GetDuplicates
-<copy TJclHashSet.GetDuplicates>
-\ \
-
 @@TJclAnsiStrHashSet.GetEnumerator
 <copy TJclHashSet.GetEnumerator>
 \ \
 
-@@TJclAnsiStrHashSet.GetReadOnly
-<copy TJclHashSet.GetReadOnly>
-\ \
-
-@@TJclAnsiStrHashSet.GetRemoveSingleElement
-<copy TJclHashSet.GetRemoveSingleElement>
-\ \
-
-@@TJclAnsiStrHashSet.GetReturnDefaultElements
-<copy TJclHashSet.GetReturnDefaultElements>
-\ \
-
-@@TJclAnsiStrHashSet.GetThreadSafe
-<copy TJclHashSet.GetThreadSafe>
-\ \
-
 @@TJclAnsiStrHashSet.Intersect@IJclAnsiStrCollection
 <copy TJclHashSet.Intersect@IJclCollection>
 \ \
@@ -23023,42 +22911,10 @@
 <copy TJclHashSet.RetainAll@IJclCollection>
 \ \
 
-@@TJclAnsiStrHashSet.SetAllowDefaultElements@Boolean
-<copy TJclHashSet.SetAllowDefaultElements@Boolean>
-\ \
-
-@@TJclAnsiStrHashSet.SetAutoPackParameter@Integer
-<copy TJclHashSet.SetAutoPackParameter@Integer>
-\ \
-
-@@TJclAnsiStrHashSet.SetAutoPackStrategy@TJclAutoPackStrategy
-<copy TJclHashSet.SetAutoPackStrategy@TJclAutoPackStrategy>
-\ \
-
 @@TJclAnsiStrHashSet.SetCapacity@Integer
 <copy TJclHashSet.SetCapacity@Integer>
 \ \
 
-@@TJclAnsiStrHashSet.SetDuplicates@TDuplicates
-<copy TJclHashSet.SetDuplicates@TDuplicates>
-\ \
-
-@@TJclAnsiStrHashSet.SetReadOnly@Boolean
-<copy TJclHashSet.SetReadOnly@Boolean>
-\ \
-
-@@TJclAnsiStrHashSet.SetRemoveSingleElement@Boolean
-<copy TJclHashSet.SetRemoveSingleElement@Boolean>
-\ \
-
-@@TJclAnsiStrHashSet.SetReturnDefaultElements@Boolean
-<copy TJclHashSet.SetReturnDefaultElements@Boolean>
-\ \
-
-@@TJclAnsiStrHashSet.SetThreadSafe@Boolean
-<copy TJclHashSet.SetThreadSafe@Boolean>
-\ \
-
 @@TJclAnsiStrHashSet.Size
 <copy TJclHashSet.Size>
 \ \
@@ -23106,10 +22962,6 @@
 <copy TJclHashSet.ContainsAll@IJclCollection>
 \ \
 
-@@TJclWideStrHashSet.Create@IJclWideStrMap
-<copy TJclHashSet.Create@IJclMap>
-\ \
-
 @@TJclWideStrHashSet.Create@Integer
 <copy TJclHashSet.Create@Integer@Boolean>
 \ \
@@ -23134,46 +22986,10 @@
 <copy TJclHashSet.First>
 \ \
 
-@@TJclWideStrHashSet.GetAllowDefaultElements
-<copy TJclHashSet.GetAllowDefaultElements>
-\ \
-
-@@TJclWideStrHashSet.GetAutoPackParameter
-<copy TJclHashSet.GetAutoPackParameter>
-\ \
-
-@@TJclWideStrHashSet.GetAutoPackStrategy
-<copy TJclHashSet.GetAutoPackStrategy>
-\ \
-
-@@TJclWideStrHashSet.GetCapacity
-<copy TJclHashSet.GetCapacity>
-\ \
-
-@@TJclWideStrHashSet.GetDuplicates
-<copy TJclHashSet.GetDuplicates>
-\ \
-
 @@TJclWideStrHashSet.GetEnumerator
 <copy TJclHashSet.GetEnumerator>
 \ \
 
-@@TJclWideStrHashSet.GetReadOnly
-<copy TJclHashSet.GetReadOnly>
-\ \
-
-@@TJclWideStrHashSet.GetRemoveSingleElement
-<copy TJclHashSet.GetRemoveSingleElement>
-\ \
-
-@@TJclWideStrHashSet.GetReturnDefaultElements
-<copy TJclHashSet.GetReturnDefaultElements>
-\ \
-
-@@TJclWideStrHashSet.GetThreadSafe
-<copy TJclHashSet.GetThreadSafe>
-\ \
-
 @@TJclWideStrHashSet.Intersect@IJclWideStrCollection
 <copy TJclHashSet.Intersect@IJclCollection>
 \ \
@@ -23202,42 +23018,10 @@
 <copy TJclHashSet.RetainAll@IJclCollection>
 \ \
 
-@@TJclWideStrHashSet.SetAllowDefaultElements@Boolean
-<copy TJclHashSet.SetAllowDefaultElements@Boolean>
-\ \
-
-@@TJclWideStrHashSet.SetAutoPackParameter@Integer
-<copy TJclHashSet.SetAutoPackParameter@Integer>
-\ \
-
-@@TJclWideStrHashSet.SetAutoPackStrategy@TJclAutoPackStrategy
-<copy TJclHashSet.SetAutoPackStrategy@TJclAutoPackStrategy>
-\ \
-
 @@TJclWideStrHashSet.SetCapacity@Integer
 <copy TJclHashSet.SetCapacity@Integer>
 \ \
 
-@@TJclWideStrHashSet.SetDuplicates@TDuplicates
-<copy TJclHashSet.SetDuplicates@TDuplicates>
-\ \
-
-@@TJclWideStrHashSet.SetReadOnly@Boolean
-<copy TJclHashSet.SetReadOnly@Boolean>
-\ \
-
-@@TJclWideStrHashSet.SetRemoveSingleElement@Boolean
-<copy TJclHashSet.SetRemoveSingleElement@Boolean>
-\ \
-
-@@TJclWideStrHashSet.SetReturnDefaultElements@Boolean
-<copy TJclHashSet.SetReturnDefaultElements@Boolean>
-\ \
-
-@@TJclWideStrHashSet.SetThreadSafe@Boolean
-<copy TJclHashSet.SetThreadSafe@Boolean>
-\ \
-
 @@TJclWideStrHashSet.Size
 <copy TJclHashSet.Size>
 \ \
@@ -23285,10 +23069,6 @@
 <copy TJclHashSet.ContainsAll@IJclCollection>
 \ \
 
-@@TJclUnicodeStrHashSet.Create@IJclUnicodeStrMap
-<copy TJclHashSet.Create@IJclMap>
-\ \
-
 @@TJclUnicodeStrHashSet.Create@Integer
 <copy TJclHashSet.Create@Integer@Boolean>
 \ \
@@ -23313,46 +23093,10 @@
 <copy TJclHashSet.First>
 \ \
 
-@@TJclUnicodeStrHashSet.GetAllowDefaultElements
-<copy TJclHashSet.GetAllowDefaultElements>
-\ \
-
-@@TJclUnicodeStrHashSet.GetAutoPackParameter
-<copy TJclHashSet.GetAutoPackParameter>
-\ \
-
-@@TJclUnicodeStrHashSet.GetAutoPackStrategy
-<copy TJclHashSet.GetAutoPackStrategy>
-\ \
-
-@@TJclUnicodeStrHashSet.GetCapacity
-<copy TJclHashSet.GetCapacity>
-\ \
-
-@@TJclUnicodeStrHashSet.GetDuplicates
-<copy TJclHashSet.GetDuplicates>
-\ \
-
 @@TJclUnicodeStrHashSet.GetEnumerator
 <copy TJclHashSet.GetEnumerator>
 \ \
 
-@@TJclUnicodeStrHashSet.GetReadOnly
-<copy TJclHashSet.GetReadOnly>
-\ \
-
-@@TJclUnicodeStrHashSet.GetRemoveSingleElement
-<copy TJclHashSet.GetRemoveSingleElement>
-\ \
-
-@@TJclUnicodeStrHashSet.GetReturnDefaultElements
-<copy TJclHashSet.GetReturnDefaultElements>
-\ \
-
-@@TJclUnicodeStrHashSet.GetThreadSafe
-<copy TJclHashSet.GetThreadSafe>
-\ \
-
 @@TJclUnicodeStrHashSet.Intersect@IJclUnicodeStrCollection
 <copy TJclHashSet.Intersect@IJclCollection>
 \ \
@@ -23381,42 +23125,10 @@
 <copy TJclHashSet.RetainAll@IJclCollection>
 \ \
 
-@@TJclUnicodeStrHashSet.SetAllowDefaultElements@Boolean
-<copy TJclHashSet.SetAllowDefaultElements@Boolean>
-\ \
-
-@@TJclUnicodeStrHashSet.SetAutoPackParameter@Integer
-<copy TJclHashSet.SetAutoPackParameter@Integer>
-\ \
-
-@@TJclUnicodeStrHashSet.SetAutoPackStrategy@TJclAutoPackStr...
 
[truncated message content]

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

[<ou...@us...>]

Revision: 3839
          http://jcl.svn.sourceforge.net/jcl/?rev=3839&view=rev
Author:   outchy
Date:     2012-08-20 14:14:38 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
expand environment variables on override to avoid endless loops.

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

Modified: trunk/jcl/source/common/JclIDEUtils.pas
===================================================================
--- trunk/jcl/source/common/JclIDEUtils.pas	2012-08-20 10:22:37 UTC (rev 3838)
+++ trunk/jcl/source/common/JclIDEUtils.pas	2012-08-20 14:14:38 UTC (rev 3839)
@@ -2073,7 +2073,7 @@
 function TJclBorRADToolInstallation.GetEnvironmentVariables: TStrings;
 var
   EnvNames: TStringList;
-  EnvVarKeyName: string;
+  EnvVarKeyName, EnvVarValue: string;
   I: Integer;
 begin
   if FEnvironmentVariables = nil then
@@ -2098,8 +2098,9 @@
         for I := 0 to EnvNames.Count - 1 do
         begin
           EnvVarKeyName := EnvNames[I];
-          FEnvironmentVariables.Values[EnvVarKeyName] :=
-            ConfigData.ReadString(EnvVariablesKeyName, EnvVarKeyName, '');
+          EnvVarValue := ConfigData.ReadString(EnvVariablesKeyName, EnvVarKeyName, '');
+          ExpandEnvironmentVarCustom(EnvVarValue, FEnvironmentVariables);
+          FEnvironmentVariables.Values[EnvVarKeyName] := EnvVarValue;
         end;
       finally
         EnvNames.Free;
@@ -3662,7 +3663,7 @@
 var
   UserVariables: TStrings;
   Index: Integer;
-  EnvOptionName: string;
+  EnvOptionName, EnvOptionValue: string;
 begin
   if not Assigned(FEnvironmentVariables) then
   begin
@@ -3677,7 +3678,9 @@
         for Index := 0 to UserVariables.Count - 1 do
         begin
           EnvOptionName := UserVariables.Names[Index];
-          Result.Values[EnvOptionName] := UserVariables.Values[EnvOptionName];
+          EnvOptionValue := UserVariables.Values[EnvOptionName];
+          ExpandEnvironmentVarCustom(EnvOptionValue, Result);
+          Result.Values[EnvOptionName] := EnvOptionValue;
         end;
       finally
         UserVariables.Free;

Modified: trunk/jcl/source/common/JclSysInfo.pas
===================================================================
--- trunk/jcl/source/common/JclSysInfo.pas	2012-08-20 10:22:37 UTC (rev 3838)
+++ trunk/jcl/source/common/JclSysInfo.pas	2012-08-20 14:14:38 UTC (rev 3839)
@@ -95,6 +95,7 @@
 
 function DelEnvironmentVar(const Name: string): Boolean;
 function ExpandEnvironmentVar(var Value: string): Boolean;
+function ExpandEnvironmentVarCustom(var Value: string; Vars: TStrings): Boolean;
 function GetEnvironmentVar(const Name: string; out Value: string): Boolean; overload;
 function GetEnvironmentVar(const Name: string; out Value: string; Expand: Boolean): Boolean; overload;
 function GetEnvironmentVars(const Vars: TStrings): Boolean; overload;
@@ -1492,6 +1493,102 @@
 end;
 {$ENDIF MSWINDOWS}
 
+function ExpandEnvironmentVarCustom(var Value: string; Vars: TStrings): Boolean;
+
+  function FindClosingBrace(const R: string; var Position: Integer): Boolean;
+  var
+    Index, Len, BraceCount: Integer;
+    Quotes: string;
+  begin
+    Len := Length(R);
+    BraceCount := 0;
+    Quotes := '';
+    while (Position <= Len) do
+    begin
+      // handle quotes first
+      if (R[Position] = NativeSingleQuote) then
+      begin
+        Index := JclStrings.CharPos(Quotes, NativeSingleQuote);
+        if Index >= 0 then
+          SetLength(Quotes, Index - 1)
+        else
+          Quotes := Quotes + NativeSingleQuote;
+      end;
+
+      if (R[Position] = NativeDoubleQuote) then
+      begin
+        Index := JclStrings.CharPos(Quotes, NativeDoubleQuote);
+        if Index >= 0 then
+          SetLength(Quotes, Index - 1)
+        else
+          Quotes := Quotes + NativeDoubleQuote;
+      end;
+
+      if (R[Position] = '`') then
+      begin
+        Index := JclStrings.CharPos(Quotes, '`');
+        if Index >= 0 then
+          SetLength(Quotes, Index - 1)
+        else
+          Quotes := Quotes + '`';
+      end;
+
+      if Quotes = '' then
+      begin
+        if R[Position] = ')' then
+        begin
+          Dec(BraceCount);
+          if BraceCount = 0 then
+            Break;
+        end
+        else
+        if R[Position] = '(' then
+          Inc(BraceCount);
+      end;
+      Inc(Position);
+    end;
+    Result := Position <= Len;
+
+//    Delphi XE's CodeGear.Delphi.Targets has a bug where the closing paran is missing
+//    "'$(DelphiWin32DebugDCUPath'!=''". But it is still a valid string and not worth
+//    an exception.
+//
+//    if Position > Len then
+//      raise EJclMsBuildError.CreateResFmt(@RsEEndOfString, [S]);
+  end;
+
+var
+  Start, Position: Integer;
+  PropertyName, PropertyValue: string;
+begin
+  Result := True;
+  repeat
+    // start with the last match in order to convert $(some$(other))
+    // evaluate properties
+    Start := StrLastPos('$(', Value);
+    if Start > 0 then
+    begin
+      Position := Start;
+      if not FindClosingBrace(Value, Position) then
+        Break;
+      PropertyName := Copy(Value, Start + 2, Position - Start - 2);
+
+      PropertyValue := Vars.Values[PropertyName];
+
+      if PropertyValue <> '' then
+        StrReplace(Value,
+                   Copy(Value, Start, Position - Start + 1), // $(PropertyName)
+                   PropertyValue,
+                   [rfReplaceAll, rfIgnoreCase])
+      else
+      begin
+        Result := False;
+        Start := 0;
+      end;
+    end;
+  until Start = 0;
+end;
+
 {$IFDEF UNIX}
 
 function GetEnvironmentVar(const Name: string; var Value: string): Boolean;

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:[3838] trunk/jcl/source/common

[<ou...@us...>]

Revision: 3838
          http://jcl.svn.sourceforge.net/jcl/?rev=3838&view=rev
Author:   outchy
Date:     2012-08-20 10:22:37 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
basic support for OSX32.

Modified Paths:
--------------
    trunk/jcl/source/common/JclCompilerUtils.pas
    trunk/jcl/source/common/JclIDEUtils.pas

Modified: trunk/jcl/source/common/JclCompilerUtils.pas
===================================================================
--- trunk/jcl/source/common/JclCompilerUtils.pas	2012-08-20 10:18:08 UTC (rev 3837)
+++ trunk/jcl/source/common/JclCompilerUtils.pas	2012-08-20 10:22:37 UTC (rev 3838)
@@ -161,6 +161,12 @@
     function GetExeName: string; override;
   end;
 
+  TJclDCCOSX32 = class(TJclDCC32)
+  public
+    class function GetPlatform: string; override;
+    function GetExeName: string; override;
+  end;
+
   {$IFDEF MSWINDOWS}
   TJclDCCIL = class(TJclDCC32)
   private
@@ -191,6 +197,7 @@
   BCC32ExeName              = 'bcc32.exe';
   DCC32ExeName              = 'dcc32.exe';
   DCC64ExeName              = 'dcc64.exe';
+  DCCOSX32ExeName           = 'dccosx.exe';
   DCCILExeName              = 'dccil.exe';
   Bpr2MakExeName            = 'bpr2mak.exe';
   MakeExeName               = 'make.exe';
@@ -1200,6 +1207,18 @@
   Result := DCC64ExeName;
 end;
 
+//=== { TJclDCCOSX32 } =======================================================
+
+class function TJclDCCOSX32.GetPlatform: string;
+begin
+  Result := BDSPlatformOSX32;
+end;
+
+function TJclDCCOSX32.GetExeName: string;
+begin
+  Result := DCCOSX32ExeName;
+end;
+
 {$IFDEF MSWINDOWS}
 //=== { TJclDCCIL } ==========================================================
 

Modified: trunk/jcl/source/common/JclIDEUtils.pas
===================================================================
--- trunk/jcl/source/common/JclIDEUtils.pas	2012-08-20 10:18:08 UTC (rev 3837)
+++ trunk/jcl/source/common/JclIDEUtils.pas	2012-08-20 10:22:37 UTC (rev 3838)
@@ -138,6 +138,7 @@
   Personality32Bit        = '32 bit';
   Personality64Bit        = '64 bit';
   PersonalityDelphi       = 'Delphi';
+  PersonalityDelphiOSX    = 'Delphi for OSX';
   PersonalityDelphiDotNet = 'Delphi.net';
   PersonalityBCB          = 'C++Builder';
   PersonalityCSB          = 'C#Builder';
@@ -155,10 +156,9 @@
 
 // Installed versions information classes
 type
-  TJclBorPersonality = (bpDelphi32, bpDelphi64, bpBCBuilder32, bpBCBuilder64,
+  TJclBorPersonality = (bpDelphi32, bpDelphi64, bpDelphiOSX32, bpBCBuilder32, bpBCBuilder64,
     bpDelphiNet32, bpDelphiNet64, bpCSBuilder32, bpCSBuilder64,
     bpVisualBasic32, bpVisualBasic64, bpDesign, bpUnknown);
-  //  bpDelphi64, bpBCBuilder64);
 
   TJclBorPersonalities = set of TJclBorPersonality;
 
@@ -173,6 +173,7 @@
    (
     Personality32Bit + ' ' + PersonalityDelphi,
     Personality64Bit + ' ' + PersonalityDelphi,
+    Personality32Bit + ' ' + PersonalityDelphiOSX,
     Personality32Bit + ' ' + PersonalityBCB,
     Personality64Bit + ' ' + PersonalityBCB,
     Personality32Bit + ' ' + PersonalityDelphiDotNet,
@@ -313,7 +314,7 @@
     property Pages: TStrings read GetPages;
   end;
 
-  TCommandLineTool = (clAsm, clBcc32, clDcc32, clDcc64, clDccIL, clMake, clProj2Mak);
+  TCommandLineTool = (clAsm, clBcc32, clDcc32, clDcc64, clDccOSX32, clDccIL, clMake, clProj2Mak);
   TCommandLineTools = set of TCommandLineTool;
 
   TJclBorRADToolInstallationClass = class of TJclBorRADToolInstallation;
@@ -588,6 +589,7 @@
     FHelp2Manager: TJclHelp2Manager;
     FDCCIL: TJclDCCIL;
     FDCC64: TJclDCC64;
+    FDCCOSX32: TJclDCCOSX32;
     FPdbCreate: Boolean;
     procedure SetDualPackageInstallation(const Value: Boolean);
     function GetCppPathsKeyName: string;
@@ -605,6 +607,7 @@
     procedure SetRawCppIncludePath(APlatform: TJclBDSPlatform; const Value: TJclBorRADToolPath);
     function GetMaxDelphiCLRVersion: string;
     function GetDCC64: TJclDCC64;
+    function GetDCCOSX32: TJclDCCOSX32;
     function GetDCCIL: TJclDCCIL;
 
     function GetMsBuildEnvOptionsFileName: string;
@@ -681,6 +684,7 @@
     property DualPackageInstallation: Boolean read FDualPackageInstallation write SetDualPackageInstallation;
     property Help2Manager: TJclHelp2Manager read FHelp2Manager;
     property DCC64: TJclDCC64 read GetDCC64;
+    property DCCOSX32: TJclDCCOSX32 read GetDCCOSX32;
     property DCCIL: TJclDCCIL read GetDCCIL;
     property MaxDelphiCLRVersion: string read GetMaxDelphiCLRVersion;
     property PdbCreate: Boolean read FPdbCreate write FPdbCreate;
@@ -1648,6 +1652,8 @@
     Include(FCommandLineTools, clDcc32);
   if FileExists(BinFolderName + DCC64ExeName) then
     Include(FCommandLineTools, clDcc64);
+  if FileExists(BinFolderName + DCCOSX32ExeName) then
+    Include(FCommandLineTools, clDccOSX32);
   {$IFDEF MSWINDOWS}
   if FileExists(BinFolderName + DCCILExeName) then
     Include(FCommandLineTools, clDccIL);
@@ -1763,7 +1769,8 @@
 procedure TJclBorRADToolInstallation.CheckPlatform(APlatform: TJclBDSPlatform);
 begin
   if ((APlatform = bpWin32) and ([bpDelphi32,bpBCBuilder32] * Personalities = [])) or
-     ((APlatform = bpWin64) and ([bpDelphi64,bpBCBuilder64] * Personalities = [])) then
+     ((APlatform = bpWin64) and ([bpDelphi64,bpBCBuilder64] * Personalities = [])) or
+     ((APlatform = bpOSX32) and ([bpDelphiOSX32] * Personalities = [])) then
     raise EJclBorRADException.CreateRes(@RsEPlatformNotValid);
 end;
 
@@ -3233,12 +3240,15 @@
     Include(FPersonalities, bpDelphi32);
   if clDcc64 in CommandLineTools then
     Include(FPersonalities, bpDelphi64);
+  if clDccOSX32 in CommandLineTools then
+    Include(FPersonalities, bpDelphiOSX32);
 end;
 
 destructor TJclBDSInstallation.Destroy;
 begin
   FreeAndNil(FDCCIL);
   FreeAndNil(FDCC64);
+  FreeAndNil(FDCCOSX32);
   FreeAndNil(FHelp2Manager);
   inherited Destroy;
 end;
@@ -3566,6 +3576,19 @@
   Result := FDCC64;
 end;
 
+function TJclBDSInstallation.GetDCCOSX32: TJclDCCOSX32;
+begin
+  if not Assigned(FDCCOSX32) then
+  begin
+    if not (clDccOSX32 in CommandLineTools) then
+      raise EJclBorRadException.CreateResFmt(@RsENotFound, [DccOSX32ExeName]);
+    FDCCOSX32 := TJclDCCOSX32.Create(BinFolderName, LongPathBug, CompilerSettingsFormat,
+                                     SupportsNoConfig, SupportsPlatform, DCPOutputPath[bpOSX32], LibFolderName[bpOSX32],
+                                     LibDebugFolderName[bpOSX32], ObjFolderName[bpOSX32]);
+  end;
+  Result := FDCCOSX32;
+end;
+
 function TJclBDSInstallation.GetDCCIL: TJclDCCIL;
 begin
   if not Assigned(FDCCIL) then
@@ -4120,6 +4143,8 @@
   inherited SetOutputCallback(Value);
   if clDcc64 in CommandLineTools then
     DCC64.OutputCallback := Value;
+  if clDccOSX32 in CommandLineTools then
+    DCCOSX32.OutputCallback := Value;
   if clDccIL in CommandLineTools then
     DCCIL.OutputCallback := Value;
 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:[3837] trunk/jcl/source/common/JclIDEUtils.pas

[<ou...@us...>]

Revision: 3837
          http://jcl.svn.sourceforge.net/jcl/?rev=3837&view=rev
Author:   outchy
Date:     2012-08-20 10:18:08 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
rework platform checks.

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

Modified: trunk/jcl/source/common/JclIDEUtils.pas
===================================================================
--- trunk/jcl/source/common/JclIDEUtils.pas	2012-08-20 10:12:14 UTC (rev 3836)
+++ trunk/jcl/source/common/JclIDEUtils.pas	2012-08-20 10:18:08 UTC (rev 3837)
@@ -431,7 +431,8 @@
     function GetSupportsNoConfig: Boolean;
     function GetSupportsPlatform: Boolean;
 
-    procedure CheckWin32Only(APlatform: TJclBDSPlatform);
+    procedure CheckPlatform(APlatform: TJclBDSPlatform);
+    procedure CheckCBuilderPlatform(APlatform: TJclBDSPlatform);
   public
     constructor Create(const AConfigDataLocation: string; ARootKey: Cardinal = 0); virtual;
 
@@ -1679,6 +1680,8 @@
 var
   TempRawDebugDCUPath: TJclBorRADToolPath;
 begin
+  CheckPlatform(APlatform);
+
   if Path <> '' then
   begin
     TempRawDebugDCUPath := RawDebugDCUPath[APlatform];
@@ -1694,6 +1697,8 @@
 var
   TempRawLibraryPath: TJclBorRADToolPath;
 begin
+  CheckPlatform(APlatform);
+
   if Path <> '' then
   begin
     TempRawLibraryPath := RawLibrarySearchPath[APlatform];
@@ -1709,6 +1714,8 @@
 var
   TempRawLibraryPath: TJclBorRADToolPath;
 begin
+  CheckPlatform(APlatform);
+
   if Path <> '' then
   begin
     TempRawLibraryPath := RawLibraryBrowsingPath[APlatform];
@@ -1747,17 +1754,19 @@
   StrToStrings(Path, PathSep, List);
 end;
 
-procedure TJclBorRADToolInstallation.CheckWin32Only(APlatform: TJclBDSPlatform);
+procedure TJclBorRADToolInstallation.CheckCBuilderPlatform(APlatform: TJclBDSPlatform);
 begin
-  case APlatform of
-    bpWin32: ;
-    bpWin64:
-      raise EJclBorRADException.CreateRes(@RsEWin64PlatformNotValid);
-  else
+  if ((APlatform = bpWin32) and not (bpBCBuilder32 in Personalities)) then
     raise EJclBorRADException.CreateRes(@RsEPlatformNotValid);
-  end;
 end;
 
+procedure TJclBorRADToolInstallation.CheckPlatform(APlatform: TJclBDSPlatform);
+begin
+  if ((APlatform = bpWin32) and ([bpDelphi32,bpBCBuilder32] * Personalities = [])) or
+     ((APlatform = bpWin64) and ([bpDelphi64,bpBCBuilder64] * Personalities = [])) then
+    raise EJclBorRADException.CreateRes(@RsEPlatformNotValid);
+end;
+
 function TJclBorRADToolInstallation.CompileBCBPackage(const PackageName, BPLPath, DCPPath: string): Boolean;
 var
   SaveDir, PackagePath, MakeFileName: string;
@@ -1930,7 +1939,7 @@
 
 function TJclBorRADToolInstallation.GetBPLOutputPath(APlatform: TJclBDSPlatform): string;
 begin
-  CheckWin32Only(APlatform);
+  CheckPlatform(APlatform);
   Result := SubstitutePath(ConfigData.ReadString(LibraryKeyName, LibraryBPLOutputValueName, ''));
 end;
 
@@ -1995,13 +2004,13 @@
 
 function TJclBorRADToolInstallation.GetDCPOutputPath(APlatform: TJclBDSPlatform): string;
 begin
-  CheckWin32Only(APlatform);
+  CheckPlatform(APlatform);
   Result := SubstitutePath(ConfigData.ReadString(LibraryKeyName, LibraryDCPOutputValueName, ''));
 end;
 
 function TJclBorRADToolInstallation.GetDebugDCUPath(APlatform: TJclBDSPlatform): string;
 begin
-  CheckWin32Only(APlatform);
+  CheckPlatform(APlatform);
   Result := ConfigData.ReadString(DebuggingKeyName, DebugDCUPathValueName, '');
 end;
 
@@ -2142,7 +2151,7 @@
 
 function TJclBorRADToolInstallation.GetLibrarySearchPath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
-  CheckWin32Only(APlatform);
+  CheckPlatform(APlatform);
   Result := ConfigData.ReadString(LibraryKeyName, LibrarySearchPathValueName, '');
 end;
 
@@ -2167,19 +2176,19 @@
 
 function TJclBorRADToolInstallation.GetLibDebugFolderName(APlatform: TJclBDSPlatform): string;
 begin
-  CheckWin32Only(APlatform);
+  CheckPlatform(APlatform);
   Result := LibFolderName[APlatform] + PathAddSeparator('debug');
 end;
 
 function TJclBorRADToolInstallation.GetLibFolderName(APlatform: TJclBDSPlatform): string;
 begin
-  CheckWin32Only(APlatform);
+  CheckPlatform(APlatform);
   Result := PathAddSeparator(RootDir) + PathAddSeparator('lib');
 end;
 
 function TJclBorRADToolInstallation.GetLibraryBrowsingPath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
-  CheckWin32Only(APlatform);
+  CheckPlatform(APlatform);
   Result := ConfigData.ReadString(LibraryKeyName, LibraryBrowsingPathValueName, '');
 end;
 
@@ -2190,6 +2199,8 @@
 
 function TJclBorRADToolInstallation.GetObjFolderName(APlatform: TJclBDSPlatform): string;
 begin
+  CheckCBuilderPlatform(APlatform);
+
   if RadToolKind = brCppBuilder then
     Result := LibFolderName[APlatform] + PathAddSeparator('obj')
   else
@@ -2205,19 +2216,19 @@
 
 function TJclBorRADToolInstallation.GetRawDebugDCUPath(APlatform: TJclBDSPlatform): string;
 begin
-  CheckWin32Only(APlatform);
+  CheckPlatform(APlatform);
   Result := GetDebugDCUPath(APlatform);
 end;
 
 function TJclBorRADToolInstallation.GetRawLibrarySearchPath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
-  CheckWin32Only(APlatform);
+  CheckPlatform(APlatform);
   Result := GetLibrarySearchPath(APlatform);
 end;
 
 function TJclBorRADToolInstallation.GetRawLibraryBrowsingPath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
-  CheckWin32Only(APlatform);
+  CheckPlatform(APlatform);
   Result := GetLibraryBrowsingPath(APlatform);
 end;
 
@@ -2255,7 +2266,7 @@
 
 function TJclBorRADToolInstallation.GetVclIncludeDir(APlatform: TJclBDSPlatform): string;
 begin
-  CheckWin32Only(APlatform);
+  CheckCBuilderPlatform(APlatform);
   Result := Format(VclIncludeDirName, [RootDir]);
   if not DirectoryExists(Result) then
     Result := '';
@@ -2664,6 +2675,8 @@
 var
   TempRawDebugDCUPath: TJclBorRADToolPath;
 begin
+  CheckPlatform(APlatform);
+
   TempRawDebugDCUPath := RawDebugDCUPath[APlatform];
   Result := RemoveFromPath(TempRawDebugDCUPath, Path);
   RawDebugDCUPath[APlatform] := TempRawDebugDCUPath;
@@ -2673,6 +2686,8 @@
 var
   TempRawLibraryPath: TJclBorRADToolPath;
 begin
+  CheckPlatform(APlatform);
+
   TempRawLibraryPath := RawLibrarySearchPath[APlatform];
   Result := RemoveFromPath(TempRawLibraryPath, Path);
   RawLibrarySearchPath[APlatform] := TempRawLibraryPath;
@@ -2682,6 +2697,8 @@
 var
   TempRawLibraryPath: TJclBorRADToolPath;
 begin
+  CheckPlatform(APlatform);
+
   TempRawLibraryPath := RawLibraryBrowsingPath[APlatform];
   Result := RemoveFromPath(TempRawLibraryPath, Path);
   RawLibraryBrowsingPath[APlatform] := TempRawLibraryPath;
@@ -2742,19 +2759,19 @@
 
 procedure TJclBorRADToolInstallation.SetRawDebugDCUPath(APlatform: TJclBDSPlatform; const Value: TJclBorRADToolPath);
 begin
-  CheckWin32Only(APlatform);
+  CheckPlatform(APlatform);
   ConfigData.WriteString(DebuggingKeyName, DebugDCUPathValueName, Value);
 end;
 
 procedure TJclBorRADToolInstallation.SetRawLibrarySearchPath(APlatform: TJclBDSPlatform; const Value: TJclBorRADToolPath);
 begin
-  CheckWin32Only(APlatform);
+  CheckPlatform(APlatform);
   ConfigData.WriteString(LibraryKeyName, LibrarySearchPathValueName, Value);
 end;
 
 procedure TJclBorRADToolInstallation.SetRawLibraryBrowsingPath(APlatform: TJclBDSPlatform; const Value: TJclBorRADToolPath);
 begin
-  CheckWin32Only(APlatform);
+  CheckPlatform(APlatform);
   ConfigData.WriteString(LibraryKeyName, LibraryBrowsingPathValueName, Value);
 end;
 
@@ -3230,7 +3247,9 @@
 var
   TempRawCppPath: TJclBorRADToolPath;
 begin
-  if (bpBCBuilder32 in Personalities) and (Path <> '') then
+  CheckCBuilderPlatform(APlatform);
+
+  if Path <> '' then
   begin
     TempRawCppPath := RawCppBrowsingPath[APlatform];
     PathListIncludeItems(TempRawCppPath, Path);
@@ -3245,7 +3264,9 @@
 var
   TempRawCppPath: TJclBorRADToolPath;
 begin
-  if (bpBCBuilder32 in Personalities) and (Path <> '') then
+  CheckCBuilderPlatform(APlatform);
+
+  if Path <> '' then
   begin
     TempRawCppPath := RawCppSearchPath[APlatform];
     PathListIncludeItems(TempRawCppPath, Path);
@@ -3260,7 +3281,9 @@
 var
   TempRawLibraryPath: TJclBorRADToolPath;
 begin
-  if (bpBCBuilder32 in Personalities) and (IDEVersionNumber >= 5) and (Path <> '') then
+  CheckCBuilderPlatform(APlatform);
+
+  if (IDEVersionNumber >= 5) and (Path <> '') then
   begin
     TempRawLibraryPath := RawCppLibraryPath[APlatform];
     PathListIncludeItems(TempRawLibraryPath, Path);
@@ -3275,7 +3298,9 @@
 var
   TempRawIncludePath: TJclBorRADToolPath;
 begin
-  if (bpBCBuilder32 in Personalities) and (IDEVersionNumber >= 5) and (Path <> '') then
+  CheckCBuilderPlatform(APlatform);
+
+  if (IDEVersionNumber >= 5) and (Path <> '') then
   begin
     TempRawIncludePath := RawCppIncludePath[APlatform];
     PathListIncludeItems(TempRawIncludePath, Path);
@@ -3412,51 +3437,39 @@
 function TJclBDSInstallation.GetBDSPlatformStr(APlatform: TJclBDSPlatform): string;
 begin
   Result := '';
-  if IDEVersionNumber >= 9 then
-    case APlatform of
-      bpWin32: Result := BDSPlatformWin32;
-      bpWin64: Result := BDSPlatformWin64;
-      bpOSX32: Result := BDSPlatformOSX32;
-    else
-      raise EJclBorRADException.CreateRes(@RsEPlatformNotValid);
-    end;
+  case APlatform of
+    bpWin32:
+      Result := BDSPlatformWin32;
+    bpWin64:
+      Result := BDSPlatformWin64;
+    bpOSX32:
+      Result := BDSPlatformOSX32;
+  else
+    raise EJclBorRADException.CreateRes(@RsEPlatformNotValid);
+  end;
 end;
 
 function TJclBDSInstallation.GetBPLOutputPath(APlatform: TJclBDSPlatform): string;
 begin
+  CheckPlatform(APlatform);
+
   // BDS 1 (C#Builder 1) and BDS 2 (Delphi 8) don't have a valid BPL output path
   // set in the registry
   case IDEVersionNumber of
     1, 2:
-      begin
-        CheckWin32Only(APlatform);
-        Result := PathAddSeparator(GetDefaultProjectsDir) + 'bpl';
-      end;
+      Result := PathAddSeparator(GetDefaultProjectsDir) + 'bpl';
     3, 4:
-      begin
-        CheckWin32Only(APlatform);
-        Result := inherited GetBPLOutputPath(APlatform);
-      end;
+      Result := inherited GetBPLOutputPath(APlatform);
     5, 6, 7:
       begin
-        CheckWin32Only(APlatform);
         Result := GetMsBuildEnvOption(MsBuildCBuilderBPLOutputPathNodeName, APlatform, False);
         if Result = '' then
           Result := GetMsBuildEnvOption(MsBuildWin32DLLOutputPathNodeName, APlatform, False);
       end;
-    8:
-      begin
-        CheckWin32Only(APlatform);
-        Result := GetMsBuildEnvOption(MsBuildCBuilderBPLOutputPathNodeName, APlatform, False);
-        if Result = '' then
-          Result := GetMsBuildEnvOption(MsBuildDelphiDLLOutputPathNodeName, APlatform, False);
-      end;
-    9:
-      begin
-        Result := GetMsBuildEnvOption(MsBuildCBuilderBPLOutputPathNodeName, APlatform, False);
-        if Result = '' then
-          Result := GetMsBuildEnvOption(MsBuildDelphiDLLOutputPathNodeName, APlatform, False);
-      end;
+  else
+    Result := GetMsBuildEnvOption(MsBuildCBuilderBPLOutputPathNodeName, APlatform, False);
+    if Result = '' then
+      Result := GetMsBuildEnvOption(MsBuildDelphiDLLOutputPathNodeName, APlatform, False);
   end;
 end;
 
@@ -3505,7 +3518,7 @@
 
 function TJclBDSInstallation.GetCppBrowsingPath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
-  CheckWin32Only(APlatform);
+  CheckCBuilderPlatform(APlatform);
   if IDEVersionNumber >= 5 then
     // use EnvOptions.proj
     Result := GetMsBuildEnvOption(MsBuildCBuilderBrowsingPathNodeName, APlatform, False)
@@ -3515,14 +3528,14 @@
 
 function TJclBDSInstallation.GetCppSearchPath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
-  CheckWin32Only(APlatform);
+  CheckCBuilderPlatform(APlatform);
   // CPP search path is only in the registry
   Result := ConfigData.ReadString(GetCppPathsKeyName, CppSearchPathValueName, '');
 end;
 
 function TJclBDSInstallation.GetCppLibraryPath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
-  CheckWin32Only(APlatform);
+  CheckCBuilderPlatform(APlatform);
   if IDEVersionNumber >= 5 then
     // use EnvOptions.proj
     Result := GetMsBuildEnvOption(MsBuildCBuilderLibraryPathNodeName, APlatform, False)
@@ -3532,7 +3545,7 @@
 
 function TJclBDSInstallation.GetCppIncludePath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
-  CheckWin32Only(APlatform);
+  CheckCBuilderPlatform(APlatform);
   if IDEVersionNumber >= 5 then
     // use EnvOptions.proj
     Result := GetMsBuildEnvOption(MsBuildCBuilderIncludePathNodeName, APlatform, False)
@@ -3567,31 +3580,18 @@
 
 function TJclBDSInstallation.GetDCPOutputPath(APlatform: TJclBDSPlatform): string;
 begin
+  CheckPlatform(APlatform);
+
   case IDEVersionNumber of
     1, 2:
-      begin
-        CheckWin32Only(APlatform);
-        // hard-coded
-        Result := PathAddSeparator(RootDir) + 'lib';
-      end;
+      // hard-coded
+      Result := PathAddSeparator(RootDir) + 'lib';
     3, 4:
-      begin
-        CheckWin32Only(APlatform);
-        // use registry
-        Result := inherited GetDCPOutputPath(APlatform);
-      end;
+      // use registry
+      Result := inherited GetDCPOutputPath(APlatform);
     5, 6, 7:
-      begin
-        CheckWin32Only(APlatform);
-        // use EnvOptions.proj
-        Result := GetMsBuildEnvOption(MsBuildWin32DCPOutputNodeName, APlatform, False);
-      end;
-    8:
-      begin
-        CheckWin32Only(APlatform);
-        // use EnvOptions.proj
-        Result := GetMsBuildEnvOption(MsBuildDelphiDCPOutputNodeName, APlatform, False);
-      end;
+      // use EnvOptions.proj
+      Result := GetMsBuildEnvOption(MsBuildWin32DCPOutputNodeName, APlatform, False);
   else
     // use EnvOptions.proj
     Result := GetMsBuildEnvOption(MsBuildDelphiDCPOutputNodeName, APlatform, False);
@@ -3600,23 +3600,18 @@
 
 function TJclBDSInstallation.GetDebugDCUPath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
-  if IDEVersionNumber >= 9 then
+  CheckPlatform(APlatform);
+
+  if IDEVersionNumber >= 8 then
     // use EnvOptions.proj
     Result := GetMsBuildEnvOption(MsBuildDelphiDebugDCUPathNodeName, APlatform, False)
   else
-  begin
-    CheckWin32Only(APlatform);
-    if IDEVersionNumber >= 8 then
-      // use EnvOptions.proj
-      Result := GetMsBuildEnvOption(MsBuildDelphiDebugDCUPathNodeName, APlatform, False)
-    else
-    if IDEVersionNumber >= 5 then
-      // use EnvOptions.proj
-      Result := GetMsBuildEnvOption(MsBuildWin32DebugDCUPathNodeName, APlatform, False)
-    else
-      // use registry
-      Result := ConfigData.ReadString(LibraryKeyName, BDSDebugDCUPathValueName, '');
-  end;
+  if IDEVersionNumber >= 5 then
+    // use EnvOptions.proj
+    Result := GetMsBuildEnvOption(MsBuildWin32DebugDCUPathNodeName, APlatform, False)
+  else
+    // use registry
+    Result := ConfigData.ReadString(LibraryKeyName, BDSDebugDCUPathValueName, '');
 end;
 
 function TJclBDSInstallation.GetDefaultProjectsDir: string;
@@ -3695,30 +3690,22 @@
 
 function TJclBDSInstallation.GetLibDebugFolderName(APlatform: TJclBDSPlatform): string;
 begin
-  if (RadToolKind = brBorlandDevStudio) and (VersionNumber >= 9) then
+  CheckPlatform(APlatform);
+
+  if (RadToolKind = brBorlandDevStudio) and (VersionNumber >= 8) then
     Result := PathAddSeparator(RootDir) + PathAddSeparator('lib\' + GetBDSPlatformStr(APlatform) + '\debug')
   else
-  begin
-    CheckWin32Only(APlatform);
-    if (RadToolKind = brBorlandDevStudio) and (VersionNumber >= 8) then
-      Result := PathAddSeparator(RootDir) + PathAddSeparator('lib\win32\debug')
-    else
-      Result := inherited GetLibDebugFolderName(APlatform);
-  end;
+    Result := inherited GetLibDebugFolderName(APlatform);
 end;
 
 function TJclBDSInstallation.GetLibFolderName(APlatform: TJclBDSPlatform): string;
 begin
-  if (RadToolKind = brBorlandDevStudio) and (VersionNumber >= 9) then
+  CheckPlatform(APlatform);
+
+  if (RadToolKind = brBorlandDevStudio) and (VersionNumber >= 8) then
     Result := PathAddSeparator(RootDir) + PathAddSeparator('lib\' + GetBDSPlatformStr(APlatform) + '\release')
   else
-  begin
-    CheckWin32Only(APlatform);
-    if (RadToolKind = brBorlandDevStudio) and (VersionNumber >= 8) then
-      Result := PathAddSeparator(RootDir) + PathAddSeparator('lib\win32\release')
-    else
-      Result := inherited GetLibFolderName(APlatform);
-  end;
+    Result := inherited GetLibFolderName(APlatform);
 end;
 
 class procedure TJclBDSInstallation.GetRADStudioVars(const RootDir: string; IDEVersionNumber: Integer; Variables: TStrings);
@@ -3754,44 +3741,34 @@
 
 function TJclBDSInstallation.GetLibraryBrowsingPath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
-  if IDEVersionNumber >= 9 then
+  CheckPlatform(APlatform);
+
+  if IDEVersionNumber >= 8 then
     // use EnvOptions.proj
     Result := GetMsBuildEnvOption(MsBuildDelphiBrowsingPathNodeName, APlatform, False)
   else
-  begin
-    CheckWin32Only(APlatform);
-    if IDEVersionNumber >= 8 then
-      // use EnvOptions.proj
-      Result := GetMsBuildEnvOption(MsBuildDelphiBrowsingPathNodeName, APlatform, False)
-    else
-    if IDEVersionNumber >= 5 then
-      // use EnvOptions.proj
-      Result := GetMsBuildEnvOption(MsBuildWin32BrowsingPathNodeName, APlatform, False)
-    else
-      // use registry
-      Result := inherited GetLibraryBrowsingPath(APlatform);
-  end;
+  if IDEVersionNumber >= 5 then
+    // use EnvOptions.proj
+    Result := GetMsBuildEnvOption(MsBuildWin32BrowsingPathNodeName, APlatform, False)
+  else
+    // use registry
+    Result := inherited GetLibraryBrowsingPath(APlatform);
 end;
 
 function TJclBDSInstallation.GetLibrarySearchPath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
-  if IDEVersionNumber >= 9 then
+  CheckPlatform(APlatform);
+
+  if IDEVersionNumber >= 8 then
     // use EnvOptions.proj
     Result := GetMsBuildEnvOption(MsBuildDelphiLibraryPathNodeName, APlatform, False)
   else
-  begin
-    CheckWin32Only(APlatform);
-    if IDEVersionNumber >= 8 then
-      // use EnvOptions.proj
-      Result := GetMsBuildEnvOption(MsBuildDelphiLibraryPathNodeName, APlatform, False)
-    else
-    if IDEVersionNumber >= 5 then
-      // use EnvOptions.proj
-      Result := GetMsBuildEnvOption(MsBuildWin32LibraryPathNodeName, APlatform, False)
-    else
-      // use registry
-      Result := inherited GetLibrarySearchPath(APlatform);
-  end;
+  if IDEVersionNumber >= 5 then
+    // use EnvOptions.proj
+    Result := GetMsBuildEnvOption(MsBuildWin32LibraryPathNodeName, APlatform, False)
+  else
+    // use registry
+    Result := inherited GetLibrarySearchPath(APlatform);
 end;
 
 function TJclBDSInstallation.GetMaxDelphiCLRVersion: string;
@@ -3876,7 +3853,8 @@
 
 function TJclBDSInstallation.GetRawCppBrowsingPath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
-  CheckWin32Only(APlatform);
+  CheckCBuilderPlatform(APlatform);
+
   if IDEVersionNumber >= 5 then
     // use EnvOptions.proj
     Result := GetMsBuildEnvOption(MsBuildCBuilderBrowsingPathNodeName, APlatform, True)
@@ -3886,13 +3864,15 @@
 
 function TJclBDSInstallation.GetRawCppSearchPath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
-  CheckWin32Only(APlatform);
+  CheckCBuilderPlatform(APlatform);
+
   Result := GetCppSearchPath(APlatform);
 end;
 
 function TJclBDSInstallation.GetRawCppLibraryPath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
-  CheckWin32Only(APlatform);
+  CheckCBuilderPlatform(APlatform);
+
   if IDEVersionNumber >= 5 then
     // use EnvOptions.proj
     Result := GetMsBuildEnvOption(MsBuildCBuilderLibraryPathNodeName, APlatform, True)
@@ -3902,7 +3882,8 @@
 
 function TJclBDSInstallation.GetRawCppIncludePath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
-  CheckWin32Only(APlatform);
+  CheckCBuilderPlatform(APlatform);
+
   if IDEVersionNumber >= 5 then
     // use EnvOptions.proj
     Result := GetMsBuildEnvOption(MsBuildCBuilderIncludePathNodeName, APlatform, True)
@@ -3912,86 +3893,64 @@
 
 function TJclBDSInstallation.GetRawDebugDCUPath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
-  if IDEVersionNumber >= 9 then
+  CheckPlatform(APlatform);
+
+  if IDEVersionNumber >= 8 then
     // use EnvOptions.proj
     Result := GetMsBuildEnvOption(MsBuildDelphiDebugDCUPathNodeName, APlatform, True)
   else
-  begin
-    CheckWin32Only(APlatform);
-    if IDEVersionNumber >= 8 then
-      // use EnvOptions.proj
-      Result := GetMsBuildEnvOption(MsBuildDelphiDebugDCUPathNodeName, APlatform, True)
-    else
-    if IDEVersionNumber >= 5 then
-      // use EnvOptions.proj
-      Result := GetMsBuildEnvOption(MsBuildWin32DebugDCUPathNodeName, APlatform, True)
-    else
-      // use registry
-      Result := ConfigData.ReadString(LibraryKeyName, BDSDebugDCUPathValueName, '');
-  end;
+  if IDEVersionNumber >= 5 then
+    // use EnvOptions.proj
+    Result := GetMsBuildEnvOption(MsBuildWin32DebugDCUPathNodeName, APlatform, True)
+  else
+    // use registry
+    Result := ConfigData.ReadString(LibraryKeyName, BDSDebugDCUPathValueName, '');
 end;
 
 function TJclBDSInstallation.GetRawLibraryBrowsingPath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
-  if IDEVersionNumber >= 9 then
+  CheckPlatform(APlatform);
+
+  if IDEVersionNumber >= 8 then
     // use EnvOptions.proj
     Result := GetMsBuildEnvOption(MsBuildDelphiBrowsingPathNodeName, APlatform, True)
   else
-  begin
-    CheckWin32Only(APlatform);
-    if IDEVersionNumber >= 8 then
-      // use EnvOptions.proj
-      Result := GetMsBuildEnvOption(MsBuildDelphiBrowsingPathNodeName, APlatform, True)
-    else
-    if IDEVersionNumber >= 5 then
-      // use EnvOptions.proj
-      Result := GetMsBuildEnvOption(MsBuildWin32BrowsingPathNodeName, APlatform, True)
-    else
-      // use registry
-      Result := inherited GetRawLibraryBrowsingPath(APlatform);
-  end;
+  if IDEVersionNumber >= 5 then
+    // use EnvOptions.proj
+    Result := GetMsBuildEnvOption(MsBuildWin32BrowsingPathNodeName, APlatform, True)
+  else
+    // use registry
+    Result := inherited GetRawLibraryBrowsingPath(APlatform);
 end;
 
 function TJclBDSInstallation.GetRawLibrarySearchPath(APlatform: TJclBDSPlatform): TJclBorRADToolPath;
 begin
+  CheckPlatform(APlatform);
+
   if IDEVersionNumber >= 8 then
     // use EnvOptions.proj
     Result := GetMsBuildEnvOption(MsBuildDelphiLibraryPathNodeName, APlatform, True)
   else
-  begin
-    CheckWin32Only(APlatform);
-    if IDEVersionNumber >= 8 then
-      // use EnvOptions.proj
-      Result := GetMsBuildEnvOption(MsBuildDelphiLibraryPathNodeName, APlatform, True)
-    else
-    if IDEVersionNumber >= 5 then
-      // use EnvOptions.proj
-      Result := GetMsBuildEnvOption(MsBuildWin32LibraryPathNodeName, APlatform, True)
-    else
-      // use registry
-      Result := inherited GetRawLibrarySearchPath(APlatform);
-  end;
+  if IDEVersionNumber >= 5 then
+    // use EnvOptions.proj
+    Result := GetMsBuildEnvOption(MsBuildWin32LibraryPathNodeName, APlatform, True)
+  else
+    // use registry
+    Result := inherited GetRawLibrarySearchPath(APlatform);
 end;
 
 function TJclBDSInstallation.GetVclIncludeDir(APlatform: TJclBDSPlatform): string;
 begin
-  if not (bpBCBuilder32 in Personalities) then
-    raise EJclBorRadException.CreateResFmt(@RsEDualPackageNotSupported, [Name]);
+  CheckCBuilderPlatform(APlatform);
+
   if (RadToolKind = brBorlandDevStudio) and (IDEVersionNumber >= 8) then
   begin
+    CheckPlatform(APlatform);
     Result := GetMsBuildEnvOption(MsBuildDelphiHPPOutputPathNodeName, APlatform, False);
     if Result = '' then
       Result := SubstitutePath('$(BDSCOMMONDIR)\hpp');
   end
   else
-  if (RadToolKind = brBorlandDevStudio) and (IDEVersionNumber >= 8) then
-  begin
-    CheckWin32Only(APlatform);
-    Result := GetMsBuildEnvOption(MsBuildDelphiHPPOutputPathNodeName, APlatform, False);
-    if Result = '' then
-      Result := SubstitutePath('$(BDSCOMMONDIR)\hpp');
-  end
-  else
     Result := inherited GetVclIncludeDir(APlatform);
 end;
 
@@ -4049,7 +4008,9 @@
 var
   TempRawCppPath: TJclBorRADToolPath;
 begin
-  if bpBCBuilder32 in Personalities then
+  CheckCBuilderPlatform(APlatform);
+
+  if Path <> '' then
   begin
     TempRawCppPath := RawCppBrowsingPath[APlatform];
     Result := RemoveFromPath(TempRawCppPath, Path);
@@ -4063,7 +4024,9 @@
 var
   TempRawCppPath: TJclBorRADToolPath;
 begin
-  if (bpBCBuilder32 in Personalities) and (Path <> '') then
+  CheckCBuilderPlatform(APlatform);
+
+  if Path <> '' then
   begin
     TempRawCppPath := RawCppSearchPath[APlatform];
     Result := RemoveFromPath(TempRawCppPath, Path);
@@ -4077,7 +4040,9 @@
 var
   TempRawLibraryPath: TJclBorRADToolPath;
 begin
-  if (bpBCBuilder32 in Personalities) and (IDEVersionNumber >= 5) and (Path <> '') then
+  CheckCBuilderPlatform(APlatform);
+
+  if (IDEVersionNumber >= 5) and (Path <> '') then
   begin
     TempRawLibraryPath := RawCppLibraryPath[APlatform];
     Result := RemoveFromPath(TempRawLibraryPath, Path);
@@ -4091,7 +4056,9 @@
 var
   TempRawIncludePath: TJclBorRADToolPath;
 begin
-  if (bpBCBuilder32 in Personalities) and (IDEVersionNumber >= 5) and (Path <> '') then
+  CheckCBuilderPlatform(APlatform);
+
+  if (IDEVersionNumber >= 5) and (Path <> '') then
   begin
     TempRawIncludePath := RawCppIncludePath[APlatform];
     Result := RemoveFromPath(TempRawIncludePath, Path);
@@ -4159,7 +4126,8 @@
 
 procedure TJclBDSInstallation.SetRawCppBrowsingPath(APlatform: TJclBDSPlatform; const Value: TJclBorRADToolPath);
 begin
-  CheckWin32Only(APlatform);
+  CheckCBuilderPlatform(APlatform);
+
   // update registry
   ConfigData.WriteString(GetCppPathsKeyName, CppBrowsingPathValueName, Value);
   // update EnvOptions.dproj
@@ -4169,13 +4137,14 @@
 
 procedure TJclBDSInstallation.SetRawCppSearchPath(APlatform: TJclBDSPlatform; const Value: TJclBorRADToolPath);
 begin
-  CheckWin32Only(APlatform);
+  CheckCBuilderPlatform(APlatform);
   ConfigData.WriteString(GetCppPathsKeyName, CppSearchPathValueName, Value);
 end;
 
 procedure TJclBDSInstallation.SetRawCppLibraryPath(APlatform: TJclBDSPlatform; const Value: TJclBorRADToolPath);
 begin
-  CheckWin32Only(APlatform);
+  CheckCBuilderPlatform(APlatform);
+
   // update registry
   ConfigData.WriteString(GetCppPathsKeyName, CppLibraryPathValueName, Value);
   // update EnvOptions.dproj
@@ -4185,7 +4154,8 @@
 
 procedure TJclBDSInstallation.SetRawCppIncludePath(APlatform: TJclBDSPlatform; const Value: TJclBorRADToolPath);
 begin
-  CheckWin32Only(APlatform);
+  CheckCBuilderPlatform(APlatform);
+
   if IDEVersionNumber >= 5 then
   begin
     // update registry
@@ -4197,6 +4167,8 @@
 
 procedure TJclBDSInstallation.SetRawDebugDCUPath(APlatform: TJclBDSPlatform; const Value: TJclBorRADToolPath);
 begin
+  CheckPlatform(APlatform);
+
   if IDEVersionNumber >= 9 then
   begin
     // update registry
@@ -4206,7 +4178,6 @@
   end
   else
   begin
-    CheckWin32Only(APlatform);
     // update registry
     ConfigData.WriteString(LibraryKeyName, BDSDebugDCUPathValueName, Value);
     // update EnvOptions.dproj
@@ -4220,6 +4191,8 @@
 
 procedure TJclBDSInstallation.SetRawLibraryBrowsingPath(APlatform: TJclBDSPlatform; const Value: TJclBorRADToolPath);
 begin
+  CheckPlatform(APlatform);
+
   if IDEVersionNumber >= 9 then
   begin
     // update registry
@@ -4229,7 +4202,6 @@
   end
   else
   begin
-    CheckWin32Only(APlatform);
     // update registry
     ConfigData.WriteString(LibraryKeyName, LibraryBrowsingPathValueName, Value);
     // update EnvOptions.dproj
@@ -4243,6 +4215,8 @@
 
 procedure TJclBDSInstallation.SetRawLibrarySearchPath(APlatform: TJclBDSPlatform; const Value: TJclBorRADToolPath);
 begin
+  CheckPlatform(APlatform);
+
   if IDEVersionNumber >= 9 then
   begin
     // update registry
@@ -4252,7 +4226,6 @@
   end
   else
   begin
-    CheckWin32Only(APlatform);
     // update registry
     ConfigData.WriteString(LibraryKeyName, LibrarySearchPathValueName, Value);
     // update EnvOptions.dproj

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:[3836] trunk/jcl/source/common/JclIDEUtils.pas

[<ou...@us...>]

Revision: 3836
          http://jcl.svn.sourceforge.net/jcl/?rev=3836&view=rev
Author:   outchy
Date:     2012-08-20 10:12:14 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
Better parsing of RAD Studio version strings in the registry.

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

Modified: trunk/jcl/source/common/JclIDEUtils.pas
===================================================================
--- trunk/jcl/source/common/JclIDEUtils.pas	2012-08-20 10:05:37 UTC (rev 3835)
+++ trunk/jcl/source/common/JclIDEUtils.pas	2012-08-20 10:12:14 UTC (rev 3836)
@@ -2522,6 +2522,7 @@
   Key, GlobalKey: string;
   Ed: TJclBorRADToolEdition;
   GlobalsBuffer: TStrings;
+  Version: Extended;
 begin
   Key := ConfigData.FileName;
   GlobalKey := StrEnsureSuffix('\', Key) + GlobalsKeyName;
@@ -2540,9 +2541,14 @@
     GlobalsBuffer.Free;
   end;
 
-  KeyLen := Length(Key);
-  if (KeyLen > 3) and StrIsDigit(Key[KeyLen - 2]) and (Key[KeyLen - 1] = '.') and (Key[KeyLen] = '0') then
-    FIDEVersionNumber := Ord(Key[KeyLen - 2]) - Ord('0')
+  I := StrLastPos('\', Key);
+  if I > 0 then
+    Key := Copy(Key, I + 1, Length(Key) - I);
+
+  Key := StrReplaceChar(Key, '.', {$IFDEF RTL220_UP}FormatSettings.{$ENDIF}DecimalSeparator);
+  Version := StrToFloatSafe(Key);
+  if Frac(Version) = 0 then
+    FIDEVersionNumber := Round(Version)
   else
     FIDEVersionNumber := 0;
 

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:[3835] trunk/jcl/install

[<ou...@us...>]

Revision: 3835
          http://jcl.svn.sourceforge.net/jcl/?rev=3835&view=rev
Author:   outchy
Date:     2012-08-20 10:05:37 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
issue reported in newsgroup jedi.general: misleading information displayed in the installer.

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

Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas	2012-08-20 10:01:28 UTC (rev 3834)
+++ trunk/jcl/install/JclInstall.pas	2012-08-20 10:05:37 UTC (rev 3835)
@@ -2040,7 +2040,7 @@
     Target.OutputCallback := WriteLog;
 
     if Assigned(GUI) then
-      GUI.Status := Format(LoadResString(@RsLogInstalling), [TargetName]);
+      GUI.Status := Format(LoadResString(@RsLogInstallingJCL), [TargetName]);
 
     if Assigned(GUIPage) then
     begin
@@ -2421,7 +2421,7 @@
   try
     Target.OutputCallback := WriteLog;
     if Assigned(GUI) then
-      GUI.Status := Format(LoadResString(@RsLogUninstalling), [TargetName]);
+      GUI.Status := Format(LoadResString(@RsLogUninstallingJCL), [TargetName]);
     if Assigned(GUIPage) then
       GUIPage.Show;
 

Modified: trunk/jcl/install/JclInstallResources.pas
===================================================================
--- trunk/jcl/install/JclInstallResources.pas	2012-08-20 10:01:28 UTC (rev 3834)
+++ trunk/jcl/install/JclInstallResources.pas	2012-08-20 10:05:37 UTC (rev 3835)
@@ -350,6 +350,8 @@
   RsLogDelHelp2Files = 'Unregistering help 2.0 files...';
   RsLogInstalling = 'Installing %s...';
   RsLogUninstalling = 'Removing %s...';
+  RsLogInstallingJCL = 'Installing JCL for %s...';
+  RsLogUninstallingJCL = 'Removing JCL for %s...';
   RsLogBuilding = 'Building %s...';
   RsLogRegistering = 'Registering %s...';
   RsLogFirstCompilationOk = 'First compilation ok.';

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:[3834] trunk/jcl/install/VclGui/JediGUIText.dfm

[<ou...@us...>]

Revision: 3834
          http://jcl.svn.sourceforge.net/jcl/?rev=3834&view=rev
Author:   outchy
Date:     2012-08-20 10:01:28 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
issue reported in the newsgroup: text panels for MPL and release notes have no scrollbar;

Modified Paths:
--------------
    trunk/jcl/install/VclGui/JediGUIText.dfm

Modified: trunk/jcl/install/VclGui/JediGUIText.dfm
===================================================================
--- trunk/jcl/install/VclGui/JediGUIText.dfm	2012-08-20 09:57:42 UTC (rev 3833)
+++ trunk/jcl/install/VclGui/JediGUIText.dfm	2012-08-20 10:01:28 UTC (rev 3834)
@@ -28,6 +28,7 @@
       Width = 288
       Height = 208
       Anchors = [akLeft, akTop, akRight, akBottom]
+      ScrollBars = ssBoth
       TabOrder = 0
     end
   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:[3833] trunk/jcl/source/windows/JclMsBuild.pas

[<ou...@us...>]

Revision: 3833
          http://jcl.svn.sourceforge.net/jcl/?rev=3833&view=rev
Author:   outchy
Date:     2012-08-20 09:57:42 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
Fix provided in the newsgroup jedi.general: ignore the case of variables to be replaced.

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

Modified: trunk/jcl/source/windows/JclMsBuild.pas
===================================================================
--- trunk/jcl/source/windows/JclMsBuild.pas	2012-08-20 09:55:18 UTC (rev 3832)
+++ trunk/jcl/source/windows/JclMsBuild.pas	2012-08-20 09:57:42 UTC (rev 3833)
@@ -1026,7 +1026,7 @@
         StrReplace(Result,
                    Copy(Result, Start, Position - Start + 1), // $(PropertyName)
                    PropertyValue,
-                   [rfReplaceAll])
+                   [rfReplaceAll, rfIgnoreCase])
       end;
       if Start = 0 then
       begin
@@ -1040,11 +1040,11 @@
           PropertyName := Copy(Result, Start + 2, Position - Start - 2);
 
           PropertyValue := EvaluateList(PropertyName);
-          
+
           StrReplace(Result,
                      Copy(Result, Start, Position - Start + 1), // @(PropertyName...)
                      PropertyValue,
-                     [rfReplaceAll])
+                     [rfReplaceAll, rfIgnoreCase])
         end;
       end;
     until Start = 0;
@@ -1088,7 +1088,7 @@
       EndIndex := StrSearch(')', Result, Index + 2);
       MetaDataName := Copy(Result, Index + 2, EndIndex - Index - 2);
       UserDefinedMetadataNames.Add(MetaDataName);
-      StrReplace(Result, '%(' + MetaDataName + ')', '%' + IntToStr(Num) + ':s', [rfReplaceAll]);
+      StrReplace(Result, '%(' + MetaDataName + ')', '%' + IntToStr(Num) + ':s', [rfReplaceAll, rfIgnoreCase]);
       Inc(Num);
       Index := StrSearch('%(', Result, Index);
     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:[3832] trunk/jcl/source/common/JclIDEUtils.pas

[<ou...@us...>]

Revision: 3832
          http://jcl.svn.sourceforge.net/jcl/?rev=3832&view=rev
Author:   outchy
Date:     2012-08-20 09:55:18 +0000 (Mon, 20 Aug 2012)
Log Message:
-----------
remove empty environment variable at the end.

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

Modified: trunk/jcl/source/common/JclIDEUtils.pas
===================================================================
--- trunk/jcl/source/common/JclIDEUtils.pas	2012-08-17 15:53:14 UTC (rev 3831)
+++ trunk/jcl/source/common/JclIDEUtils.pas	2012-08-20 09:55:18 UTC (rev 3832)
@@ -2066,9 +2066,6 @@
 
     // at first get system environment variables
     JclSysInfo.GetEnvironmentVars(FEnvironmentVariables, True);
-    for I := FEnvironmentVariables.count-1 downto 0 do
-      if FEnvironmentVariables.Names[I] = EmptyStr then
-        FEnvironmentVariables.Delete(I);
 
     // Overwrite BDSCommonDir because it conflicts with older versions and
     // the RAD Studio 2009 setup doesn't update the environment variable anymore
@@ -2092,6 +2089,11 @@
         EnvNames.Free;
       end;
     end;
+
+    // remove empty environment variables
+    for I := FEnvironmentVariables.count-1 downto 0 do
+      if FEnvironmentVariables.Names[I] = EmptyStr then
+        FEnvironmentVariables.Delete(I);
   end;
   Result := FEnvironmentVariables;
 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:[3831] trunk/jcl/make.proj

[<ah...@us...>]

Revision: 3831
          http://jcl.svn.sourceforge.net/jcl/?rev=3831&view=rev
Author:   ahuser
Date:     2012-08-17 15:53:14 +0000 (Fri, 17 Aug 2012)
Log Message:
-----------
XE2 UnitScopes weren't specified for packages if no C++Builder personality was installed

Modified Paths:
--------------
    trunk/jcl/make.proj

Modified: trunk/jcl/make.proj
===================================================================
--- trunk/jcl/make.proj	2012-08-14 21:30:14 UTC (rev 3830)
+++ trunk/jcl/make.proj	2012-08-17 15:53:14 UTC (rev 3831)
@@ -111,7 +111,8 @@
 		<DebugOptions>$(DebugOptions) -U&quot;$(DelphiDebugDCUPath);$(DelphiLibraryPath)&quot;</DebugOptions>
 		
 		<!-- Package Configuration -->
-		<PackageOptions Condition=" '$(BCBCompile)' == 'true' ">$(PackageOptions) -JL -DBCB $(UnitScopeOption)</PackageOptions>
+		<PackageOptions Condition=" '$(BCBCompile)' == 'true' ">$(PackageOptions) -JL -DBCB</PackageOptions>
+		<PackageOptions>$(PackageOptions) $(UnitScopeOption)</PackageOptions>
 		<PackageOptions>$(PackageOptions) -DRELEASE</PackageOptions>
 		<PackageOptions>$(PackageOptions) -LN&quot;$(DcuOutDir)&quot;</PackageOptions>
 		<PackageOptions>$(PackageOptions) -LE&quot;$(BplOutDir)&quot;</PackageOptions>

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:[3830] trunk/jcl/source/common/JclAlgorithms.pas

[<jfu...@us...>]

Revision: 3830
          http://jcl.svn.sourceforge.net/jcl/?rev=3830&view=rev
Author:   jfudickar
Date:     2012-08-14 21:30:14 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
D7 Compatibility

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

Modified: trunk/jcl/source/common/JclAlgorithms.pas
===================================================================
--- trunk/jcl/source/common/JclAlgorithms.pas	2012-08-14 15:00:26 UTC (rev 3829)
+++ trunk/jcl/source/common/JclAlgorithms.pas	2012-08-14 21:30:14 UTC (rev 3830)
@@ -687,7 +687,7 @@
       {$IFDEF SUPPORTS_UNICODE}
       Result := CompareText(Obj1, Obj2);
       {$ELSE ~SUPPORTS_UNICODE}
-      Result := WideCompareText(Obj1, Obj2);
+      {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}SysUtils.WideCompareText(Obj1, Obj2);
       {$ENDIF ~SUPPORTS_UNICODE}
   else
     raise EJclOperationNotSupportedError.Create;

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:[3829] trunk/jcl/source/common/JclCompilerUtils.pas

[<ou...@us...>]

Revision: 3829
          http://jcl.svn.sourceforge.net/jcl/?rev=3829&view=rev
Author:   outchy
Date:     2012-08-14 15:00:26 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
Mantis 5889: HPP files could not be checked on localized old versions of Windows:
- add Ansi --> OEM conversion on the compiler command line.

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

Modified: trunk/jcl/source/common/JclCompilerUtils.pas
===================================================================
--- trunk/jcl/source/common/JclCompilerUtils.pas	2012-08-14 14:48:13 UTC (rev 3828)
+++ trunk/jcl/source/common/JclCompilerUtils.pas	2012-08-14 15:00:26 UTC (rev 3829)
@@ -763,7 +763,7 @@
 var
   LaunchCommand: string;
 begin
-  LaunchCommand := Format('%s %s', [FileName, CommandLine]);
+  LaunchCommand := Format('%s %s', [FileName, StrAnsiToOem(AnsiString(CommandLine))]);
   if Assigned(FOutputCallback) then
   begin
     FOutputCallback(LaunchCommand);

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:[3828] trunk/jcl/install

[<ou...@us...>]

Revision: 3828
          http://jcl.svn.sourceforge.net/jcl/?rev=3828&view=rev
Author:   outchy
Date:     2012-08-14 14:48:13 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
Mantis 5889: HPP files could not be checked on localized old versions of Windows:
- add option to configure the HPP output directory.

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

Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas	2012-08-14 14:35:13 UTC (rev 3827)
+++ trunk/jcl/install/JclInstall.pas	2012-08-14 14:48:13 UTC (rev 3828)
@@ -92,6 +92,7 @@
         joJCLEnvLibPath,
         joJCLEnvBrowsingPath,
         joJCLEnvDebugDCUPath,
+        joJCLEnvIncludePath,
       joJCLMake,
         joJCLMakeRelease,
         joJCLMakeDebug,
@@ -156,6 +157,7 @@
     FGUI: IJediInstallGUI;
     FGUIBPLPathIndex: Integer;
     FGUIDCPPathIndex: Integer;
+    FGUIHPPPathIndex: Integer;
     FLibDebugDir: string;
     FLibReleaseDir: string;
     FJclDcpPath: string;
@@ -190,6 +192,7 @@
     
     function GetBplPath: string;
     function GetDcpPath: string;
+    function GetHppPath: string;
     function GetOptionChecked(Option: TInstallerOption): Boolean; overload;
     function GetOptionCheckedById(Id: Integer): Boolean; overload;
     function GetPlatformStr: string;
@@ -429,6 +432,7 @@
       (Id: -1; Caption: @RsCaptionEnvLibPath;              Hint: @RsHintEnvLibPath), // joEnvLibPath
       (Id: -1; Caption: @RsCaptionEnvBrowsingPath;         Hint: @RsHintEnvBrowsingPath), // joEnvBrowsingPath
       (Id: -1; Caption: @RsCaptionEnvDebugDCUPath;         Hint: @RsHintEnvDebugDCUPath), // joEnvDebugDCUPath
+      (Id: -1; Caption: @RsCaptionEnvIncludePath;          Hint: @RsHintEnvIncludePath),  // joEnvIncludePath
       (Id: -1; Caption: @RsCaptionMake;                    Hint: @RsHintMake), // joMake
       (Id: -1; Caption: @RsCaptionMakeRelease;             Hint: @RsHintMakeRelease), // joMakeRelease
       (Id: -1; Caption: @RsCaptionMakeDebug;               Hint: @RsHintMakeDebug), // joMakeDebug
@@ -469,6 +473,7 @@
   OptionNameBPLPath = 'BPL-Path';
   OptionNameDCPPath = 'DCP-Path';
   OptionNameBPIPath = 'BPI-Path';
+  OptionNameHPPPath = 'HPP-Path';
 
   VersionDir = '\%s';
   VersionDirExp = '\%%s';
@@ -938,17 +943,25 @@
     AddOption(joJCLEnvBrowsingPath, [goChecked], Parent);
     if not Target.IsTurboExplorer then
       AddOption(joJCLEnvDebugDCUPath, [goChecked], Parent);
+    if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber >= 5) and (bpBCBuilder32 in Target.Personalities) then
+      AddOption(joJCLEnvIncludePath, [goChecked], Parent);
   end;
 
   procedure AddMakeOptions(Parent: TInstallerOption);
+  var
+    HppDirectory: string;
   begin
     AddOption(joJCLMakeRelease, [goStandAloneParent, goExpandable, goChecked], Parent);
     AddOption(joJCLMakeDebug, [goStandAloneParent, goExpandable, goChecked], Parent);
 
     if (bpBCBuilder32 in Target.Personalities) and (TargetPlatform = bpWin32) then
     begin
+      if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber >= 5) then
+        HppDirectory := LoadResString(@RsCaptionHppDirectory)
+      else
+        HppDirectory := Target.VclIncludeDir[TargetPlatform];
       AddOption(joJCLCopyHppFiles, [goChecked], OptionData[joJCLMake].Id,
-        Format(LoadResString(OptionData[joJCLCopyHppFiles].Caption), [Target.VclIncludeDir[FTargetPlatform]]),
+        Format(LoadResString(OptionData[joJCLCopyHppFiles].Caption), [HppDirectory]),
         LoadResString(OptionData[joJCLCopyHppFiles].Hint));
       AddOption(joJCLCheckHppFiles, [goChecked], joJCLMake);
     end;
@@ -998,19 +1011,26 @@
   end;
 
   procedure AddPackageOptions(Parent: TInstallerOption);
+  var
+    HppDirectory: string;
   begin
     if (bpBCBuilder32 in Target.Personalities) and (TargetPlatform = bpWin32) and RunTimeInstallation then
     begin
+      if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber >= 5) then
+        HppDirectory := LoadResString(@RsCaptionHppDirectory)
+      else
+        HppDirectory := Target.VclIncludeDir[TargetPlatform];
+
       if (Target.RadToolKind = brBorlandDevStudio) and (Target.VersionNumber >= 4) then
       begin
         AddOption(joJCLDualPackages, [goStandAloneParent, goChecked], Parent);
         AddOption(joJCLCopyPackagesHppFiles, [goChecked], OptionData[joJCLDualPackages].Id,
-          Format(LoadResString(OptionData[joJCLCopyPackagesHppFiles].Caption), [Target.VclIncludeDir[FTargetPlatform]]),
+          Format(LoadResString(OptionData[joJCLCopyPackagesHppFiles].Caption), [HppDirectory]),
           LoadResString(OptionData[joJCLCopyPackagesHppFiles].Hint));
       end
       else
         AddOption(joJCLCopyPackagesHppFiles, [goChecked], OptionData[Parent].Id,
-          Format(LoadResString(OptionData[joJCLCopyPackagesHppFiles].Caption), [Target.VclIncludeDir[FTargetPlatform]]),
+          Format(LoadResString(OptionData[joJCLCopyPackagesHppFiles].Caption), [HppDirectory]),
           LoadResString(OptionData[joJCLCopyPackagesHppFiles].Hint));
     end;
 
@@ -1182,6 +1202,7 @@
       if StoredValue = '' then
         StoredValue := Target.BPLOutputPath[FTargetPlatform];
       GUIPage.Directories[FGUIBPLPathIndex] := StoredValue;
+
       if Target.RadToolKind = brCppBuilder then
         StoredValue := AConfiguration.OptionAsStringByName[TargetName, OptionNameBPIPath]
       else
@@ -1189,6 +1210,14 @@
       if StoredValue = '' then
         StoredValue := FJclDcpPath;
       GUIPage.Directories[FGUIDCPPathIndex] := StoredValue;
+
+      if FGUIHPPPathIndex >= 0 then
+      begin
+        StoredValue := AConfiguration.OptionAsStringByName[TargetName, OptionNameHPPPath];
+        if StoredValue = '' then
+          StoredValue := Target.VclIncludeDir[FTargetPlatform];
+        GUIPage.Directories[FGUIHPPPathIndex] := StoredValue;
+      end;
     end;
   end;
 
@@ -1244,10 +1273,16 @@
   if not Target.IsTurboExplorer then
   begin
     FGUIBPLPathIndex := GUIPage.AddDirectory(LoadResString(@RsCaptionBPLPath));
+
     if Target.RadToolKind = brCppBuilder then
       FGUIDCPPathIndex := GUIPage.AddDirectory(LoadResString(@RsCaptionBPIPath))
     else
       FGUIDCPPathIndex := GUIPage.AddDirectory(LoadResString(@RsCaptionDCPPath));
+
+    if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber >= 5) and (bpBCBuilder32 in Target.Personalities) then
+      FGUIHPPPathIndex := GUIPage.AddDirectory(LoadResString(@RsCaptionHPPPath))
+    else
+      FGUIHPPPathIndex := -1;
   end;
 
   LoadValues;
@@ -1320,7 +1355,7 @@
       Result := CheckDirectory(GetBplPath, @RsLogInvalidBplPath)
         and CheckDirectory(GetDcpPath, @RsLogInvalidDcpPath);
       if OptionChecked[joJCLCopyHppFiles] or OptionChecked[joJCLCopyPackagesHppFiles] then
-        Result := Result and CheckDirectory(Target.VclIncludeDir[FTargetPlatform], @RsLogInvalidHppPath);
+        Result := Result and CheckDirectory(GetHppPath, @RsLogInvalidHppPath);
     end;
   end;
 
@@ -1535,6 +1570,23 @@
         MarkOptionEnd(joJCLEnvDebugDCUPath, Result);
       end;
 
+      if Result and OptionChecked[joJCLEnvIncludePath] then
+      begin
+        MarkOptionBegin(joJCLEnvIncludePath);
+        if (OptionChecked[joJCLCopyHppFiles] or OptionChecked[joJCLCopyPackagesHppFiles]) and
+           (GetHppPath <> ATarget.VclIncludeDir[TargetPlatform]) then
+        begin
+          Result := (ATarget as TJclBDSInstallation).AddToCppIncludePath(GetHppPath, TargetPlatform);
+          if Result then
+            WriteLog(Format(LoadResString(@RsLogAddIncludePath), [GetHppPath]))
+          else
+            WriteLog(LoadResString(@RsLogFailedAddIncludePath));
+        end
+        else
+          WriteLog(Format(LoadResString(@RsLogIgnoreAddIncludePath), [GetHppPath]));
+        MarkOptionEnd(joJCLEnvIncludePath, Result);
+      end;
+
       MarkOptionEnd(joJCLEnvironment, Result);
     end;
   end;
@@ -2126,6 +2178,20 @@
       else
         WriteLog(LoadResString(@RsLogFailedDelDebugDCUPath));
     end;
+
+    //joJclEnvIncludePath
+    if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber >= 5) and (bpBCBuilder32 in Target.Personalities) then
+    begin
+      if (GetHppPath <> ATarget.VclIncludeDir[TargetPlatform]) then
+      begin
+        if (ATarget as TJclBDSInstallation).RemoveFromCppIncludePath(GetHppPath, TargetPlatform) then
+          WriteLog(Format(LoadResString(@RsLogDelIncludePath), [GetHppPath]))
+        else
+          WriteLog(LoadResString(@RsLogFailedDelIncludePath));
+      end
+      else
+        WriteLog(Format(LoadResString(@RsLogIgnoreDelIncludePath), [GetHppPath]));
+    end;
   end;
 
   procedure RemoveMake;
@@ -2460,6 +2526,27 @@
   {$ENDIF MSWINDOWS}
 end;
 
+function TJclInstallation.GetHppPath: string;
+var
+  AConfiguration: IJediConfiguration;
+begin
+  if (Target.RadToolKind = brBorlandDevStudio) and (Target.IDEVersionNumber >= 5) and (bpBCBuilder32 in Target.Personalities) then
+  begin
+    if Assigned(GUIPage) then
+      Result := GUIPage.Directories[FGUIHPPPathIndex]
+    else
+    begin
+      AConfiguration := InstallCore.Configuration;
+      if Assigned(AConfiguration) then
+        Result := AConfiguration.OptionAsStringByName[TargetName, OptionNameHPPPath]
+      else
+        Result := Target.VclIncludeDir[TargetPlatform];
+    end;
+  end
+  else
+    Result := Target.VclIncludeDir[TargetPlatform];
+end;
+
 procedure TJclInstallation.Close;
   procedure SaveOptions;
   var
@@ -2499,6 +2586,8 @@
         AConfiguration.OptionAsStringByName[TargetName, OptionNameBPIPath] := GUIPage.Directories[FGUIDCPPathIndex]
       else
         AConfiguration.OptionAsStringByName[TargetName, OptionNameDCPPath] := GUIPage.Directories[FGUIDCPPathIndex];
+      if FGUIHPPPathIndex >= 0 then
+        AConfiguration.OptionAsStringByName[TargetName, OptionNameHPPPath] := GUIPage.Directories[FGUIHPPPathIndex];
     end;
   end;
 begin
@@ -2670,7 +2759,7 @@
         //Compiler.AddPathOption('NH', FIncludeDir);   // .hpp files
         Compiler.AddPathOption('NO', UnitOutputDir); // .obj files
         if TJclBDSInstallation(Target).DualPackageInstallation and OptionChecked[joJCLCopyPackagesHppFiles] then
-          Compiler.AddPathOption('N1',Target.VclIncludeDir[FTargetPlatform]);
+          Compiler.AddPathOption('N1', GetHppPath);
       end
       else
       begin
@@ -2704,7 +2793,7 @@
       if OptionChecked[joJCLCopyHppFiles] then
       begin
         MarkOptionBegin(joJCLCopyHppFiles);
-        Result := Result and CopyHppFiles(UnitList, Target.VclIncludeDir[FTargetPlatform]);
+        Result := Result and CopyHppFiles(UnitList, GetHppPath);
         MarkOptionEnd(joJCLCopyHppFiles, Result);
       end;
     finally
@@ -2840,7 +2929,7 @@
     if OptionChecked[joJCLCopyPackagesHppFiles] then
     //begin
     //  MarkOptionBegin(joJCLCopyPackagesHppFiles);
-      Target.Make.AddPathOption('DHPPDIR=', Target.VclIncludeDir[FTargetPlatform]);
+      Target.Make.AddPathOption('DHPPDIR=', GetHppPath);
     //  MarkOptionEnd(joJCLCopyPackagesHppFiles, True);
     //end;
   end;

Modified: trunk/jcl/install/JclInstallResources.pas
===================================================================
--- trunk/jcl/install/JclInstallResources.pas	2012-08-14 14:35:13 UTC (rev 3827)
+++ trunk/jcl/install/JclInstallResources.pas	2012-08-14 14:48:13 UTC (rev 3828)
@@ -42,6 +42,7 @@
   RsCaptionBPLPath    = '&BPL path:';
   RsCaptionDCPPath    = '&DCP path:';
   RsCaptionBPIPath    = 'BP&I path:';
+  RsCaptionHPPPath    = '&HPP path:';
 
   // License
   RsCaptionLicense          = 'MPL 1.1 License';
@@ -119,12 +120,14 @@
   RsCaptionEnvLibPath      = 'Add JCL to IDE Library Path';
   RsCaptionEnvBrowsingPath = 'Add JCL to IDE Browsing Path';
   RsCaptionEnvDebugDCUPath = 'Add JCL to Debug DCU Path';
+  RsCaptionEnvIncludePath  = 'Add JCL to C++ Include Path';
 
   // make units
   RsCaptionMake          = 'Make library units';
   RsCaptionMakeRelease   = 'Release';
   RsCaptionMakeDebug     = 'Debug';
   RsCaptionCopyHppFiles  = 'Copy HPP files to %s';
+  RsCaptionHppDirectory  = 'configured HPP directory';
   RsCaptionCheckHppFiles = 'Check HPP files';
 
   // packages
@@ -234,6 +237,7 @@
   RsHintEnvBrowsingPath = 'Add JCL source directories to browsing path';
   RsHintEnvDebugDCUPath = 'This is a prerequisite for using the precompiled JCL debug units by means of the respective' + NativeLineBreak +
     'Project Options|Compiler switch. See "Make library units/Debug" option below.';
+  RsHintEnvIncludePath  = 'Add JCL include path to C++ include path';
 
   // make units
   RsHintMake            = 'Generate .dcu files.' + NativeLineBreak + 'Recommended.';
@@ -247,7 +251,7 @@
   RsHintPackages             = 'Build and eventually install JCL runtime packages and optional IDE experts.';
   RsHintDualPackages         = 'The same package introduce code for Delphi Win32 and C++Builder Win32';
   RsHintCopyPackagesHppFiles = 'Output .hpp files into C++Builder''s include path instead of ' +
-    'the source paths.';
+    'the JCL source paths.';
 
   // exception dialogs
   RsHintExceptDlg       = 'Add selected Exception dialogs to the Object Repository.';
@@ -328,6 +332,12 @@
   RsLogFailedAddDebugDCUPath = 'Failed to add debug DCU path';
   RsLogDelDebugDCUPath = 'Removed "%s" from debug DCU Path.';
   RsLogFailedDelDebugDCUPath = 'Failed to remove debug DCU Path.';
+  RsLogAddIncludePath = 'Added "%s" to C++ Include Path.';
+  RsLogFailedAddIncludePath = 'Failed to add C++ Include path';
+  RsLogIgnoreAddIncludePath = 'Not adding standard C++ Include Path "%s".';
+  RsLogDelIncludePath = 'Removed "%s" from C++ Include Path.';
+  RsLogFailedDelIncludePath = 'Failed to remove C++ Include Path.';
+  RsLogIgnoreDelIncludePath = 'Not removing standard C++ Include Path "%s".';
   RsLogAddIdeTools = 'Added %s to %s IDE Tools';
   RsLogFailedAddIdeTools = 'Failed to add help file to IDE Tools';
   RsLogDelIdeTools = 'Removing %s from %s IDE Tools';

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:[3827] trunk/jcl/install/JclInstall.pas

[<ou...@us...>]

Revision: 3827
          http://jcl.svn.sourceforge.net/jcl/?rev=3827&view=rev
Author:   outchy
Date:     2012-08-14 14:35:13 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
Fix possible issues when the HPP output directy does not have a leading path separator.

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

Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas	2012-08-14 13:15:40 UTC (rev 3826)
+++ trunk/jcl/install/JclInstall.pas	2012-08-14 14:35:13 UTC (rev 3827)
@@ -2539,15 +2539,16 @@
   function CopyHppFiles(UnitList: TStrings; const TargetDir: string): Boolean;
   var
     I: Integer;
-    FileName: string;
+    TargetDirectory, FileName: string;
   begin
     Result := True;
+    TargetDirectory := PathAddSeparator(TargetDir);
     for I := 0 to UnitList.Count - 1 do
     begin
       FileName := UnitList[I] + '.hpp';
       if FileExists(FileName) then
       begin
-        Result := Result and FileCopy(FileName, TargetDir + FileName, True);
+        Result := Result and FileCopy(FileName, TargetDirectory + FileName, True);
 
         // Always remove once copied because if they are left in place they
         // will clutter the source folder and might even prevent compilation
@@ -2557,8 +2558,8 @@
       end;
       if (CompareText(UnitList[I], 'zlibh') = 0) and (Target.RadToolKind = brCppBuilder) and (Target.VersionNumber = 6) then
       begin
-        Result := Result and FileCopy('zlib.h', TargetDir + 'zlib.h', True)
-          and FileCopy('zconf.h', TargetDir + 'zconf.h', True);
+        Result := Result and FileCopy('zlib.h', TargetDirectory + 'zlib.h', True)
+          and FileCopy('zconf.h', TargetDirectory + 'zconf.h', True);
       end;
     end;
   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:[3826] trunk/jcl/install

[<ou...@us...>]

Revision: 3826
          http://jcl.svn.sourceforge.net/jcl/?rev=3826&view=rev
Author:   outchy
Date:     2012-08-14 13:15:40 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
Mantis 5889: HPP files could not be checked on localized old versions of Windows:
- add option to continue when the HPP files fail to compile.

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

Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas	2012-08-14 12:40:19 UTC (rev 3825)
+++ trunk/jcl/install/JclInstall.pas	2012-08-14 13:15:40 UTC (rev 3826)
@@ -1601,6 +1601,8 @@
       finally
         SetCurrentDir(SaveDir);
       end;
+      if (not Result) and Assigned(GUI) then
+        Result := GUI.Dialog(LoadResString(@RsHppCheckFailure), dtWarning, [drYes, drNo]) = drYes;
     end;
   var
     I: Integer;

Modified: trunk/jcl/install/JclInstallResources.pas
===================================================================
--- trunk/jcl/install/JclInstallResources.pas	2012-08-14 12:40:19 UTC (rev 3825)
+++ trunk/jcl/install/JclInstallResources.pas	2012-08-14 13:15:40 UTC (rev 3826)
@@ -292,6 +292,7 @@
   RsHtmlHelp2Credentials = 'Registering HTML Help 2.0 files requires administrator privilege to be performed' + sLineBreak +
     'The RegHelper.exe utility will make this operation';
   RsKeepExpertSettings = 'Do you want to keep JCL expert settings?';
+  RsHppCheckFailure = 'The JCL HPP files fail to compile, continue anyway?';
 
   RsExceptDlgVclName    = 'Exception Dialog';
   RsExceptDlgVclSndName = 'Exception Dialog with Send';

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:[3825] trunk/jcl

[<ou...@us...>]

Revision: 3825
          http://jcl.svn.sourceforge.net/jcl/?rev=3825&view=rev
Author:   outchy
Date:     2012-08-14 12:40:19 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
Mantis 5934: Installer puts HPP files in wrong folder plus wrong warning message:
- typo in installer resourcestring;
- override the rsvars variables with the registry ones, and not the opposite.

Modified Paths:
--------------
    trunk/jcl/install/JclInstallResources.pas
    trunk/jcl/source/common/JclIDEUtils.pas

Modified: trunk/jcl/install/JclInstallResources.pas
===================================================================
--- trunk/jcl/install/JclInstallResources.pas	2012-08-14 12:35:41 UTC (rev 3824)
+++ trunk/jcl/install/JclInstallResources.pas	2012-08-14 12:40:19 UTC (rev 3825)
@@ -282,7 +282,7 @@
   RsWarningPackageNodeNotSelected = 'The "Packages" node is not selected.' + sLineBreak +
     'Various libraries (including the JVCL) require JCL packages to be compiled' + sLineBreak +
     'Do you want to continue without compiling JCL packages?';
-  RsWarningCreatePath = 'The path where %s files will be created doesn''t exists.' + sLineBreak +
+  RsWarningCreatePath = 'The path where %s files will be created doesn''t exist.' + sLineBreak +
     'Do you want the JCL installer to create it?';
   RsErrorCantCreatePath = 'The path %s cannot be created';
   RsWarningAddPathToEnvironment = 'The path where BPL are created must be present in the PATH' + sLineBreak +

Modified: trunk/jcl/source/common/JclIDEUtils.pas
===================================================================
--- trunk/jcl/source/common/JclIDEUtils.pas	2012-08-14 12:35:41 UTC (rev 3824)
+++ trunk/jcl/source/common/JclIDEUtils.pas	2012-08-14 12:40:19 UTC (rev 3825)
@@ -3634,7 +3634,7 @@
 
 function TJclBDSInstallation.GetEnvironmentVariables: TStrings;
 var
-  RsVars: TStrings;
+  UserVariables: TStrings;
   Index: Integer;
   EnvOptionName: string;
 begin
@@ -3643,16 +3643,18 @@
     Result := inherited GetEnvironmentVariables;
     if Assigned(Result) and (IDEVersionNumber >= 5) then
     begin
-      RsVars := TStringList.Create;
+      UserVariables := TStringList.Create;
       try
-        GetRADStudioVars(RootDir, IDEVersionNumber, RsVars);
-        for Index := 0 to RsVars.Count - 1 do
+        UserVariables.Assign(Result);
+        Result.Clear;
+        GetRADStudioVars(RootDir, IDEVersionNumber, Result);
+        for Index := 0 to UserVariables.Count - 1 do
         begin
-          EnvOptionName := RsVars.Names[Index];
-          Result.Values[EnvOptionName] := RsVars.Values[EnvOptionName];
+          EnvOptionName := UserVariables.Names[Index];
+          Result.Values[EnvOptionName] := UserVariables.Values[EnvOptionName];
         end;
       finally
-        RsVars.Free;
+        UserVariables.Free;
       end;
     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:[3824] trunk/jcl/install

[<ou...@us...>]

Revision: 3824
          http://jcl.svn.sourceforge.net/jcl/?rev=3824&view=rev
Author:   outchy
Date:     2012-08-14 12:35:41 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
JclDotNet is not required by the JCL installer anymore.

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

Modified: trunk/jcl/install/JclInstall.pas
===================================================================
--- trunk/jcl/install/JclInstall.pas	2012-08-14 10:55:54 UTC (rev 3823)
+++ trunk/jcl/install/JclInstall.pas	2012-08-14 12:35:41 UTC (rev 3824)
@@ -355,7 +355,6 @@
   JclPeImage,
   JclRegistry,
   JclDebug,
-  JclDotNet,
   JclSecurity,
   JediRegInfo,
   JclShell,

Modified: trunk/jcl/install/JediInstaller.dpr
===================================================================
--- trunk/jcl/install/JediInstaller.dpr	2012-08-14 10:55:54 UTC (rev 3823)
+++ trunk/jcl/install/JediInstaller.dpr	2012-08-14 12:35:41 UTC (rev 3824)
@@ -17,7 +17,6 @@
   JclIDEUtils in '..\source\common\JclIDEUtils.pas',
   JclResources in '..\source\common\JclResources.pas',
   JediRegInfo in 'JediRegInfo.pas',
-  JclDotNet in '..\source\windows\JclDotNet.pas',
   FrmCompile in 'VclGui\FrmCompile.pas' {FormCompile},
   JediGUIText in 'VclGui\JediGUIText.pas' {TextFrame: TFrame},
   JediGUIInstall in 'VclGui\JediGUIInstall.pas' {InstallFrame: TFrame},
@@ -25,7 +24,8 @@
   JediGUIProfiles in 'VclGui\JediGUIProfiles.pas' {ProfilesFrame: TFrame},
   JediProfiles in 'JediProfiles.pas',
   JclInstallResources in 'JclInstallResources.pas',
-  JediInstallResources in 'JediInstallResources.pas';
+  JediInstallResources in 'JediInstallResources.pas',
+  JclMsBuild in '..\source\windows\JclMsBuild.pas';
 
 {$R *.res}
 {$R ..\source\windows\JclCommCtrlAsInvoker.res}

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:[3823] trunk/jcl/source/common/JclStrHashMap.pas

[<ou...@us...>]

Revision: 3823
          http://jcl.svn.sourceforge.net/jcl/?rev=3823&view=rev
Author:   outchy
Date:     2012-08-14 10:55:54 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
Mantis 5921: TextHash and StrHash produce identical hashes for similar input strings
use JclAlgorithms hash functions to solve this issue.

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

Modified: trunk/jcl/source/common/JclStrHashMap.pas
===================================================================
--- trunk/jcl/source/common/JclStrHashMap.pas	2012-08-14 10:52:04 UTC (rev 3822)
+++ trunk/jcl/source/common/JclStrHashMap.pas	2012-08-14 10:55:54 UTC (rev 3823)
@@ -124,9 +124,6 @@
 
 { Str=case sensitive, text=case insensitive }
 
-function StrHash(const S: string): THashValue;
-function TextHash(const S: string): THashValue;
-function DataHash(var AValue; ASize: Cardinal): THashValue;
 function Iterate_FreeObjects(AUserData: PUserData; const AStr: string; var AData: PData): Boolean;
 function Iterate_Dispose(AUserData: PUserData; const AStr: string; var AData: PData): Boolean;
 function Iterate_FreeMem(AUserData: PUserData; const AStr: string; var AData: PData): Boolean;
@@ -158,6 +155,9 @@
 
 implementation
 
+uses
+  JclAlgorithms;
+
 // Case Sensitive & Insensitive Traits
 function TCaseSensitiveTraits.Compare(const L, R: string): Integer;
 begin
@@ -166,7 +166,7 @@
 
 function TCaseSensitiveTraits.Hash(const S: string): Cardinal;
 begin
-  Result := StrHash(S);
+  Result := StrSimpleHashConvert(S);
 end;
 
 function TCaseInsensitiveTraits.Compare(const L, R: string): Integer;
@@ -176,7 +176,7 @@
 
 function TCaseInsensitiveTraits.Hash(const S: string): Cardinal;
 begin
-  Result := TextHash(S);
+  Result := StrSimpleHashConvertI(S);
 end;
 
 var
@@ -220,88 +220,6 @@
   Result := True;
 end;
 
-{$OVERFLOWCHECKS OFF}
-
-function StrHash(const S: string): Cardinal;
-const
-  cOneEight = 4;
-  cThreeFourths = 24;
-  cHighBits = $F0000000;
-var
-  I: Integer;
-  P: PChar;
-  Temp: Cardinal;
-begin
-  { TODO : I should really be processing 4 bytes at once... }
-  Result := 0;
-  P := PChar(S);
-
-  I := Length(S);
-  while I > 0 do
-  begin
-    Result := (Result shl cOneEight) or Ord(P^);
-    Temp := Result and cHighBits;
-    if Temp <> 0 then
-      Result := (Result xor (Temp shr cThreeFourths)) and (not cHighBits);
-    Dec(I);
-    Inc(P);
-  end;
-end;
-
-function TextHash(const S: string): Cardinal;
-const
-  cOneEight = 4;
-  cThreeFourths = 24;
-  cHighBits = $F0000000;
-var
-  I: Integer;
-  P: PChar;
-  Temp: Cardinal;
-begin
-  { TODO : I should really be processing 4 bytes at once... }
-  Result := 0;
-  P := PChar(S);
-
-  I := Length(S);
-  while I > 0 do
-  begin
-    Result := (Result shl cOneEight) or Ord(UpCase(P^));
-    Temp := Result and cHighBits;
-    if Temp <> 0 then
-      Result := (Result xor (Temp shr cThreeFourths)) and (not cHighBits);
-    Dec(I);
-    Inc(P);
-  end;
-end;
-
-function DataHash(var AValue; ASize: Cardinal): THashValue;
-const
-  cOneEight = 4;
-  cThreeFourths = 24;
-  cHighBits = $F0000000;
-var
-  P: PChar;
-  Temp: Cardinal;
-begin
-  { TODO : I should really be processing 4 bytes at once... }
-  Result := 0;
-  P := @AValue;
-
-  while ASize > 0 do
-  begin
-    Result := (Result shl cOneEight) or Ord(P^);
-    Temp := Result and cHighBits;
-    if Temp <> 0 then
-      Result := (Result xor (Temp shr cThreeFourths)) and (not cHighBits);
-    Dec(ASize);
-    Inc(P);
-  end;
-end;
-
-{$IFDEF OVERFLOWCHECKS_ON}
-{$OVERFLOWCHECKS ON}
-{$ENDIF OVERFLOWCHECKS_ON}
-
 //=== { TStringHashMap } =====================================================
 
 constructor TStringHashMap.Create(ATraits: TStringHashMapTraits; AHashSize: Cardinal);

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:[3822] trunk/jcl/source

[<ou...@us...>]

Revision: 3822
          http://jcl.svn.sourceforge.net/jcl/?rev=3822&view=rev
Author:   outchy
Date:     2012-08-14 10:52:04 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
new case-insensitive version of StrSimpleCompare, StrSimpleEqualityCompare and StrSimpleHashConvert.

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

Modified: trunk/jcl/source/common/JclAlgorithms.pas
===================================================================
--- trunk/jcl/source/common/JclAlgorithms.pas	2012-08-14 09:52:24 UTC (rev 3821)
+++ trunk/jcl/source/common/JclAlgorithms.pas	2012-08-14 10:52:04 UTC (rev 3822)
@@ -72,6 +72,7 @@
 {$IFDEF SUPPORTS_UNICODE_STRING}
 function UnicodeStrSimpleCompareI(const Obj1, Obj2: UnicodeString): Integer;
 {$ENDIF SUPPORTS_UNICODE_STRING}
+function StrSimpleCompareI(const Obj1, Obj2: string): Integer;
 
 // Compare functions for equality
 function IntfSimpleEqualityCompare(const Obj1, Obj2: IInterface): Boolean;
@@ -96,6 +97,7 @@
 {$IFDEF SUPPORTS_UNICODE_STRING}
 function UnicodeStrSimpleEqualityCompareI(const Obj1, Obj2: UnicodeString): Boolean;
 {$ENDIF SUPPORTS_UNICODE_STRING}
+function StrSimpleEqualityCompareI(const Obj1, Obj2: string): Boolean;
 
 // Hash conversion functions
 function IntfSimpleHashConvert(const AInterface: IInterface): Integer;
@@ -122,6 +124,7 @@
 {$IFDEF SUPPORTS_UNICODE_STRING}
 function UnicodeStrSimpleHashConvertI(const AString: UnicodeString): Integer;
 {$ENDIF SUPPORTS_UNICODE_STRING}
+function StrSimpleHashConvertI(const AString: string): Integer;
 
 type
   // Hash Function
@@ -675,6 +678,22 @@
   end;
 end;
 
+function StrSimpleCompareI(const Obj1, Obj2: string): Integer;
+begin
+  case SizeOf(Obj1[1]) of
+    SizeOf(AnsiChar):
+      Result := CompareText(Obj1, Obj2);
+    SizeOf(WideChar):
+      {$IFDEF SUPPORTS_UNICODE}
+      Result := CompareText(Obj1, Obj2);
+      {$ELSE ~SUPPORTS_UNICODE}
+      Result := WideCompareText(Obj1, Obj2);
+      {$ENDIF ~SUPPORTS_UNICODE}
+  else
+    raise EJclOperationNotSupportedError.Create;
+  end;
+end;
+
 function SingleSimpleCompare(const Obj1, Obj2: Single): Integer;
 begin
   if Obj1 < Obj2 then
@@ -840,6 +859,18 @@
   end;
 end;
 
+function StrSimpleEqualityCompareI(const Obj1, Obj2: string): Boolean;
+begin
+  case SizeOf(Obj1[1]) of
+    SizeOf(AnsiChar):
+      Result := CompareText(Obj1, Obj2) = 0;
+    SizeOf(WideChar):
+      Result := {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}SysUtils.WideCompareText(Obj1, Obj2) = 0;
+  else
+    raise EJclOperationNotSupportedError.Create;
+  end;
+end;
+
 function SingleSimpleEqualityCompare(const Obj1, Obj2: Single): Boolean;
 begin
   Result := Obj1 = Obj2;
@@ -1155,6 +1186,19 @@
   {$ENDIF ~SUPPORTS_UNICODE}
 end;
 
+function StrSimpleHashConvertI(const AString: string): Integer;
+begin
+  {$IFDEF SUPPORTS_UNICODE}
+  {$IFDEF SUPPORTS_UNICODE_STRING}
+  Result := UnicodeStrSimpleHashConvertI(AString);
+  {$ELSE ~SUPPORTS_UNICODE_STRING}
+  Result := WideStrSimpleHashConvertI(AString);
+  {$ENDIF ~SUPPORTS_UNICODE_STRING}
+  {$ELSE ~SUPPORTS_UNICODE}
+  Result := AnsiStrSimpleHashConvertI(AString);
+  {$ENDIF ~SUPPORTS_UNICODE}
+end;
+
 function SingleSimpleHashConvert(const AValue: Single): Integer;
 const
   A = 0.6180339887; // (sqrt(5) - 1) / 2

Modified: trunk/jcl/source/prototypes/JclAlgorithms.pas
===================================================================
--- trunk/jcl/source/prototypes/JclAlgorithms.pas	2012-08-14 09:52:24 UTC (rev 3821)
+++ trunk/jcl/source/prototypes/JclAlgorithms.pas	2012-08-14 10:52:04 UTC (rev 3822)
@@ -56,6 +56,7 @@
 {$IFDEF SUPPORTS_UNICODE_STRING}
 function UnicodeStrSimpleCompareI(const Obj1, Obj2: UnicodeString): Integer;
 {$ENDIF SUPPORTS_UNICODE_STRING}
+function StrSimpleCompareI(const Obj1, Obj2: string): Integer;
 
 // Compare functions for equality
 (*$JPPLOOP ALLTYPEINDEX ALLTYPECOUNT
@@ -66,6 +67,7 @@
 {$IFDEF SUPPORTS_UNICODE_STRING}
 function UnicodeStrSimpleEqualityCompareI(const Obj1, Obj2: UnicodeString): Boolean;
 {$ENDIF SUPPORTS_UNICODE_STRING}
+function StrSimpleEqualityCompareI(const Obj1, Obj2: string): Boolean;
 
 // Hash conversion functions
 (*$JPPLOOP ALLTYPEINDEX ALLTYPECOUNT
@@ -78,6 +80,7 @@
 {$IFDEF SUPPORTS_UNICODE_STRING}
 function UnicodeStrSimpleHashConvertI(const AString: UnicodeString): Integer;
 {$ENDIF SUPPORTS_UNICODE_STRING}
+function StrSimpleHashConvertI(const AString: string): Integer;
 
 type
   // Hash Function
@@ -315,6 +318,22 @@
   end;
 end;
 
+function StrSimpleCompareI(const Obj1, Obj2: string): Integer;
+begin
+  case SizeOf(Obj1[1]) of
+    SizeOf(AnsiChar):
+      Result := CompareText(Obj1, Obj2);
+    SizeOf(WideChar):
+      {$IFDEF SUPPORTS_UNICODE}
+      Result := CompareText(Obj1, Obj2);
+      {$ELSE ~SUPPORTS_UNICODE}
+      Result := WideCompareText(Obj1, Obj2);
+      {$ENDIF ~SUPPORTS_UNICODE}
+  else
+    raise EJclOperationNotSupportedError.Create;
+  end;
+end;
+
 function SingleSimpleCompare(const Obj1, Obj2: Single): Integer;
 begin
   if Obj1 < Obj2 then
@@ -480,6 +499,18 @@
   end;
 end;
 
+function StrSimpleEqualityCompareI(const Obj1, Obj2: string): Boolean;
+begin
+  case SizeOf(Obj1[1]) of
+    SizeOf(AnsiChar):
+      Result := CompareText(Obj1, Obj2) = 0;
+    SizeOf(WideChar):
+      Result := {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}SysUtils.WideCompareText(Obj1, Obj2) = 0;
+  else
+    raise EJclOperationNotSupportedError.Create;
+  end;
+end;
+
 function SingleSimpleEqualityCompare(const Obj1, Obj2: Single): Boolean;
 begin
   Result := Obj1 = Obj2;
@@ -795,6 +826,19 @@
   {$ENDIF ~SUPPORTS_UNICODE}
 end;
 
+function StrSimpleHashConvertI(const AString: string): Integer;
+begin
+  {$IFDEF SUPPORTS_UNICODE}
+  {$IFDEF SUPPORTS_UNICODE_STRING}
+  Result := UnicodeStrSimpleHashConvertI(AString);
+  {$ELSE ~SUPPORTS_UNICODE_STRING}
+  Result := WideStrSimpleHashConvertI(AString);
+  {$ENDIF ~SUPPORTS_UNICODE_STRING}
+  {$ELSE ~SUPPORTS_UNICODE}
+  Result := AnsiStrSimpleHashConvertI(AString);
+  {$ENDIF ~SUPPORTS_UNICODE}
+end;
+
 function SingleSimpleHashConvert(const AValue: Single): Integer;
 const
   A = 0.6180339887; // (sqrt(5) - 1) / 2

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:[3821] trunk/jcl/packages

[<ou...@us...>]

Revision: 3821
          http://jcl.svn.sourceforge.net/jcl/?rev=3821&view=rev
Author:   outchy
Date:     2012-08-14 09:52:24 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
move JclStrHashMap.pas from package Jcl to package JclContainers.
move JclExprEval.pas from package Jcl to package JclDeveloperTools.

Modified Paths:
--------------
    trunk/jcl/packages/c6/Jcl.bpk
    trunk/jcl/packages/c6/Jcl.dpk
    trunk/jcl/packages/c6/JclContainers.bpk
    trunk/jcl/packages/c6/JclContainers.dpk
    trunk/jcl/packages/c6/JclDeveloperTools.bpk
    trunk/jcl/packages/c6/JclDeveloperTools.dpk
    trunk/jcl/packages/cs1/Jcl.dpk
    trunk/jcl/packages/cs1/JclContainers.dpk
    trunk/jcl/packages/cs1/JclDeveloperTools.dpk
    trunk/jcl/packages/d10/Jcl.dpk
    trunk/jcl/packages/d10/JclContainers.dpk
    trunk/jcl/packages/d10/JclDeveloperTools.dpk
    trunk/jcl/packages/d11/Jcl.dpk
    trunk/jcl/packages/d11/Jcl.dproj
    trunk/jcl/packages/d11/JclContainers.dpk
    trunk/jcl/packages/d11/JclContainers.dproj
    trunk/jcl/packages/d11/JclDeveloperTools.dpk
    trunk/jcl/packages/d11/JclDeveloperTools.dproj
    trunk/jcl/packages/d12/Jcl.dpk
    trunk/jcl/packages/d12/Jcl.dproj
    trunk/jcl/packages/d12/JclContainers.dpk
    trunk/jcl/packages/d12/JclContainers.dproj
    trunk/jcl/packages/d12/JclDeveloperTools.dpk
    trunk/jcl/packages/d12/JclDeveloperTools.dproj
    trunk/jcl/packages/d14/Jcl.dpk
    trunk/jcl/packages/d14/Jcl.dproj
    trunk/jcl/packages/d14/JclContainers.dpk
    trunk/jcl/packages/d14/JclContainers.dproj
    trunk/jcl/packages/d14/JclDeveloperTools.dpk
    trunk/jcl/packages/d14/JclDeveloperTools.dproj
    trunk/jcl/packages/d15/Jcl.dpk
    trunk/jcl/packages/d15/Jcl.dproj
    trunk/jcl/packages/d15/JclContainers.dpk
    trunk/jcl/packages/d15/JclContainers.dproj
    trunk/jcl/packages/d15/JclDeveloperTools.dpk
    trunk/jcl/packages/d15/JclDeveloperTools.dproj
    trunk/jcl/packages/d16/Jcl.dpk
    trunk/jcl/packages/d16/Jcl.dproj
    trunk/jcl/packages/d16/JclContainers.dpk
    trunk/jcl/packages/d16/JclContainers.dproj
    trunk/jcl/packages/d16/JclDeveloperTools.dpk
    trunk/jcl/packages/d16/JclDeveloperTools.dproj
    trunk/jcl/packages/d6/Jcl.dpk
    trunk/jcl/packages/d6/JclContainers.dpk
    trunk/jcl/packages/d6/JclDeveloperTools.dpk
    trunk/jcl/packages/d7/Jcl.dpk
    trunk/jcl/packages/d7/JclContainers.dpk
    trunk/jcl/packages/d7/JclDeveloperTools.dpk
    trunk/jcl/packages/d8/Jcl.dpk
    trunk/jcl/packages/d8/JclContainers.dpk
    trunk/jcl/packages/d8/JclDeveloperTools.dpk
    trunk/jcl/packages/d9/Jcl.dpk
    trunk/jcl/packages/d9/JclContainers.dpk
    trunk/jcl/packages/d9/JclDeveloperTools.dpk
    trunk/jcl/packages/fpc/Jcl.lpk
    trunk/jcl/packages/fpc/Jcl.pas
    trunk/jcl/packages/fpc/JclContainers.lpk
    trunk/jcl/packages/fpc/JclContainers.pas
    trunk/jcl/packages/fpc/JclDeveloperTools.lpk
    trunk/jcl/packages/fpc/JclDeveloperTools.pas
    trunk/jcl/packages/help/Jcl.dox
    trunk/jcl/packages/help/JclContainers.dox
    trunk/jcl/packages/help/JclDeveloperTools.dox
    trunk/jcl/packages/xml/Jcl-R.xml
    trunk/jcl/packages/xml/JclContainers-R.xml
    trunk/jcl/packages/xml/JclDeveloperTools-R.xml

Modified: trunk/jcl/packages/c6/Jcl.bpk
===================================================================
--- trunk/jcl/packages/c6/Jcl.bpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/c6/Jcl.bpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -5,7 +5,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 17-06-2011  09:43:08 UTC
+     Last generated: 14-08-2012  09:49:00 UTC
 *****************************************************************************
 -->
 <PROJECT>
@@ -23,7 +23,6 @@
       ..\..\lib\c6\JclCompression.obj
       ..\..\lib\c6\JclCounter.obj
       ..\..\lib\c6\JclDateTime.obj
-      ..\..\lib\c6\JclExprEval.obj
       ..\..\lib\c6\JclFileUtils.obj
       ..\..\lib\c6\JclIniFiles.obj
       ..\..\lib\c6\JclLogic.obj
@@ -38,7 +37,6 @@
       ..\..\lib\c6\JclSimpleXml.obj
       ..\..\lib\c6\JclStatistics.obj
       ..\..\lib\c6\JclStreams.obj
-      ..\..\lib\c6\JclStrHashMap.obj
       ..\..\lib\c6\JclStringConversions.obj
       ..\..\lib\c6\JclStringLists.obj
       ..\..\lib\c6\JclStrings.obj
@@ -150,7 +148,6 @@
       <FILE FILENAME="..\..\source\common\JclCompression.pas" FORMNAME="" UNITNAME="JclCompression" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclCounter.pas" FORMNAME="" UNITNAME="JclCounter" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclDateTime.pas" FORMNAME="" UNITNAME="JclDateTime" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\source\common\JclExprEval.pas" FORMNAME="" UNITNAME="JclExprEval" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclFileUtils.pas" FORMNAME="" UNITNAME="JclFileUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclIniFiles.pas" FORMNAME="" UNITNAME="JclIniFiles" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclLogic.pas" FORMNAME="" UNITNAME="JclLogic" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
@@ -165,7 +162,6 @@
       <FILE FILENAME="..\..\source\common\JclSimpleXml.pas" FORMNAME="" UNITNAME="JclSimpleXml" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclStatistics.pas" FORMNAME="" UNITNAME="JclStatistics" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclStreams.pas" FORMNAME="" UNITNAME="JclStreams" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
-      <FILE FILENAME="..\..\source\common\JclStrHashMap.pas" FORMNAME="" UNITNAME="JclStrHashMap" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclStringConversions.pas" FORMNAME="" UNITNAME="JclStringConversions" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclStringLists.pas" FORMNAME="" UNITNAME="JclStringLists" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclStrings.pas" FORMNAME="" UNITNAME="JclStrings" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

Modified: trunk/jcl/packages/c6/Jcl.dpk
===================================================================
--- trunk/jcl/packages/c6/Jcl.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/c6/Jcl.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 17-06-2011  09:43:09 UTC
+     Last generated: 14-08-2012  09:49:01 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -54,7 +54,6 @@
   JclCompression in '..\..\source\common\JclCompression.pas' ,
   JclCounter in '..\..\source\common\JclCounter.pas' ,
   JclDateTime in '..\..\source\common\JclDateTime.pas' ,
-  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
   JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
   JclLogic in '..\..\source\common\JclLogic.pas' ,
@@ -69,7 +68,6 @@
   JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
   JclStatistics in '..\..\source\common\JclStatistics.pas' ,
   JclStreams in '..\..\source\common\JclStreams.pas' ,
-  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclStringConversions in '..\..\source\common\JclStringConversions.pas' ,
   JclStringLists in '..\..\source\common\JclStringLists.pas' ,
   JclStrings in '..\..\source\common\JclStrings.pas' ,

Modified: trunk/jcl/packages/c6/JclContainers.bpk
===================================================================
--- trunk/jcl/packages/c6/JclContainers.bpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/c6/JclContainers.bpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -5,7 +5,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
 
-     Last generated: 07-05-2010  18:24:22 UTC
+     Last generated: 14-08-2012  09:49:00 UTC
 *****************************************************************************
 -->
 <PROJECT>
@@ -26,6 +26,7 @@
       ..\..\lib\c6\JclQueues.obj
       ..\..\lib\c6\JclSortedMaps.obj
       ..\..\lib\c6\JclStacks.obj
+      ..\..\lib\c6\JclStrHashMap.obj
       ..\..\lib\c6\JclTrees.obj
       ..\..\lib\c6\JclVectors.obj
     "/>
@@ -92,6 +93,7 @@
       <FILE FILENAME="..\..\source\common\JclQueues.pas" FORMNAME="" UNITNAME="JclQueues" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclSortedMaps.pas" FORMNAME="" UNITNAME="JclSortedMaps" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclStacks.pas" FORMNAME="" UNITNAME="JclStacks" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\source\common\JclStrHashMap.pas" FORMNAME="" UNITNAME="JclStrHashMap" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclTrees.pas" FORMNAME="" UNITNAME="JclTrees" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclVectors.pas" FORMNAME="" UNITNAME="JclVectors" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
   </FILELIST>

Modified: trunk/jcl/packages/c6/JclContainers.dpk
===================================================================
--- trunk/jcl/packages/c6/JclContainers.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/c6/JclContainers.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
 
-     Last generated: 07-05-2010  18:24:22 UTC
+     Last generated: 14-08-2012  09:49:01 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -58,6 +58,7 @@
   JclQueues in '..\..\source\common\JclQueues.pas' ,
   JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
   JclStacks in '..\..\source\common\JclStacks.pas' ,
+  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclTrees in '..\..\source\common\JclTrees.pas' ,
   JclVectors in '..\..\source\common\JclVectors.pas' 
   ;

Modified: trunk/jcl/packages/c6/JclDeveloperTools.bpk
===================================================================
--- trunk/jcl/packages/c6/JclDeveloperTools.bpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/c6/JclDeveloperTools.bpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -5,7 +5,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 09-04-2012  16:01:27 UTC
+     Last generated: 14-08-2012  09:49:00 UTC
 *****************************************************************************
 -->
 <PROJECT>
@@ -16,6 +16,7 @@
       ..\..\lib\c6\JclDeveloperTools.obj
       ..\..\lib\c6\JclCompilerUtils.obj
       ..\..\lib\c6\JclDevToolsResources.obj
+      ..\..\lib\c6\JclExprEval.obj
       ..\..\lib\c6\JclIDEUtils.obj
       ..\..\lib\c6\JclPreProcessorAlgorithmsTemplates.obj
       ..\..\lib\c6\JclPreProcessorArrayListsTemplates.obj
@@ -100,6 +101,7 @@
       <FILE FILENAME="JclContainers.bpi" FORMNAME="" UNITNAME="JclContainers" CONTAINERID="BPITool" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclCompilerUtils.pas" FORMNAME="" UNITNAME="JclCompilerUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclDevToolsResources.pas" FORMNAME="" UNITNAME="JclDevToolsResources" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
+      <FILE FILENAME="..\..\source\common\JclExprEval.pas" FORMNAME="" UNITNAME="JclExprEval" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclIDEUtils.pas" FORMNAME="" UNITNAME="JclIDEUtils" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclPreProcessorAlgorithmsTemplates.pas" FORMNAME="" UNITNAME="JclPreProcessorAlgorithmsTemplates" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>
       <FILE FILENAME="..\..\source\common\JclPreProcessorArrayListsTemplates.pas" FORMNAME="" UNITNAME="JclPreProcessorArrayListsTemplates" CONTAINERID="PascalCompiler" DESIGNCLASS="" LOCALCOMMAND=""/>

Modified: trunk/jcl/packages/c6/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/c6/JclDeveloperTools.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/c6/JclDeveloperTools.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 09-04-2012  16:01:28 UTC
+     Last generated: 14-08-2012  09:49:01 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -49,6 +49,7 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
+  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
   JclPreProcessorAlgorithmsTemplates in '..\..\source\common\JclPreProcessorAlgorithmsTemplates.pas' ,
   JclPreProcessorArrayListsTemplates in '..\..\source\common\JclPreProcessorArrayListsTemplates.pas' ,

Modified: trunk/jcl/packages/cs1/Jcl.dpk
===================================================================
--- trunk/jcl/packages/cs1/Jcl.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/cs1/Jcl.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 07-05-2010  18:46:59 UTC
+     Last generated: 14-08-2012  09:49:04 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -53,7 +53,6 @@
   JclCompression in '..\..\source\common\JclCompression.pas' ,
   JclCounter in '..\..\source\common\JclCounter.pas' ,
   JclDateTime in '..\..\source\common\JclDateTime.pas' ,
-  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
   JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
   JclLogic in '..\..\source\common\JclLogic.pas' ,
@@ -68,7 +67,6 @@
   JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
   JclStatistics in '..\..\source\common\JclStatistics.pas' ,
   JclStreams in '..\..\source\common\JclStreams.pas' ,
-  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclStringConversions in '..\..\source\common\JclStringConversions.pas' ,
   JclStringLists in '..\..\source\common\JclStringLists.pas' ,
   JclStrings in '..\..\source\common\JclStrings.pas' ,

Modified: trunk/jcl/packages/cs1/JclContainers.dpk
===================================================================
--- trunk/jcl/packages/cs1/JclContainers.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/cs1/JclContainers.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
 
-     Last generated: 07-05-2010  18:24:26 UTC
+     Last generated: 14-08-2012  09:49:04 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -57,6 +57,7 @@
   JclQueues in '..\..\source\common\JclQueues.pas' ,
   JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
   JclStacks in '..\..\source\common\JclStacks.pas' ,
+  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclTrees in '..\..\source\common\JclTrees.pas' ,
   JclVectors in '..\..\source\common\JclVectors.pas' 
   ;

Modified: trunk/jcl/packages/cs1/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/cs1/JclDeveloperTools.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/cs1/JclDeveloperTools.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 09-04-2012  16:01:28 UTC
+     Last generated: 14-08-2012  09:49:04 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -48,6 +48,7 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
+  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
   JclUsesUtils in '..\..\source\common\JclUsesUtils.pas' 
   ;

Modified: trunk/jcl/packages/d10/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d10/Jcl.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d10/Jcl.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 17-06-2011  09:43:12 UTC
+     Last generated: 14-08-2012  09:49:06 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -55,7 +55,6 @@
   JclCompression in '..\..\source\common\JclCompression.pas' ,
   JclCounter in '..\..\source\common\JclCounter.pas' ,
   JclDateTime in '..\..\source\common\JclDateTime.pas' ,
-  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
   JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
   JclLogic in '..\..\source\common\JclLogic.pas' ,
@@ -70,7 +69,6 @@
   JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
   JclStatistics in '..\..\source\common\JclStatistics.pas' ,
   JclStreams in '..\..\source\common\JclStreams.pas' ,
-  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclStringConversions in '..\..\source\common\JclStringConversions.pas' ,
   JclStringLists in '..\..\source\common\JclStringLists.pas' ,
   JclStrings in '..\..\source\common\JclStrings.pas' ,

Modified: trunk/jcl/packages/d10/JclContainers.dpk
===================================================================
--- trunk/jcl/packages/d10/JclContainers.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d10/JclContainers.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
 
-     Last generated: 07-05-2010  18:24:27 UTC
+     Last generated: 14-08-2012  09:49:05 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -59,6 +59,7 @@
   JclQueues in '..\..\source\common\JclQueues.pas' ,
   JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
   JclStacks in '..\..\source\common\JclStacks.pas' ,
+  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclTrees in '..\..\source\common\JclTrees.pas' ,
   JclVectors in '..\..\source\common\JclVectors.pas' 
   ;

Modified: trunk/jcl/packages/d10/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d10/JclDeveloperTools.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d10/JclDeveloperTools.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 09-04-2012  16:01:30 UTC
+     Last generated: 14-08-2012  09:49:05 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -50,6 +50,7 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
+  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
   JclPreProcessorAlgorithmsTemplates in '..\..\source\common\JclPreProcessorAlgorithmsTemplates.pas' ,
   JclPreProcessorArrayListsTemplates in '..\..\source\common\JclPreProcessorArrayListsTemplates.pas' ,

Modified: trunk/jcl/packages/d11/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d11/Jcl.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d11/Jcl.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 17-06-2011  09:44:13 UTC
+     Last generated: 14-08-2012  09:49:06 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -56,7 +56,6 @@
   JclCompression in '..\..\source\common\JclCompression.pas' ,
   JclCounter in '..\..\source\common\JclCounter.pas' ,
   JclDateTime in '..\..\source\common\JclDateTime.pas' ,
-  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
   JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
   JclLogic in '..\..\source\common\JclLogic.pas' ,
@@ -71,7 +70,6 @@
   JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
   JclStatistics in '..\..\source\common\JclStatistics.pas' ,
   JclStreams in '..\..\source\common\JclStreams.pas' ,
-  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclStringConversions in '..\..\source\common\JclStringConversions.pas' ,
   JclStringLists in '..\..\source\common\JclStringLists.pas' ,
   JclStrings in '..\..\source\common\JclStrings.pas' ,

Modified: trunk/jcl/packages/d11/Jcl.dproj
===================================================================
--- trunk/jcl/packages/d11/Jcl.dproj	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d11/Jcl.dproj	2012-08-14 09:52:24 UTC (rev 3821)
@@ -95,7 +95,6 @@
     <DCCReference Include="..\..\source\common\JclCompression.pas"/>
     <DCCReference Include="..\..\source\common\JclCounter.pas"/>
     <DCCReference Include="..\..\source\common\JclDateTime.pas"/>
-    <DCCReference Include="..\..\source\common\JclExprEval.pas"/>
     <DCCReference Include="..\..\source\common\JclFileUtils.pas"/>
     <DCCReference Include="..\..\source\common\JclIniFiles.pas"/>
     <DCCReference Include="..\..\source\common\JclLogic.pas"/>
@@ -110,7 +109,6 @@
     <DCCReference Include="..\..\source\common\JclSimpleXml.pas"/>
     <DCCReference Include="..\..\source\common\JclStatistics.pas"/>
     <DCCReference Include="..\..\source\common\JclStreams.pas"/>
-    <DCCReference Include="..\..\source\common\JclStrHashMap.pas"/>
     <DCCReference Include="..\..\source\common\JclStringConversions.pas"/>
     <DCCReference Include="..\..\source\common\JclStringLists.pas"/>
     <DCCReference Include="..\..\source\common\JclStrings.pas"/>

Modified: trunk/jcl/packages/d11/JclContainers.dpk
===================================================================
--- trunk/jcl/packages/d11/JclContainers.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d11/JclContainers.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
 
-     Last generated: 07-05-2010  18:24:27 UTC
+     Last generated: 14-08-2012  09:49:06 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -60,6 +60,7 @@
   JclQueues in '..\..\source\common\JclQueues.pas' ,
   JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
   JclStacks in '..\..\source\common\JclStacks.pas' ,
+  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclTrees in '..\..\source\common\JclTrees.pas' ,
   JclVectors in '..\..\source\common\JclVectors.pas' 
   ;

Modified: trunk/jcl/packages/d11/JclContainers.dproj
===================================================================
--- trunk/jcl/packages/d11/JclContainers.dproj	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d11/JclContainers.dproj	2012-08-14 09:52:24 UTC (rev 3821)
@@ -99,6 +99,7 @@
     <DCCReference Include="..\..\source\common\JclQueues.pas"/>
     <DCCReference Include="..\..\source\common\JclSortedMaps.pas"/>
     <DCCReference Include="..\..\source\common\JclStacks.pas"/>
+    <DCCReference Include="..\..\source\common\JclStrHashMap.pas"/>
     <DCCReference Include="..\..\source\common\JclTrees.pas"/>
     <DCCReference Include="..\..\source\common\JclVectors.pas"/>
   </ItemGroup>

Modified: trunk/jcl/packages/d11/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d11/JclDeveloperTools.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d11/JclDeveloperTools.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 09-04-2012  16:01:30 UTC
+     Last generated: 14-08-2012  09:49:06 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -51,6 +51,7 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
+  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
   JclPreProcessorAlgorithmsTemplates in '..\..\source\common\JclPreProcessorAlgorithmsTemplates.pas' ,
   JclPreProcessorArrayListsTemplates in '..\..\source\common\JclPreProcessorArrayListsTemplates.pas' ,

Modified: trunk/jcl/packages/d11/JclDeveloperTools.dproj
===================================================================
--- trunk/jcl/packages/d11/JclDeveloperTools.dproj	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d11/JclDeveloperTools.dproj	2012-08-14 09:52:24 UTC (rev 3821)
@@ -90,6 +90,7 @@
     <DCCReference Include="JclContainers.dcp"/>
     <DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/>
     <DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/>
+    <DCCReference Include="..\..\source\common\JclExprEval.pas"/>
     <DCCReference Include="..\..\source\common\JclIDEUtils.pas"/>
     <DCCReference Include="..\..\source\common\JclPreProcessorAlgorithmsTemplates.pas"/>
     <DCCReference Include="..\..\source\common\JclPreProcessorArrayListsTemplates.pas"/>

Modified: trunk/jcl/packages/d12/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d12/Jcl.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d12/Jcl.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 17-06-2011  09:43:13 UTC
+     Last generated: 14-08-2012  09:49:07 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -55,7 +55,6 @@
   JclCompression in '..\..\source\common\JclCompression.pas' ,
   JclCounter in '..\..\source\common\JclCounter.pas' ,
   JclDateTime in '..\..\source\common\JclDateTime.pas' ,
-  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
   JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
   JclLogic in '..\..\source\common\JclLogic.pas' ,
@@ -70,7 +69,6 @@
   JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
   JclStatistics in '..\..\source\common\JclStatistics.pas' ,
   JclStreams in '..\..\source\common\JclStreams.pas' ,
-  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclStringConversions in '..\..\source\common\JclStringConversions.pas' ,
   JclStringLists in '..\..\source\common\JclStringLists.pas' ,
   JclStrings in '..\..\source\common\JclStrings.pas' ,

Modified: trunk/jcl/packages/d12/Jcl.dproj
===================================================================
--- trunk/jcl/packages/d12/Jcl.dproj	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d12/Jcl.dproj	2012-08-14 09:52:24 UTC (rev 3821)
@@ -70,7 +70,6 @@
 			<DCCReference Include="..\..\source\common\JclCompression.pas"/>
 			<DCCReference Include="..\..\source\common\JclCounter.pas"/>
 			<DCCReference Include="..\..\source\common\JclDateTime.pas"/>
-			<DCCReference Include="..\..\source\common\JclExprEval.pas"/>
 			<DCCReference Include="..\..\source\common\JclFileUtils.pas"/>
 			<DCCReference Include="..\..\source\common\JclIniFiles.pas"/>
 			<DCCReference Include="..\..\source\common\JclLogic.pas"/>
@@ -85,7 +84,6 @@
 			<DCCReference Include="..\..\source\common\JclSimpleXml.pas"/>
 			<DCCReference Include="..\..\source\common\JclStatistics.pas"/>
 			<DCCReference Include="..\..\source\common\JclStreams.pas"/>
-			<DCCReference Include="..\..\source\common\JclStrHashMap.pas"/>
 			<DCCReference Include="..\..\source\common\JclStringConversions.pas"/>
 			<DCCReference Include="..\..\source\common\JclStringLists.pas"/>
 			<DCCReference Include="..\..\source\common\JclStrings.pas"/>

Modified: trunk/jcl/packages/d12/JclContainers.dpk
===================================================================
--- trunk/jcl/packages/d12/JclContainers.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d12/JclContainers.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
 
-     Last generated: 07-05-2010  18:24:28 UTC
+     Last generated: 14-08-2012  09:49:07 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -59,6 +59,7 @@
   JclQueues in '..\..\source\common\JclQueues.pas' ,
   JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
   JclStacks in '..\..\source\common\JclStacks.pas' ,
+  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclTrees in '..\..\source\common\JclTrees.pas' ,
   JclVectors in '..\..\source\common\JclVectors.pas' 
   ;

Modified: trunk/jcl/packages/d12/JclContainers.dproj
===================================================================
--- trunk/jcl/packages/d12/JclContainers.dproj	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d12/JclContainers.dproj	2012-08-14 09:52:24 UTC (rev 3821)
@@ -74,6 +74,7 @@
 			<DCCReference Include="..\..\source\common\JclQueues.pas"/>
 			<DCCReference Include="..\..\source\common\JclSortedMaps.pas"/>
 			<DCCReference Include="..\..\source\common\JclStacks.pas"/>
+			<DCCReference Include="..\..\source\common\JclStrHashMap.pas"/>
 			<DCCReference Include="..\..\source\common\JclTrees.pas"/>
 			<DCCReference Include="..\..\source\common\JclVectors.pas"/>
 			<BuildConfiguration Include="Base">

Modified: trunk/jcl/packages/d12/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d12/JclDeveloperTools.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d12/JclDeveloperTools.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 09-04-2012  16:01:30 UTC
+     Last generated: 14-08-2012  09:49:07 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -50,6 +50,7 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
+  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
   JclPreProcessorAlgorithmsTemplates in '..\..\source\common\JclPreProcessorAlgorithmsTemplates.pas' ,
   JclPreProcessorArrayListsTemplates in '..\..\source\common\JclPreProcessorArrayListsTemplates.pas' ,

Modified: trunk/jcl/packages/d12/JclDeveloperTools.dproj
===================================================================
--- trunk/jcl/packages/d12/JclDeveloperTools.dproj	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d12/JclDeveloperTools.dproj	2012-08-14 09:52:24 UTC (rev 3821)
@@ -65,6 +65,7 @@
 			<DCCReference Include="JclContainers.dcp"/>
 			<DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/>
 			<DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/>
+			<DCCReference Include="..\..\source\common\JclExprEval.pas"/>
 			<DCCReference Include="..\..\source\common\JclIDEUtils.pas"/>
 			<DCCReference Include="..\..\source\common\JclPreProcessorAlgorithmsTemplates.pas"/>
 			<DCCReference Include="..\..\source\common\JclPreProcessorArrayListsTemplates.pas"/>

Modified: trunk/jcl/packages/d14/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d14/Jcl.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d14/Jcl.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 17-06-2011  09:43:14 UTC
+     Last generated: 14-08-2012  09:49:08 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -55,7 +55,6 @@
   JclCompression in '..\..\source\common\JclCompression.pas' ,
   JclCounter in '..\..\source\common\JclCounter.pas' ,
   JclDateTime in '..\..\source\common\JclDateTime.pas' ,
-  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
   JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
   JclLogic in '..\..\source\common\JclLogic.pas' ,
@@ -70,7 +69,6 @@
   JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
   JclStatistics in '..\..\source\common\JclStatistics.pas' ,
   JclStreams in '..\..\source\common\JclStreams.pas' ,
-  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclStringConversions in '..\..\source\common\JclStringConversions.pas' ,
   JclStringLists in '..\..\source\common\JclStringLists.pas' ,
   JclStrings in '..\..\source\common\JclStrings.pas' ,

Modified: trunk/jcl/packages/d14/Jcl.dproj
===================================================================
--- trunk/jcl/packages/d14/Jcl.dproj	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d14/Jcl.dproj	2012-08-14 09:52:24 UTC (rev 3821)
@@ -72,7 +72,6 @@
 			<DCCReference Include="..\..\source\common\JclCompression.pas"/>
 			<DCCReference Include="..\..\source\common\JclCounter.pas"/>
 			<DCCReference Include="..\..\source\common\JclDateTime.pas"/>
-			<DCCReference Include="..\..\source\common\JclExprEval.pas"/>
 			<DCCReference Include="..\..\source\common\JclFileUtils.pas"/>
 			<DCCReference Include="..\..\source\common\JclIniFiles.pas"/>
 			<DCCReference Include="..\..\source\common\JclLogic.pas"/>
@@ -87,7 +86,6 @@
 			<DCCReference Include="..\..\source\common\JclSimpleXml.pas"/>
 			<DCCReference Include="..\..\source\common\JclStatistics.pas"/>
 			<DCCReference Include="..\..\source\common\JclStreams.pas"/>
-			<DCCReference Include="..\..\source\common\JclStrHashMap.pas"/>
 			<DCCReference Include="..\..\source\common\JclStringConversions.pas"/>
 			<DCCReference Include="..\..\source\common\JclStringLists.pas"/>
 			<DCCReference Include="..\..\source\common\JclStrings.pas"/>

Modified: trunk/jcl/packages/d14/JclContainers.dpk
===================================================================
--- trunk/jcl/packages/d14/JclContainers.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d14/JclContainers.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
 
-     Last generated: 07-05-2010  18:24:29 UTC
+     Last generated: 14-08-2012  09:49:08 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -59,6 +59,7 @@
   JclQueues in '..\..\source\common\JclQueues.pas' ,
   JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
   JclStacks in '..\..\source\common\JclStacks.pas' ,
+  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclTrees in '..\..\source\common\JclTrees.pas' ,
   JclVectors in '..\..\source\common\JclVectors.pas' 
   ;

Modified: trunk/jcl/packages/d14/JclContainers.dproj
===================================================================
--- trunk/jcl/packages/d14/JclContainers.dproj	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d14/JclContainers.dproj	2012-08-14 09:52:24 UTC (rev 3821)
@@ -76,6 +76,7 @@
 			<DCCReference Include="..\..\source\common\JclQueues.pas"/>
 			<DCCReference Include="..\..\source\common\JclSortedMaps.pas"/>
 			<DCCReference Include="..\..\source\common\JclStacks.pas"/>
+			<DCCReference Include="..\..\source\common\JclStrHashMap.pas"/>
 			<DCCReference Include="..\..\source\common\JclTrees.pas"/>
 			<DCCReference Include="..\..\source\common\JclVectors.pas"/>
 			<BuildConfiguration Include="Base">

Modified: trunk/jcl/packages/d14/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d14/JclDeveloperTools.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d14/JclDeveloperTools.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 09-04-2012  16:01:30 UTC
+     Last generated: 14-08-2012  09:49:08 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -50,6 +50,7 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
+  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
   JclPreProcessorAlgorithmsTemplates in '..\..\source\common\JclPreProcessorAlgorithmsTemplates.pas' ,
   JclPreProcessorArrayListsTemplates in '..\..\source\common\JclPreProcessorArrayListsTemplates.pas' ,

Modified: trunk/jcl/packages/d14/JclDeveloperTools.dproj
===================================================================
--- trunk/jcl/packages/d14/JclDeveloperTools.dproj	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d14/JclDeveloperTools.dproj	2012-08-14 09:52:24 UTC (rev 3821)
@@ -67,6 +67,7 @@
 			<DCCReference Include="JclContainers.dcp"/>
 			<DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/>
 			<DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/>
+			<DCCReference Include="..\..\source\common\JclExprEval.pas"/>
 			<DCCReference Include="..\..\source\common\JclIDEUtils.pas"/>
 			<DCCReference Include="..\..\source\common\JclPreProcessorAlgorithmsTemplates.pas"/>
 			<DCCReference Include="..\..\source\common\JclPreProcessorArrayListsTemplates.pas"/>

Modified: trunk/jcl/packages/d15/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d15/Jcl.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d15/Jcl.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 17-06-2011  09:43:14 UTC
+     Last generated: 14-08-2012  09:49:09 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -54,7 +54,6 @@
   JclCompression in '..\..\source\common\JclCompression.pas' ,
   JclCounter in '..\..\source\common\JclCounter.pas' ,
   JclDateTime in '..\..\source\common\JclDateTime.pas' ,
-  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
   JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
   JclLogic in '..\..\source\common\JclLogic.pas' ,
@@ -69,7 +68,6 @@
   JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
   JclStatistics in '..\..\source\common\JclStatistics.pas' ,
   JclStreams in '..\..\source\common\JclStreams.pas' ,
-  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclStringConversions in '..\..\source\common\JclStringConversions.pas' ,
   JclStringLists in '..\..\source\common\JclStringLists.pas' ,
   JclStrings in '..\..\source\common\JclStrings.pas' ,

Modified: trunk/jcl/packages/d15/Jcl.dproj
===================================================================
--- trunk/jcl/packages/d15/Jcl.dproj	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d15/Jcl.dproj	2012-08-14 09:52:24 UTC (rev 3821)
@@ -79,7 +79,6 @@
 			<DCCReference Include="..\..\source\common\JclCompression.pas"/>
 			<DCCReference Include="..\..\source\common\JclCounter.pas"/>
 			<DCCReference Include="..\..\source\common\JclDateTime.pas"/>
-			<DCCReference Include="..\..\source\common\JclExprEval.pas"/>
 			<DCCReference Include="..\..\source\common\JclFileUtils.pas"/>
 			<DCCReference Include="..\..\source\common\JclIniFiles.pas"/>
 			<DCCReference Include="..\..\source\common\JclLogic.pas"/>
@@ -94,7 +93,6 @@
 			<DCCReference Include="..\..\source\common\JclSimpleXml.pas"/>
 			<DCCReference Include="..\..\source\common\JclStatistics.pas"/>
 			<DCCReference Include="..\..\source\common\JclStreams.pas"/>
-			<DCCReference Include="..\..\source\common\JclStrHashMap.pas"/>
 			<DCCReference Include="..\..\source\common\JclStringConversions.pas"/>
 			<DCCReference Include="..\..\source\common\JclStringLists.pas"/>
 			<DCCReference Include="..\..\source\common\JclStrings.pas"/>

Modified: trunk/jcl/packages/d15/JclContainers.dpk
===================================================================
--- trunk/jcl/packages/d15/JclContainers.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d15/JclContainers.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
 
-     Last generated: 01-08-2010  21:03:32 UTC
+     Last generated: 14-08-2012  09:49:09 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -58,6 +58,7 @@
   JclQueues in '..\..\source\common\JclQueues.pas' ,
   JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
   JclStacks in '..\..\source\common\JclStacks.pas' ,
+  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclTrees in '..\..\source\common\JclTrees.pas' ,
   JclVectors in '..\..\source\common\JclVectors.pas' 
   ;

Modified: trunk/jcl/packages/d15/JclContainers.dproj
===================================================================
--- trunk/jcl/packages/d15/JclContainers.dproj	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d15/JclContainers.dproj	2012-08-14 09:52:24 UTC (rev 3821)
@@ -83,6 +83,7 @@
 			<DCCReference Include="..\..\source\common\JclQueues.pas"/>
 			<DCCReference Include="..\..\source\common\JclSortedMaps.pas"/>
 			<DCCReference Include="..\..\source\common\JclStacks.pas"/>
+			<DCCReference Include="..\..\source\common\JclStrHashMap.pas"/>
 			<DCCReference Include="..\..\source\common\JclTrees.pas"/>
 			<DCCReference Include="..\..\source\common\JclVectors.pas"/>
 			<BuildConfiguration Include="Release">

Modified: trunk/jcl/packages/d15/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d15/JclDeveloperTools.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d15/JclDeveloperTools.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 09-04-2012  16:01:30 UTC
+     Last generated: 14-08-2012  09:49:09 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -49,6 +49,7 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
+  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
   JclPreProcessorAlgorithmsTemplates in '..\..\source\common\JclPreProcessorAlgorithmsTemplates.pas' ,
   JclPreProcessorArrayListsTemplates in '..\..\source\common\JclPreProcessorArrayListsTemplates.pas' ,

Modified: trunk/jcl/packages/d15/JclDeveloperTools.dproj
===================================================================
--- trunk/jcl/packages/d15/JclDeveloperTools.dproj	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d15/JclDeveloperTools.dproj	2012-08-14 09:52:24 UTC (rev 3821)
@@ -74,6 +74,7 @@
 			<DCCReference Include="JclContainers.dcp"/>
 			<DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/>
 			<DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/>
+			<DCCReference Include="..\..\source\common\JclExprEval.pas"/>
 			<DCCReference Include="..\..\source\common\JclIDEUtils.pas"/>
 			<DCCReference Include="..\..\source\common\JclPreProcessorAlgorithmsTemplates.pas"/>
 			<DCCReference Include="..\..\source\common\JclPreProcessorArrayListsTemplates.pas"/>

Modified: trunk/jcl/packages/d16/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d16/Jcl.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d16/Jcl.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 09-04-2012  18:30:41 UTC
+     Last generated: 14-08-2012  09:49:10 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -54,7 +54,6 @@
   JclCompression in '..\..\source\common\JclCompression.pas' ,
   JclCounter in '..\..\source\common\JclCounter.pas' ,
   JclDateTime in '..\..\source\common\JclDateTime.pas' ,
-  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
   JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
   JclLogic in '..\..\source\common\JclLogic.pas' ,
@@ -69,7 +68,6 @@
   JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
   JclStatistics in '..\..\source\common\JclStatistics.pas' ,
   JclStreams in '..\..\source\common\JclStreams.pas' ,
-  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclStringConversions in '..\..\source\common\JclStringConversions.pas' ,
   JclStringLists in '..\..\source\common\JclStringLists.pas' ,
   JclStrings in '..\..\source\common\JclStrings.pas' ,

Modified: trunk/jcl/packages/d16/Jcl.dproj
===================================================================
--- trunk/jcl/packages/d16/Jcl.dproj	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d16/Jcl.dproj	2012-08-14 09:52:24 UTC (rev 3821)
@@ -167,7 +167,6 @@
 			<DCCReference Include="..\..\source\common\JclCompression.pas"/>
 			<DCCReference Include="..\..\source\common\JclCounter.pas"/>
 			<DCCReference Include="..\..\source\common\JclDateTime.pas"/>
-			<DCCReference Include="..\..\source\common\JclExprEval.pas"/>
 			<DCCReference Include="..\..\source\common\JclFileUtils.pas"/>
 			<DCCReference Include="..\..\source\common\JclIniFiles.pas"/>
 			<DCCReference Include="..\..\source\common\JclLogic.pas"/>
@@ -182,7 +181,6 @@
 			<DCCReference Include="..\..\source\common\JclSimpleXml.pas"/>
 			<DCCReference Include="..\..\source\common\JclStatistics.pas"/>
 			<DCCReference Include="..\..\source\common\JclStreams.pas"/>
-			<DCCReference Include="..\..\source\common\JclStrHashMap.pas"/>
 			<DCCReference Include="..\..\source\common\JclStringConversions.pas"/>
 			<DCCReference Include="..\..\source\common\JclStringLists.pas"/>
 			<DCCReference Include="..\..\source\common\JclStrings.pas"/>

Modified: trunk/jcl/packages/d16/JclContainers.dpk
===================================================================
--- trunk/jcl/packages/d16/JclContainers.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d16/JclContainers.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
 
-     Last generated: 04-03-2011  00:08:41 UTC
+     Last generated: 14-08-2012  09:49:10 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -58,6 +58,7 @@
   JclQueues in '..\..\source\common\JclQueues.pas' ,
   JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
   JclStacks in '..\..\source\common\JclStacks.pas' ,
+  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclTrees in '..\..\source\common\JclTrees.pas' ,
   JclVectors in '..\..\source\common\JclVectors.pas' 
   ;

Modified: trunk/jcl/packages/d16/JclContainers.dproj
===================================================================
--- trunk/jcl/packages/d16/JclContainers.dproj	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d16/JclContainers.dproj	2012-08-14 09:52:24 UTC (rev 3821)
@@ -171,6 +171,7 @@
 			<DCCReference Include="..\..\source\common\JclQueues.pas"/>
 			<DCCReference Include="..\..\source\common\JclSortedMaps.pas"/>
 			<DCCReference Include="..\..\source\common\JclStacks.pas"/>
+			<DCCReference Include="..\..\source\common\JclStrHashMap.pas"/>
 			<DCCReference Include="..\..\source\common\JclTrees.pas"/>
 			<DCCReference Include="..\..\source\common\JclVectors.pas"/>
 			<BuildConfiguration Include="Release">

Modified: trunk/jcl/packages/d16/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d16/JclDeveloperTools.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d16/JclDeveloperTools.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 09-04-2012  16:01:31 UTC
+     Last generated: 14-08-2012  09:49:10 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -49,6 +49,7 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
+  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
   JclPreProcessorAlgorithmsTemplates in '..\..\source\common\JclPreProcessorAlgorithmsTemplates.pas' ,
   JclPreProcessorArrayListsTemplates in '..\..\source\common\JclPreProcessorArrayListsTemplates.pas' ,

Modified: trunk/jcl/packages/d16/JclDeveloperTools.dproj
===================================================================
--- trunk/jcl/packages/d16/JclDeveloperTools.dproj	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d16/JclDeveloperTools.dproj	2012-08-14 09:52:24 UTC (rev 3821)
@@ -162,6 +162,7 @@
 			<DCCReference Include="JclContainers.dcp"/>
 			<DCCReference Include="..\..\source\common\JclCompilerUtils.pas"/>
 			<DCCReference Include="..\..\source\common\JclDevToolsResources.pas"/>
+			<DCCReference Include="..\..\source\common\JclExprEval.pas"/>
 			<DCCReference Include="..\..\source\common\JclIDEUtils.pas"/>
 			<DCCReference Include="..\..\source\common\JclPreProcessorAlgorithmsTemplates.pas"/>
 			<DCCReference Include="..\..\source\common\JclPreProcessorArrayListsTemplates.pas"/>

Modified: trunk/jcl/packages/d6/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d6/Jcl.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d6/Jcl.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 17-06-2011  09:43:09 UTC
+     Last generated: 14-08-2012  09:49:02 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -54,7 +54,6 @@
   JclCompression in '..\..\source\common\JclCompression.pas' ,
   JclCounter in '..\..\source\common\JclCounter.pas' ,
   JclDateTime in '..\..\source\common\JclDateTime.pas' ,
-  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
   JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
   JclLogic in '..\..\source\common\JclLogic.pas' ,
@@ -69,7 +68,6 @@
   JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
   JclStatistics in '..\..\source\common\JclStatistics.pas' ,
   JclStreams in '..\..\source\common\JclStreams.pas' ,
-  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclStringConversions in '..\..\source\common\JclStringConversions.pas' ,
   JclStringLists in '..\..\source\common\JclStringLists.pas' ,
   JclStrings in '..\..\source\common\JclStrings.pas' ,

Modified: trunk/jcl/packages/d6/JclContainers.dpk
===================================================================
--- trunk/jcl/packages/d6/JclContainers.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d6/JclContainers.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
 
-     Last generated: 07-05-2010  18:24:24 UTC
+     Last generated: 14-08-2012  09:49:02 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -58,6 +58,7 @@
   JclQueues in '..\..\source\common\JclQueues.pas' ,
   JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
   JclStacks in '..\..\source\common\JclStacks.pas' ,
+  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclTrees in '..\..\source\common\JclTrees.pas' ,
   JclVectors in '..\..\source\common\JclVectors.pas' 
   ;

Modified: trunk/jcl/packages/d6/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d6/JclDeveloperTools.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d6/JclDeveloperTools.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 09-04-2012  16:01:28 UTC
+     Last generated: 14-08-2012  09:49:02 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -49,6 +49,7 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
+  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
   JclPreProcessorAlgorithmsTemplates in '..\..\source\common\JclPreProcessorAlgorithmsTemplates.pas' ,
   JclPreProcessorArrayListsTemplates in '..\..\source\common\JclPreProcessorArrayListsTemplates.pas' ,

Modified: trunk/jcl/packages/d7/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d7/Jcl.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d7/Jcl.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 17-06-2011  09:43:10 UTC
+     Last generated: 14-08-2012  09:49:03 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -54,7 +54,6 @@
   JclCompression in '..\..\source\common\JclCompression.pas' ,
   JclCounter in '..\..\source\common\JclCounter.pas' ,
   JclDateTime in '..\..\source\common\JclDateTime.pas' ,
-  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclFileUtils in '..\..\source\common\JclFileUtils.pas' ,
   JclIniFiles in '..\..\source\common\JclIniFiles.pas' ,
   JclLogic in '..\..\source\common\JclLogic.pas' ,
@@ -69,7 +68,6 @@
   JclSimpleXml in '..\..\source\common\JclSimpleXml.pas' ,
   JclStatistics in '..\..\source\common\JclStatistics.pas' ,
   JclStreams in '..\..\source\common\JclStreams.pas' ,
-  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclStringConversions in '..\..\source\common\JclStringConversions.pas' ,
   JclStringLists in '..\..\source\common\JclStringLists.pas' ,
   JclStrings in '..\..\source\common\JclStrings.pas' ,

Modified: trunk/jcl/packages/d7/JclContainers.dpk
===================================================================
--- trunk/jcl/packages/d7/JclContainers.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d7/JclContainers.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclContainers-R.xml)
 
-     Last generated: 07-05-2010  18:24:24 UTC
+     Last generated: 14-08-2012  09:49:02 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -58,6 +58,7 @@
   JclQueues in '..\..\source\common\JclQueues.pas' ,
   JclSortedMaps in '..\..\source\common\JclSortedMaps.pas' ,
   JclStacks in '..\..\source\common\JclStacks.pas' ,
+  JclStrHashMap in '..\..\source\common\JclStrHashMap.pas' ,
   JclTrees in '..\..\source\common\JclTrees.pas' ,
   JclVectors in '..\..\source\common\JclVectors.pas' 
   ;

Modified: trunk/jcl/packages/d7/JclDeveloperTools.dpk
===================================================================
--- trunk/jcl/packages/d7/JclDeveloperTools.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d7/JclDeveloperTools.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (JclDeveloperTools-R.xml)
 
-     Last generated: 09-04-2012  16:01:28 UTC
+     Last generated: 14-08-2012  09:49:03 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -49,6 +49,7 @@
 contains
   JclCompilerUtils in '..\..\source\common\JclCompilerUtils.pas' ,
   JclDevToolsResources in '..\..\source\common\JclDevToolsResources.pas' ,
+  JclExprEval in '..\..\source\common\JclExprEval.pas' ,
   JclIDEUtils in '..\..\source\common\JclIDEUtils.pas' ,
   JclPreProcessorAlgorithmsTemplates in '..\..\source\common\JclPreProcessorAlgorithmsTemplates.pas' ,
   JclPreProcessorArrayListsTemplates in '..\..\source\common\JclPreProcessorArrayListsTemplates.pas' ,

Modified: trunk/jcl/packages/d8/Jcl.dpk
===================================================================
--- trunk/jcl/packages/d8/Jcl.dpk	2012-08-14 09:33:43 UTC (rev 3820)
+++ trunk/jcl/packages/d8/Jcl.dpk	2012-08-14 09:52:24 UTC (rev 3821)
@@ -4,7 +4,7 @@
      DO NOT EDIT THIS FILE, IT IS GENERATED BY THE PACKAGE GENERATOR
             ALWAYS EDIT THE RELATED XML FILE (Jcl-R.xml)
 
-     Last generated: 07-05-2010  18:46:59 UTC
+     Last generated: 14-08-2012  09:49:03 UTC
 -----------------------------------------------------------------------------
 }
 
@@ -53,7 +53,6 @@
   JclCompression in '..\..\source\common\JclCompression.pas' ,
   JclCounter in '..\..\source\common\JclCounter.pas' ,
   JclDateTime in '..\..\source\common\JclDateTime.pas' ,
-  Jcl...
 
[truncated message content]

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

[<ou...@us...>]

Revision: 3820
          http://jcl.svn.sourceforge.net/jcl/?rev=3820&view=rev
Author:   outchy
Date:     2012-08-14 09:33:43 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
Mantis 5943: bug in the jclinstaller for multiple profiles: need to expand environment variables.

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

Modified: trunk/jcl/install/JediProfiles.pas
===================================================================
--- trunk/jcl/install/JediProfiles.pas	2012-08-14 09:25:52 UTC (rev 3819)
+++ trunk/jcl/install/JediProfiles.pas	2012-08-14 09:33:43 UTC (rev 3820)
@@ -197,6 +197,7 @@
       else
       begin
         NtUserFileName := PathAddSeparator(FProfiles[Index].LocalProfile) + 'NTUSER.DAT';
+        ExpandEnvironmentVar(NtUserFileName);
         if not RegKeyExists(HKUS, '\' + FProfiles[Index].SID) then
         begin
           EnableProcessPrivilege(True, SE_RESTORE_NAME);

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:[3819] trunk/jcl/source/common/JclCharsets.pas

[<ou...@us...>]

Revision: 3819
          http://jcl.svn.sourceforge.net/jcl/?rev=3819&view=rev
Author:   outchy
Date:     2012-08-14 09:25:52 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
Mantis 5946: Invalid character set names (aliases).

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

Modified: trunk/jcl/source/common/JclCharsets.pas
===================================================================
--- trunk/jcl/source/common/JclCharsets.pas	2012-08-14 08:48:19 UTC (rev 3818)
+++ trunk/jcl/source/common/JclCharsets.pas	2012-08-14 09:25:52 UTC (rev 3819)
@@ -55,7 +55,7 @@
     FamilyCodePage: Word;
   end;
 
-const JclCharsetInfos: array [0..305] of TJclCharsetInfo =
+const JclCharsetInfos: array [0..285] of TJclCharsetInfo =
 (* Arabic (ASMO 708) ASMO-708 708 1256 *)
     ((Name: 'ASMO-708'; CodePage: 708; FamilyCodePage: 1256),
 (* Arabic (DOS) DOS-720 720 1256 *)
@@ -139,13 +139,11 @@
      (Name: 'ibm866'; CodePage: 866; FamilyCodePage: 1251),
 (* Cyrillic (ISO) iso-8859-5 csISOLatin5, csISOLatinCyrillic, cyrillic, ISO_8859-5, ISO_8859-5:1988, iso-ir-144, l5 28595 1251 *)
      (Name: 'iso-8859-5'; CodePage: 28595; FamilyCodePage: 1251),
-     (Name: 'csISOLatin5'; CodePage: 28595; FamilyCodePage: 1251),
      (Name: 'csISOLatinCyrillic'; CodePage: 28595; FamilyCodePage: 1251),
      (Name: 'cyrillic'; CodePage: 28595; FamilyCodePage: 1251),
      (Name: 'ISO_8859-5'; CodePage: 28595; FamilyCodePage: 1251),
      (Name: 'ISO_8859-5:1988'; CodePage: 28595; FamilyCodePage: 1251),
      (Name: 'iso-ir-144'; CodePage: 28595; FamilyCodePage: 1251),
-     (Name: 'l5'; CodePage: 28595; FamilyCodePage: 1251),
 (* Cyrillic (KOI8-R) koi8-r csKOI8R, koi, koi8, koi8r 20866 1251 *)
      (Name: 'koi8-r'; CodePage: 20866; FamilyCodePage: 1251),
      (Name: 'csKOI8R'; CodePage: 20866; FamilyCodePage: 1251),
@@ -216,8 +214,6 @@
      (Name: 'x-ebcdic-denmarknorway-euro'; CodePage: 1142; FamilyCodePage: 1252),
 (* IBM EBCDIC (Finland-Sweden) x-EBCDIC-FinlandSweden 20278 1252 *)
      (Name: 'x-EBCDIC-FinlandSweden'; CodePage: 20278; FamilyCodePage: 1252),
-(* IBM EBCDIC (Finland-Sweden-Euro) x-ebcdic-finlandsweden-euro 1143 1252 *)
-     (Name: 'x-ebcdic-finlandsweden-euro'; CodePage: 1143; FamilyCodePage: 1252),
 (* IBM EBCDIC (Finland-Sweden-Euro) x-ebcdic-finlandsweden-euro X-EBCDIC-France 1143 1252 *)
      (Name: 'x-ebcdic-finlandsweden-euro'; CodePage: 1143; FamilyCodePage: 1252),
      (Name: 'X-EBCDIC-France'; CodePage: 1143; FamilyCodePage: 1252),
@@ -284,34 +280,24 @@
 (* Icelandic (Mac) x-mac-icelandic 10079 1252 *)
      (Name: 'x-mac-icelandic'; CodePage: 10079; FamilyCodePage: 1252),
 (* ISCII Assamese x-iscii-as 57006 57006 *)
-     (Name: 'Assamese'; CodePage: 57006; FamilyCodePage: 57006),
      (Name: 'x-iscii-as'; CodePage: 57006; FamilyCodePage: 57006),
 (* ISCII Bengali x-iscii-be 57003 57003 *)
-     (Name: 'Bengali'; CodePage: 57003; FamilyCodePage: 57003),
      (Name: 'x-iscii-be'; CodePage: 57003; FamilyCodePage: 57003),
 (* ISCII Devanagari x-iscii-de 57002 57002 *)
-     (Name: 'Devanagari'; CodePage: 57002; FamilyCodePage: 57002),
      (Name: 'x-iscii-de'; CodePage: 57002; FamilyCodePage: 57002),
 (* ISCII Gujarathi x-iscii-gu 57010 57010 *)
-     (Name: 'Gujarathi'; CodePage: 57010; FamilyCodePage: 57010),
      (Name: 'x-iscii-gu'; CodePage: 57010; FamilyCodePage: 57010),
 (* ISCII Kannada x-iscii-ka 57008 57008 *)
-     (Name: 'Kannada'; CodePage: 57008; FamilyCodePage: 57008),
      (Name: 'x-iscii-ka'; CodePage: 57008; FamilyCodePage: 57008),
 (* ISCII Malayalam x-iscii-ma 57009 57009 *)
-     (Name: 'Malayalam'; CodePage: 57009; FamilyCodePage: 57009),
      (Name: 'x-iscii-ma'; CodePage: 57009; FamilyCodePage: 57009),
 (* ISCII Oriya x-iscii-or 57007 57007 *)
-     (Name: 'Oriya'; CodePage: 57007; FamilyCodePage: 57007),
      (Name: 'x-iscii-or'; CodePage: 57007; FamilyCodePage: 57007),
 (* ISCII Panjabi x-iscii-pa 57011 57011 *)
-     (Name: 'Panjabi'; CodePage: 57011; FamilyCodePage: 57011),
      (Name: 'x-iscii-pa'; CodePage: 57011; FamilyCodePage: 57011),
 (* ISCII Tamil x-iscii-ta 57004 57004 *)
-     (Name: 'Tamil'; CodePage: 57004; FamilyCodePage: 57004),
      (Name: 'x-iscii-ta'; CodePage: 57004; FamilyCodePage: 57004),
 (* ISCII Telugu x-iscii-te 57005 57005 *)
-     (Name: 'Telugu'; CodePage: 57005; FamilyCodePage: 57005),
      (Name: 'x-iscii-te'; CodePage: 57005; FamilyCodePage: 57005),
 (* Japanese (EUC) euc-jp csEUCPkdFmtJapanese, Extended_UNIX_Code_Packed_Format_for_Japanese, x-euc, x-euc-jp 51932 932 *)
      (Name: 'euc-jp'; CodePage: 51932; FamilyCodePage: 932),
@@ -359,27 +345,23 @@
      (Name: 'Johab'; CodePage: 1361; FamilyCodePage: 1361),
 (* Korean (Mac) x-mac-korean 10003 949 *)
      (Name: 'x-mac-korean'; CodePage: 10003; FamilyCodePage: 949),
-(* Latin 3 (ISO) iso-8859-3 csISO, Latin3, ISO_8859-3, ISO_8859-3:1988, iso-ir-109, l3, latin3 28593 1254 *)
+(* Latin 3 (ISO) iso-8859-3 csISOLatin3, ISO_8859-3, ISO_8859-3:1988, iso-ir-109, l3, latin3 28593 1254 *)
      (Name: 'iso-8859-3'; CodePage: 28593; FamilyCodePage: 1254),
-     (Name: 'csISO'; CodePage: 28593; FamilyCodePage: 1254),
-     (Name: 'Latin3'; CodePage: 28593; FamilyCodePage: 1254),
+     (Name: 'csISOLatin3'; CodePage: 28593; FamilyCodePage: 1254),
      (Name: 'ISO_8859-3'; CodePage: 28593; FamilyCodePage: 1254),
      (Name: 'ISO_8859-3:1988'; CodePage: 28593; FamilyCodePage: 1254),
      (Name: 'iso-ir-109'; CodePage: 28593; FamilyCodePage: 1254),
      (Name: 'l3,'; CodePage: 28593; FamilyCodePage: 1254),
      (Name: 'latin3'; CodePage: 28593; FamilyCodePage: 1254),
-(* Latin 9 (ISO) iso-8859-15 csISO, Latin9, ISO_8859-15, l9, latin9 28605 1252 *)
+(* Latin 9 (ISO) iso-8859-15 csISOLatin9, ISO_8859-15, l9, latin9 28605 1252 *)
      (Name: 'iso-8859-15'; CodePage: 28605; FamilyCodePage: 1252),
-     (Name: 'csISO'; CodePage: 28605; FamilyCodePage: 1252),
-     (Name: 'Latin9'; CodePage: 28605; FamilyCodePage: 1252),
+     (Name: 'csISOLatin9'; CodePage: 28605; FamilyCodePage: 1252),
      (Name: 'ISO_8859-15'; CodePage: 28605; FamilyCodePage: 1252),
      (Name: 'l9'; CodePage: 28605; FamilyCodePage: 1252),
      (Name: 'latin9'; CodePage: 28605; FamilyCodePage: 1252),
 (* Norwegian (IA5) x-IA5-Norwegian 20108 1252 *)
      (Name: 'x-IA5-Norwegian'; CodePage: 20108; FamilyCodePage: 1252),
 (* OEM United States IBM437 437, cp437, csPC8, CodePage437 437 1252 *)
-     (Name: 'United'; CodePage: 437; FamilyCodePage: 1252),
-     (Name: 'States'; CodePage: 437; FamilyCodePage: 1252),
      (Name: 'IBM437'; CodePage: 437; FamilyCodePage: 1252),
      (Name: '437'; CodePage: 437; FamilyCodePage: 1252),
      (Name: 'cp437'; CodePage: 437; FamilyCodePage: 1252),
@@ -394,10 +376,9 @@
      (Name: 'TIS-620'; CodePage: 874; FamilyCodePage: 874),
 (* Turkish (DOS) ibm857 857 1254 *)
      (Name: 'ibm857'; CodePage: 857; FamilyCodePage: 1254),
-(* Turkish (ISO) iso-8859-9 csISO, Latin5, ISO_8859-9, ISO_8859-9:1989, iso-ir-148, l5, latin5 28599 1254 *)
+(* Turkish (ISO) iso-8859-9 csISOLatin5, ISO_8859-9, ISO_8859-9:1989, iso-ir-148, l5, latin5 28599 1254 *)
      (Name: 'iso-8859-9'; CodePage: 28599; FamilyCodePage: 1254),
-     (Name: 'csISO'; CodePage: 28599; FamilyCodePage: 1254),
-     (Name: 'Latin5'; CodePage: 28599; FamilyCodePage: 1254),
+     (Name: 'csISOLatin5'; CodePage: 28599; FamilyCodePage: 1254),
      (Name: 'ISO_8859-9'; CodePage: 28599; FamilyCodePage: 1254),
      (Name: 'ISO_8859-9:1989'; CodePage: 28599; FamilyCodePage: 1254),
      (Name: 'iso-ir-148'; CodePage: 28599; FamilyCodePage: 1254),
@@ -411,7 +392,6 @@
      (Name: 'ISO_8859-9:1989'; CodePage: 1254; FamilyCodePage: 1254),
      (Name: 'iso-8859-9'; CodePage: 1254; FamilyCodePage: 1254),
      (Name: 'iso-ir-148'; CodePage: 1254; FamilyCodePage: 1254),
-     (Name: 'latin5'; CodePage: 1254; FamilyCodePage: 1254),
 (* Unicode unicode utf-16 1200 1200 *)
      (Name: 'utf-16'; CodePage: 1200; FamilyCodePage: 1200),
      (Name: 'unicode'; CodePage: 1200; FamilyCodePage: 1200),
@@ -444,11 +424,10 @@
      (Name: 'ibm850'; CodePage: 850; FamilyCodePage: 1252),
 (* Western European (IA5) x-IA5 20105 1252 *)
      (Name: 'x-IA5'; CodePage: 20105; FamilyCodePage: 1252),
-(* Western European (ISO) iso-8859-1 cp819, csISO, Latin1, ibm819, iso_8859-1, iso_8859-1:1987, iso8859-1, iso-ir-100, l1, latin1 28591 1252 *)
+(* Western European (ISO) iso-8859-1 cp819, csISOLatin1, ibm819, iso_8859-1, iso_8859-1:1987, iso8859-1, iso-ir-100, l1, latin1 28591 1252 *)
      (Name: 'iso-8859-1'; CodePage: 28591; FamilyCodePage: 1252),
      (Name: 'cp819'; CodePage: 28591; FamilyCodePage: 1252),
-     (Name: 'csISO'; CodePage: 28591; FamilyCodePage: 1252),
-     (Name: 'Latin1'; CodePage: 28591; FamilyCodePage: 1252),
+     (Name: 'csISOLatin1'; CodePage: 28591; FamilyCodePage: 1252),
      (Name: 'ibm819'; CodePage: 28591; FamilyCodePage: 1252),
      (Name: 'iso_8859-1'; CodePage: 28591; FamilyCodePage: 1252),
      (Name: 'iso_8859-1:1987'; CodePage: 28591; FamilyCodePage: 1252),

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:[3818] trunk/jcl/source/common

[<ou...@us...>]

Revision: 3818
          http://jcl.svn.sourceforge.net/jcl/?rev=3818&view=rev
Author:   outchy
Date:     2012-08-14 08:48:19 +0000 (Tue, 14 Aug 2012)
Log Message:
-----------
Mantis 5928: _AddRef and _Release always return 0 instead of -1:
- do the replacement in JclSysUtils.pas;
- remove the interface in JclStringLists.pas.

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

Modified: trunk/jcl/source/common/JclStringLists.pas
===================================================================
--- trunk/jcl/source/common/JclStringLists.pas	2012-08-13 13:00:43 UTC (rev 3817)
+++ trunk/jcl/source/common/JclStringLists.pas	2012-08-14 08:48:19 UTC (rev 3818)
@@ -212,17 +212,6 @@
   end;
 
 type
-  TJclUpdateControl = class(TInterfacedObject, IInterface)
-  private
-    FStrings: TStrings;
-  public
-    constructor Create(AStrings: TStrings);
-    { IInterface }
-    // function QueryInterface(const IID: TGUID; out Obj): HRESULT; stdcall;
-    function _AddRef: Integer; stdcall;
-    function _Release: Integer; stdcall;
-  end;
-
   TJclInterfacedStringList = class(TStringList, IInterface)
    private
     FOwnerInterface: IInterface;
@@ -241,9 +230,7 @@
     FSelfAsInterface: IJclStringList;
     FLastRegExPattern: string;
     FRegEx: TJclAnsiRegEx;
-    FUpdateControl: TJclUpdateControl;
     FCompareFunction: TJclStringListSortCompare;
-    function AutoUpdateControl: IInterface;
     function CanFreeObjects: Boolean;
     function MatchRegEx(const S, APattern: string): Boolean;
     procedure EnsureObjectsMode(AMode: TJclStringListObjectsMode);
@@ -507,53 +494,59 @@
 var
   I: Integer;
 begin
-  AutoUpdateControl;
-  for I := Low(A) to High(A) do
-    case A[I].VType of
-      vtInteger:
-        Add(IntToStr(A[I].VInteger));
-      vtBoolean:
-        Add(string(BoolToStr[A[I].VBoolean]));
-      vtChar:
-        Add(string(AnsiString(A[I].VChar)));
-      vtExtended:
-        Add(FloatToStr(A[I].VExtended^));
-      vtString:
-        Add(string(A[I].VString^));
-      vtPChar:
-        Add(string(AnsiString(A[I].VPChar)));
-      vtPWideChar:
-        Add(string(WideString(A[I].VPWideChar)));
-      vtObject:
-        Add(A[I].VObject.ClassName);
-      vtClass:
-        Add(A[I].VClass.ClassName);
-      vtAnsiString:
-        Add(string(A[I].VAnsiString));
-      vtWideString:
-        Add(string(A[I].VWideString));
-      vtCurrency:
-        Add(CurrToStr(A[I].VCurrency^));
-      vtVariant:
-        Add(string(A[I].VVariant^));
-      vtInt64:
-        Add(IntToStr(A[I].VInt64^));
-      {$IFDEF SUPPORTS_UNICODE_STRING}
-      vtUnicodeString:
-        Add(string(A[I].VUnicodeString));
-      {$ENDIF SUPPORTS_UNICODE_STRING}
-    end;
-  Result := FSelfAsInterface;
+  Result := BeginUpdate;
+  try
+    for I := Low(A) to High(A) do
+      case A[I].VType of
+        vtInteger:
+          Add(IntToStr(A[I].VInteger));
+        vtBoolean:
+          Add(string(BoolToStr[A[I].VBoolean]));
+        vtChar:
+          Add(string(AnsiString(A[I].VChar)));
+        vtExtended:
+          Add(FloatToStr(A[I].VExtended^));
+        vtString:
+          Add(string(A[I].VString^));
+        vtPChar:
+          Add(string(AnsiString(A[I].VPChar)));
+        vtPWideChar:
+          Add(string(WideString(A[I].VPWideChar)));
+        vtObject:
+          Add(A[I].VObject.ClassName);
+        vtClass:
+          Add(A[I].VClass.ClassName);
+        vtAnsiString:
+          Add(string(A[I].VAnsiString));
+        vtWideString:
+          Add(string(A[I].VWideString));
+        vtCurrency:
+          Add(CurrToStr(A[I].VCurrency^));
+        vtVariant:
+          Add(string(A[I].VVariant^));
+        vtInt64:
+          Add(IntToStr(A[I].VInt64^));
+        {$IFDEF SUPPORTS_UNICODE_STRING}
+        vtUnicodeString:
+          Add(string(A[I].VUnicodeString));
+        {$ENDIF SUPPORTS_UNICODE_STRING}
+      end;
+  finally
+    Result := EndUpdate;
+  end;
 end;
 
 function TJclStringList.AddStrings(const A: array of string): IJclStringList;
 var
   I: Integer;
 begin
-  AutoUpdateControl;
-  for I := Low(A) to High(A) do
-    Add(A[I]);
-  Result := FSelfAsInterface;
+  Result := BeginUpdate;
+  try
+    for I := Low(A) to High(A) do
+      Add(A[I]);
+  finally
+    Result := EndUpdate;
+  end;
 end;
 
 function TJclStringList.BeginUpdate: IJclStringList;
@@ -562,11 +555,6 @@
   Result := FSelfAsInterface;
 end;
 
-function TJclStringList.AutoUpdateControl: IInterface;
-begin
-  Result := FUpdateControl as IInterface;
-end;
-
 function TJclStringList.Clear: IJclStringList;
 begin
   if CanFreeObjects then
@@ -586,27 +574,30 @@
 var
   L, I, X: Integer;
 begin
-  AutoUpdateControl;
-  if AClearBeforeAdd then
-    Clear;
-  I := 1;
-  L := Length(AText);
-  while I <= L do
-  begin
-    while (I <= L) and (AnsiChar(AText[I]) in ADelims) do
-      Inc(I);
-    X := I;
-    while (I <= L) and not (AnsiChar(AText[I]) in ADelims) do
-      Inc(I);
-    if X <> I then
-      Add(Copy(AText, X, I - X));
+  Result := BeginUpdate;
+  try
+    if AClearBeforeAdd then
+      Clear;
+    I := 1;
+    L := Length(AText);
+    while I <= L do
+    begin
+      while (I <= L) and (AnsiChar(AText[I]) in ADelims) do
+        Inc(I);
+      X := I;
+      while (I <= L) and not (AnsiChar(AText[I]) in ADelims) do
+        Inc(I);
+      if X <> I then
+        Add(Copy(AText, X, I - X));
+    end;
+  finally
+    Result := EndUpdate;
   end;
-  Result := FSelfAsInterface;
 end;
 
 function TJclStringList.First: string;
 begin
-  Result := Get(0);
+  Result := Strings[0];
 end;
 
 function TJclStringList.Join(const ASeparator: string): string;
@@ -615,14 +606,14 @@
 begin
   Result := '';
   for I := 0 to LastIndex - 1 do
-    Result := Result + Get(I) + ASeparator;
+    Result := Result + Strings[I] + ASeparator;
   if Count > 0 then
     Result := Result + Last;
 end;
 
 function TJclStringList.Last: string;
 begin
-  Result := Get(LastIndex);
+  Result := Strings[LastIndex];
 end;
 
 function TJclStringList.Split(const AText, ASeparator: string;
@@ -631,33 +622,40 @@
   LStartIndex, LEndIndex: Integer;
   LLengthSeparator: Integer;
 begin
+  Result := FSelfAsInterface;
   if AText <> '' then
   begin
-    AutoUpdateControl;
-    if AClearBeforeAdd then
-      Clear;
-    LLengthSeparator := Length(ASeparator);
-    LStartIndex := 1;
-    LEndIndex := StrSearch(ASeparator, AText, LStartIndex);
-    while LEndIndex > 0 do
-    begin
-      Add(Copy(AText, LStartIndex, LEndIndex - LStartIndex));
-      LStartIndex := LEndIndex + LLengthSeparator;
+    Result := BeginUpdate;
+    try
+      if AClearBeforeAdd then
+        Clear;
+      LLengthSeparator := Length(ASeparator);
+      LStartIndex := 1;
       LEndIndex := StrSearch(ASeparator, AText, LStartIndex);
+      while LEndIndex > 0 do
+      begin
+        Add(Copy(AText, LStartIndex, LEndIndex - LStartIndex));
+        LStartIndex := LEndIndex + LLengthSeparator;
+        LEndIndex := StrSearch(ASeparator, AText, LStartIndex);
+      end;
+      Add(Copy(AText, LStartIndex, MaxInt));
+    finally
+      Result := EndUpdate;
     end;
-    Add(Copy(AText, LStartIndex, MaxInt));
   end;
-  Result := FSelfAsInterface;
 end;
 
 function TJclStringList.Trim: IJclStringList;
 var
   I: Integer;
 begin
-  AutoUpdateControl;
-  for I := 0 to LastIndex do
-    Put(I, {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}SysUtils.Trim(Strings[I]));
-  Result := FSelfAsInterface;
+  Result := BeginUpdate;
+  try
+    for I := 0 to LastIndex do
+      Strings[I] := {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}SysUtils.Trim(Strings[I]);
+  finally
+    Result := EndUpdate;
+  end;
 end;
 
 function TJclStringList._AddRef: Integer;
@@ -684,22 +682,28 @@
 var
   I: Integer;
 begin
-  AutoUpdateControl;
-  for I := LastIndex downto 0 do
-    if MatchRegEx(Get(I), APattern) then
-      Delete(I);
-  Result := FSelfAsInterface;
+  Result := BeginUpdate;
+  try
+    for I := LastIndex downto 0 do
+      if MatchRegEx(Strings[I], APattern) then
+        Delete(I);
+  finally
+    Result := EndUpdate;
+  end;
 end;
 
 function TJclStringList.KeepRegEx(const APattern: string): IJclStringList;
 var
   I: Integer;
 begin
-  AutoUpdateControl;
-  for I := LastIndex downto 0 do
-    if not MatchRegEx(Get(I), APattern) then
-      Delete(I);
-  Result := FSelfAsInterface;
+  Result := BeginUpdate;
+  try
+    for I := LastIndex downto 0 do
+      if not MatchRegEx(Strings[I], APattern) then
+        Delete(I);
+  finally
+    Result := EndUpdate;
+  end;
 end;
 
 function TJclStringList.MatchRegEx(const S, APattern: string): Boolean;
@@ -722,7 +726,6 @@
 begin
   if CanFreeObjects then
     FreeObjects(False);
-  FreeAndNil(FUpdateControl);
   FreeAndNil(FRegEx);
   inherited Destroy;
 end;
@@ -755,12 +758,15 @@
   end;
 
 begin
-  AutoUpdateControl;
-  if DirectoryExists(APattern) then
-    DoDirectories(PathAddSeparator(APattern) + '*')
-  else
-    DoDirectories(APattern);
-  Result := FSelfAsInterface;
+  Result := BeginUpdate;
+  try
+    if DirectoryExists(APattern) then
+      DoDirectories(PathAddSeparator(APattern) + '*')
+    else
+      DoDirectories(APattern);
+  finally
+    Result := EndUpdate;
+  end;
 end;
 
 function TJclStringList.Files(const APattern: string = '*';
@@ -799,12 +805,15 @@
   end;
 
 begin
-  AutoUpdateControl;
-  if DirectoryExists(APattern) then
-    DoFiles(PathAddSeparator(APattern) + '*')
-  else
-    DoFiles(APattern);
-  Result := FSelfAsInterface;
+  Result := BeginUpdate;
+  try
+    if DirectoryExists(APattern) then
+      DoFiles(PathAddSeparator(APattern) + '*')
+    else
+      DoFiles(APattern);
+  finally
+    Result := EndUpdate;
+  end;
 end;
 
 function TJclStringList.LastIndex: Integer;
@@ -817,7 +826,6 @@
 constructor TJclStringList.Create;
 begin
   inherited Create;
-  FUpdateControl := TJclUpdateControl.Create(Self);
   if QueryInterface(IJclStringList, FSelfAsInterface) <> 0 then
     System.Error(reIntfCastError);
 end;
@@ -1248,10 +1256,13 @@
 var
   I: Integer;
 begin
-  AutoUpdateControl;
-  for I := 0 to LastIndex do
-    Put(I, ADelimiter + Get(I) + ADelimiter);
-  Result := FSelfAsInterface;
+  Result := BeginUpdate;
+  try
+    for I := 0 to LastIndex do
+      Strings[I] := ADelimiter + Strings[I] + ADelimiter;
+  finally
+    Result := EndUpdate;
+  end;
 end;
 
 function TJclStringList.LoadExeParams: IJclStringList;
@@ -1259,16 +1270,19 @@
   I: Integer;
   S: string;
 begin
-  AutoUpdateControl;
-  Clear;
-  for I := 1 to ParamCount do
-  begin
-    S := ParamStr(I);
-    if (S[1] = '-') or (S[1] = '/') then
-      System.Delete(S, 1, 1);
-    Add(S);
+  Result := BeginUpdate;
+  try
+    Clear;
+    for I := 1 to ParamCount do
+    begin
+      S := ParamStr(I);
+      if (S[1] = '-') or (S[1] = '/') then
+        System.Delete(S, 1, 1);
+      Add(S);
+    end;
+  finally
+    Result := EndUpdate;
   end;
-  Result := FSelfAsInterface;
 end;
 
 function TJclStringList.Exists(const S: string): Boolean;
@@ -1285,35 +1299,44 @@
 var
   I: Integer;
 begin
-  AutoUpdateControl;
-  for I := LastIndex downto 0 do
-    if {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}SysUtils.Trim(Get(I)) = '' then
-      Delete(I);
-  Result := FSelfAsInterface;
+  Result := BeginUpdate;
+  try
+    for I := LastIndex downto 0 do
+      if {$IFDEF HAS_UNITSCOPE}System.{$ENDIF}SysUtils.Trim(Strings[I]) = '' then
+        Delete(I);
+  finally
+    Result := EndUpdate;
+  end;
 end;
 
 function TJclStringList.KeepIntegers: IJclStringList;
 var
   I, X: Integer;
 begin
-  AutoUpdateControl;
-  X := 0;
-  for I := LastIndex downto 0 do
-    if not TryStrToInt(Get(I), X) then
-      Delete(I);
-  Result := FSelfAsInterface;
+  Result := BeginUpdate;
+  try
+    X := 0;
+    for I := LastIndex downto 0 do
+      if not TryStrToInt(Strings[I], X) then
+        Delete(I);
+  finally
+    Result := EndUpdate;
+  end;
 end;
 
 function TJclStringList.DeleteIntegers: IJclStringList;
 var
   I, X: Integer;
 begin
-  AutoUpdateControl;
-  X := 0;
-  for I := LastIndex downto 0 do
-    if TryStrToInt(Get(I), X) then
-      Delete(I);
-  Result := FSelfAsInterface;
+  Result := BeginUpdate;
+  try
+    X := 0;
+    for I := LastIndex downto 0 do
+      if TryStrToInt(Strings[I], X) then
+        Delete(I);
+  finally
+    Result := EndUpdate;
+  end;
 end;
 
 function TJclStringList.FreeObjects(AFreeAndNil: Boolean = False): IJclStringList;
@@ -1321,24 +1344,30 @@
   I: Integer;
 begin
   if AFreeAndNil then
-    AutoUpdateControl;
+    Result := BeginUpdate;
   for I := 0 to LastIndex do
   begin
     inherited Objects[I].Free;
     if AFreeAndNil then
       inherited Objects[I] := nil;
   end;
-  Result := FSelfAsInterface;
+  if AFreeAndNil then
+    Result := EndUpdate
+  else
+    Result := FSelfAsInterface;
 end;
 
 function TJclStringList.ReleaseInterfaces: IJclStringList;
 var
   I: Integer;
 begin
-  AutoUpdateControl;
-  for I := 0 to LastIndex do
-    Interfaces[I] := nil;
-  Result := FSelfAsInterface;
+  Result := BeginUpdate;
+  try
+    for I := 0 to LastIndex do
+      Interfaces[I] := nil;
+  finally
+    Result := EndUpdate;
+  end;
 end;
 
 function TJclStringList.Clone: IJclStringList;
@@ -1352,26 +1381,30 @@
   I: Integer;
 begin
   inherited Assign(Source);
+  Result := FSelfAsInterface;
   if Source is TJclStringList then
   begin
     L := TJclStringList(Source);
     FObjectsMode := L.FObjectsMode;
     if not (FObjectsMode in [omNone, omObjects]) then
     begin
-      AutoUpdateControl;
-      for I := 0 to LastIndex do
-      begin
-        inherited Objects[I] := nil;
-        case FObjectsMode of
-          omVariants:
-            Variants[I] := L.Variants[I];
-          omInterfaces:
-            Interfaces[I] := L.Interfaces[I];
+      Result := BeginUpdate;
+      try
+        for I := 0 to LastIndex do
+        begin
+          inherited Objects[I] := nil;
+          case FObjectsMode of
+            omVariants:
+              Variants[I] := L.Variants[I];
+            omInterfaces:
+              Interfaces[I] := L.Interfaces[I];
+          end;
         end;
+      finally
+        Result := EndUpdate;
       end;
     end;
   end;
-  Result := FSelfAsInterface;
 end;
 
 function TJclStringList.CanFreeObjects: Boolean;
@@ -1384,26 +1417,6 @@
   Result := FObjectsMode;
 end;
 
-//=== { TJclUpdateControl } ==================================================
-
-constructor TJclUpdateControl.Create(AStrings: TStrings);
-begin
-  inherited Create;
-  FStrings := AStrings;
-end;
-
-function TJclUpdateControl._AddRef: Integer;
-begin
-  FStrings.BeginUpdate;
-  Result := 0;
-end;
-
-function TJclUpdateControl._Release: Integer;
-begin
-  FStrings.EndUpdate;
-  Result := 0;
-end;
-
 {$IFDEF UNITVERSIONING}
 initialization
   RegisterUnitVersion(HInstance, UnitVersioning);

Modified: trunk/jcl/source/common/JclSysUtils.pas
===================================================================
--- trunk/jcl/source/common/JclSysUtils.pas	2012-08-13 13:00:43 UTC (rev 3817)
+++ trunk/jcl/source/common/JclSysUtils.pas	2012-08-14 08:48:19 UTC (rev 3818)
@@ -3728,13 +3728,13 @@
 function TJclIntfCriticalSection._AddRef: Integer;
 begin
   FCriticalSection.Acquire;
-  Result := 0;
+  Result := -1;
 end;
 
 function TJclIntfCriticalSection._Release: Integer;
 begin
   FCriticalSection.Release;
-  Result := 0;
+  Result := -1;
 end;
 
 //=== { TJclSimpleLog } ======================================================

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